Rewrote pkgos calls to match the new order of parameters.

Rewritten-From: ced0c8dec581de8b83cbcdd6b37aafbbdb9115e4

diff --git a/trusty/debian/control b/trusty/debian/control
index 2cefaa66e8c02e3fceb8d3c09feb3b459afc32e6..d09afe24cc7c4b40ae4b489692b6f762c2cc4726 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -9,7 +9,7 @@ Uploaders: Loic Dachary (OuoU) <loic@debian.org>,
            Mehdi Abaakouk <sileht@sileht.net>
 Build-Depends: debhelper (>= 9),
  python-all (>= 2.6.6-3~),
- openstack-pkg-tools
+ openstack-pkg-tools (>= 4)
 Build-Depends-Indep: pep8 (>= 1.3.3),
  python-argparse,
  python-babel,

diff --git a/trusty/debian/heat-api-cfn.config.in b/trusty/debian/heat-api-cfn.config.in
index 4fca6da01759c78a2687b47388547a2a6b39b338..7129f6567eec1ff887aa1f0937a56a6f6c8ebc8c 100644 (file)
--- a/trusty/debian/heat-api-cfn.config.in
+++ b/trusty/debian/heat-api-cfn.config.in
@@ -10,6 +10,6 @@ APIPASTE_CONF=/etc/heat/heat-api-cfn-paste.ini
 #PKGOS-INCLUDE#
 
 pkgos_var_user_group heat
-pkgos_read_admin_creds ${APIPASTE_CONF} heat filter:authtoken
+pkgos_read_admin_creds ${APIPASTE_CONF} filter:authtoken heat
 
 exit 0

diff --git a/trusty/debian/heat-api-cfn.postinst.in b/trusty/debian/heat-api-cfn.postinst.in
index 38aabf3f19b96faad010189959f949df7b4b3f8f..f5e8a36acb819ef12bb1a5252271d857f865b149 100644 (file)
--- a/trusty/debian/heat-api-cfn.postinst.in
+++ b/trusty/debian/heat-api-cfn.postinst.in
@@ -10,7 +10,7 @@ if [ "$1" = "configure" ] ; then
        . /usr/share/debconf/confmodule
        pkgos_var_user_group heat
        pkgos_write_new_conf heat heat-api-cfn-paste.ini
-       pkgos_write_admin_creds /etc/heat/heat-api-cfn-paste.ini heat filter:authtoken
+       pkgos_write_admin_creds /etc/heat/heat-api-cfn-paste.ini filter:authtoken heat
        chown -R heat:adm /var/log/heat
        chmod 0750 /var/log/heat
 fi

diff --git a/trusty/debian/heat-api-cloudwatch.config.in b/trusty/debian/heat-api-cloudwatch.config.in
index 69cbc9e5095fe48eda8bd9e6c9ae2fb7ad0164a6..f7dc764bba32681ff9b2a390dac38271d0a75e4a 100644 (file)
--- a/trusty/debian/heat-api-cloudwatch.config.in
+++ b/trusty/debian/heat-api-cloudwatch.config.in
@@ -9,6 +9,6 @@ APIPASTE_CONF=/etc/heat/heat-api-cloudwatch-paste.ini
 #PKGOS-INCLUDE#
 
 pkgos_var_user_group heat
-pkgos_read_admin_creds ${APIPASTE_CONF} heat filter:authtoken
+pkgos_read_admin_creds ${APIPASTE_CONF} filter:authtoken heat
 
 exit 0

diff --git a/trusty/debian/heat-api-cloudwatch.postinst.in b/trusty/debian/heat-api-cloudwatch.postinst.in
index a743c8d31d22108d661bff2cf3a534505a8cf16e..769f7dd3f98e4814ee68188407f9610ecf8783f1 100644 (file)
--- a/trusty/debian/heat-api-cloudwatch.postinst.in
+++ b/trusty/debian/heat-api-cloudwatch.postinst.in
@@ -10,7 +10,7 @@ if [ "$1" = "configure" ] ; then
        . /usr/share/debconf/confmodule
        pkgos_var_user_group heat
        pkgos_write_new_conf heat heat-api-cloudwatch-paste.ini
