From 0feec9e0bcb88b0a16bbffbacb26a53139dccbf9 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Tue, 12 Mar 2013 19:37:45 +0800 Subject: [PATCH] Rewrote pkgos calls to match the new order of parameters. Rewritten-From: ced0c8dec581de8b83cbcdd6b37aafbbdb9115e4 --- trusty/debian/control | 2 +- trusty/debian/heat-api-cfn.config.in | 2 +- trusty/debian/heat-api-cfn.postinst.in | 2 +- trusty/debian/heat-api-cloudwatch.config.in | 2 +- trusty/debian/heat-api-cloudwatch.postinst.in | 2 +- trusty/debian/heat-api.config.in | 2 +- trusty/debian/heat-api.postinst.in | 2 +- trusty/debian/heat-engine.config.in | 2 +- trusty/debian/heat-engine.postinst.in | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/trusty/debian/control b/trusty/debian/control index 2cefaa66..d09afe24 100644 --- a/trusty/debian/control +++ b/trusty/debian/control @@ -9,7 +9,7 @@ Uploaders: Loic Dachary (OuoU) , Mehdi Abaakouk 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 4fca6da0..7129f656 100644 --- 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 38aabf3f..f5e8a36a 100644 --- 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 69cbc9e5..f7dc764b 100644 --- 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 a743c8d3..769f7dd3 100644 --- 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 dfcefe9d..55be5965 100644 --- 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 6e02afaa..579735c0 100644 --- 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 fae53ccf..28ef32c8 100644 --- 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 2c8f552b..141818c2 100644 --- 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 -- 2.45.2