-       pkgos_write_admin_creds /etc/heat/heat-api-cloudwatch-paste.ini heat filter:authtoken
+       pkgos_write_admin_creds /etc/heat/heat-api-cloudwatch-paste.ini filter:authtoken heat
        chown -R heat:adm /var/log/heat
        chmod 0750 /var/log/heat
 fi

diff --git a/trusty/debian/heat-api.config.in b/trusty/debian/heat-api.config.in
index dfcefe9db544ec56314d8d12fc7a76098167883e..55be5965dfc12421666a03b7968f05edc8690f67 100644 (file)
--- a/trusty/debian/heat-api.config.in
+++ b/trusty/debian/heat-api.config.in
@@ -10,7 +10,7 @@ APIPASTE_CONF=/etc/heat/heat-api-paste.ini
 #PKGOS-INCLUDE#
 
 pkgos_var_user_group heat
-pkgos_read_admin_creds ${APIPASTE_CONF} heat filter:authtoken
+pkgos_read_admin_creds ${APIPASTE_CONF} filter:authtoken heat
 pkgos_register_endpoint_config heat
 
 exit 0

diff --git a/trusty/debian/heat-api.postinst.in b/trusty/debian/heat-api.postinst.in
index 6e02afaa4808e2abb38d67442977632005a1213b..579735c03c90cade624678b4248401babc2d789f 100644 (file)
--- a/trusty/debian/heat-api.postinst.in
+++ b/trusty/debian/heat-api.postinst.in
@@ -12,7 +12,7 @@ if [ "$1" = "configure" ] ; then
         pkgos_var_user_group heat
 
         pkgos_write_new_conf heat heat-api-paste.ini
-        pkgos_write_admin_creds /etc/heat/heat-api-paste.ini heat filter:authtoken
+        pkgos_write_admin_creds /etc/heat/heat-api-paste.ini filter:authtoken heat
 
        pkgos_register_endpoint_postinst heat heat orchestration "Heat Orchestration API" 8004 /v1/'%(tenant_id)s'
 

diff --git a/trusty/debian/heat-engine.config.in b/trusty/debian/heat-engine.config.in
index fae53ccf460d7f8cece4908d9384cd4acb8483ad..28ef32c8eb1bad09e4c8cd5c807dfac719601679 100644 (file)
--- a/trusty/debian/heat-engine.config.in
+++ b/trusty/debian/heat-engine.config.in
@@ -9,6 +9,6 @@ CONF=/etc/heat/heat-engine.conf
 #PKGOS-INCLUDE#
 
 pkgos_var_user_group heat
-pkgos_dbc_read_conf -pkg heat-engine ${CONF} heat DEFAULT sql_connection $@
+pkgos_dbc_read_conf -pkg heat-engine ${CONF} DEFAULT sql_connection heat $@
 
 exit 0

diff --git a/trusty/debian/heat-engine.postinst.in b/trusty/debian/heat-engine.postinst.in
index 2c8f552bb4b7007d8a0b1d24f945aedd7877e29c..141818c2c13e930efdc95cf0af95ba9344fb0085 100644 (file)
--- a/trusty/debian/heat-engine.postinst.in
+++ b/trusty/debian/heat-engine.postinst.in
@@ -12,7 +12,7 @@ if [ "$1" = "configure" ] ; then
 
        pkgos_var_user_group heat
        pkgos_write_new_conf heat heat-engine.conf
-       pkgos_dbc_postinst ${CONF} heat DEFAULT sql_connection $@
+       pkgos_dbc_postinst ${CONF} DEFAULT sql_connection heat $@
 
        python -m heat.db.sqlalchemy.manage version_control
        python -m heat.db.sqlalchemy.manage upgrade