From 1fe61c841dfadf74d87b10f093bf6c9985c49eff Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Sat, 29 Jun 2013 21:47:51 +0800 Subject: [PATCH] heat-api-paste.ini, heat-api-cloudwatch.ini and heat-api-cnf-paste.ini don't exist anymore, using heat-api.conf, heat-api-cloudwatch.conf and heat-api-cnf.conf instead. Rewritten-From: 2149ba88d78fcea498c8254da7f9bb17b90f1914 --- trusty/debian/heat-api-cfn.config.in | 3 +-- trusty/debian/heat-api-cfn.install | 3 +-- trusty/debian/heat-api-cfn.postinst.in | 4 ++-- trusty/debian/heat-api-cfn.postrm | 2 +- trusty/debian/heat-api-cloudwatch.config.in | 4 ++-- trusty/debian/heat-api-cloudwatch.install | 3 +-- trusty/debian/heat-api-cloudwatch.postinst.in | 4 ++-- trusty/debian/heat-api-cloudwatch.postrm | 2 +- trusty/debian/heat-api.config.in | 3 +-- trusty/debian/heat-api.install | 3 +-- trusty/debian/heat-api.postinst.in | 6 ++---- trusty/debian/heat-api.postrm | 2 +- trusty/debian/rules | 6 +++--- 13 files changed, 19 insertions(+), 26 deletions(-) diff --git a/trusty/debian/heat-api-cfn.config.in b/trusty/debian/heat-api-cfn.config.in index 7129f656..17ab3dee 100644 --- a/trusty/debian/heat-api-cfn.config.in +++ b/trusty/debian/heat-api-cfn.config.in @@ -5,11 +5,10 @@ set -e . /usr/share/debconf/confmodule API_CONF=/etc/heat/heat-api-cfn.conf -APIPASTE_CONF=/etc/heat/heat-api-cfn-paste.ini #PKGOS-INCLUDE# pkgos_var_user_group heat -pkgos_read_admin_creds ${APIPASTE_CONF} filter:authtoken heat +pkgos_read_admin_creds ${API_CONF} keystone_authtoken heat exit 0 diff --git a/trusty/debian/heat-api-cfn.install b/trusty/debian/heat-api-cfn.install index 67b8b41e..2c5cc858 100644 --- a/trusty/debian/heat-api-cfn.install +++ b/trusty/debian/heat-api-cfn.install @@ -1,3 +1,2 @@ -etc/heat/heat-api-cfn-paste.ini /usr/share/heat-api-cfn -etc/heat/heat-api-cfn.conf +etc/heat/heat-api-cfn.conf /usr/share/heat-api-cfn usr/bin/heat-api-cfn diff --git a/trusty/debian/heat-api-cfn.postinst.in b/trusty/debian/heat-api-cfn.postinst.in index f5e8a36a..6fe5f5c1 100644 --- a/trusty/debian/heat-api-cfn.postinst.in +++ b/trusty/debian/heat-api-cfn.postinst.in @@ -9,8 +9,8 @@ ETC=/etc/heat 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 filter:authtoken heat + pkgos_write_new_conf heat heat-api-cfn.conf + pkgos_write_admin_creds /etc/heat/heat-api-cfn.conf keystone_authtoken heat chown -R heat:adm /var/log/heat chmod 0750 /var/log/heat fi diff --git a/trusty/debian/heat-api-cfn.postrm b/trusty/debian/heat-api-cfn.postrm index 41315234..af1cb591 100644 --- a/trusty/debian/heat-api-cfn.postrm +++ b/trusty/debian/heat-api-cfn.postrm @@ -3,7 +3,7 @@ set -e if [ "${1}" = "purge" ] ; then - rm -f /etc/heat/heat-api-cfn-paste.ini + rm -f /etc/heat/heat-api-cfn.conf [ -d /etc/heat ] && rmdir --ignore-fail-on-non-empty /etc/heat rm -rf /var/log/heat/api-cfn* [ -d /var/log/heat ] && rmdir --ignore-fail-on-non-empty /var/log/heat diff --git a/trusty/debian/heat-api-cloudwatch.config.in b/trusty/debian/heat-api-cloudwatch.config.in index f7dc764b..9d4e065a 100644 --- a/trusty/debian/heat-api-cloudwatch.config.in +++ b/trusty/debian/heat-api-cloudwatch.config.in @@ -4,11 +4,11 @@ set -e . /usr/share/debconf/confmodule -APIPASTE_CONF=/etc/heat/heat-api-cloudwatch-paste.ini +API_CONF=/etc/heat/heat-api-cloudwatch.conf #PKGOS-INCLUDE# pkgos_var_user_group heat -pkgos_read_admin_creds ${APIPASTE_CONF} filter:authtoken heat +pkgos_read_admin_creds ${API_CONF} keystone_authtoken heat exit 0 diff --git a/trusty/debian/heat-api-cloudwatch.install b/trusty/debian/heat-api-cloudwatch.install index 18952069..f59c1287 100644 --- a/trusty/debian/heat-api-cloudwatch.install +++ b/trusty/debian/heat-api-cloudwatch.install @@ -1,3 +1,2 @@ /usr/bin/heat-api-cloudwatch -etc/heat/heat-api-cloudwatch-paste.ini /usr/share/heat-api-cloudwatch -etc/heat/heat-api-cloudwatch.conf +etc/heat/heat-api-cloudwatch.conf /usr/share/heat-api-cloudwatch diff --git a/trusty/debian/heat-api-cloudwatch.postinst.in b/trusty/debian/heat-api-cloudwatch.postinst.in index 769f7dd3..03f0d652 100644 --- a/trusty/debian/heat-api-cloudwatch.postinst.in +++ b/trusty/debian/heat-api-cloudwatch.postinst.in @@ -9,8 +9,8 @@ ETC=/etc/heat 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 filter:authtoken heat + pkgos_write_new_conf heat heat-api-cloudwatch.conf + pkgos_write_admin_creds /etc/heat/heat-api-cloudwatch.conf keystone_authtoken heat chown -R heat:adm /var/log/heat chmod 0750 /var/log/heat fi diff --git a/trusty/debian/heat-api-cloudwatch.postrm b/trusty/debian/heat-api-cloudwatch.postrm index 7c59aa93..e2bd0e09 100644 --- a/trusty/debian/heat-api-cloudwatch.postrm +++ b/trusty/debian/heat-api-cloudwatch.postrm @@ -3,7 +3,7 @@ set -e if [ "${1}" = "purge" ] ; then - rm -f /etc/heat/heat-api-cloudwatch-paste.ini + rm -f /etc/heat/heat-api-cloudwatch.conf [ -d /etc/heat ] && rmdir --ignore-fail-on-non-empty /etc/heat rm -rf /var/log/heat/api-cloudwatch* [ -d /var/log/heat ] && rmdir --ignore-fail-on-non-empty /var/log/heat diff --git a/trusty/debian/heat-api.config.in b/trusty/debian/heat-api.config.in index 55be5965..4bb82b77 100644 --- a/trusty/debian/heat-api.config.in +++ b/trusty/debian/heat-api.config.in @@ -5,12 +5,11 @@ set -e . /usr/share/debconf/confmodule API_CONF=/etc/heat/heat-api.conf -APIPASTE_CONF=/etc/heat/heat-api-paste.ini #PKGOS-INCLUDE# pkgos_var_user_group heat -pkgos_read_admin_creds ${APIPASTE_CONF} filter:authtoken heat +pkgos_read_admin_creds ${API_CONF} keystone_authtoken heat pkgos_register_endpoint_config heat exit 0 diff --git a/trusty/debian/heat-api.install b/trusty/debian/heat-api.install index 5f738a82..c00ec1f3 100644 --- a/trusty/debian/heat-api.install +++ b/trusty/debian/heat-api.install @@ -1,3 +1,2 @@ -etc/heat/heat-api-paste.ini /usr/share/heat-api -etc/heat/heat-api.conf +etc/heat/heat-api.conf /usr/share/heat-api usr/bin/heat-api diff --git a/trusty/debian/heat-api.postinst.in b/trusty/debian/heat-api.postinst.in index 579735c0..7b9e8a98 100644 --- a/trusty/debian/heat-api.postinst.in +++ b/trusty/debian/heat-api.postinst.in @@ -2,8 +2,6 @@ set -e -ETC=/etc/heat - #PKGOS-INCLUDE# if [ "$1" = "configure" ] ; then @@ -11,8 +9,8 @@ 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 filter:authtoken heat + pkgos_write_new_conf heat heat-api.conf + pkgos_write_admin_creds /etc/heat/heat-api.conf keystone_authtoken heat pkgos_register_endpoint_postinst heat heat orchestration "Heat Orchestration API" 8004 /v1/'%(tenant_id)s' diff --git a/trusty/debian/heat-api.postrm b/trusty/debian/heat-api.postrm index 6f989914..de9e1c4a 100644 --- a/trusty/debian/heat-api.postrm +++ b/trusty/debian/heat-api.postrm @@ -3,7 +3,7 @@ set -e if [ "${1}" = "purge" ] ; then - rm -f /etc/heat/heat-api-paste.ini + rm -f /etc/heat/heat-api.conf [ -d /etc/heat ] && rmdir --ignore-fail-on-non-empty /etc/heat rm -rf /var/log/heat/api.* [ -d /var/log/heat ] && rmdir --ignore-fail-on-non-empty /var/log/heat diff --git a/trusty/debian/rules b/trusty/debian/rules index 4c4ee631..a9d20d0a 100755 --- a/trusty/debian/rules +++ b/trusty/debian/rules @@ -34,9 +34,9 @@ override_dh_clean: override_dh_install: dh_install sed -i 's/^[ \t]*rpc_backend[ \t]*=[ \t]*heat.openstack.common.rpc.impl_qpid/rpc_backend=heat.openstack.common.rpc.impl_kombu/' $(CURDIR)/debian/heat-engine/usr/share/heat-engine/heat-engine.conf - sed -i 's/^[ \t]*rpc_backend[ \t]*=[ \t]*heat.openstack.common.rpc.impl_qpid/rpc_backend=heat.openstack.common.rpc.impl_kombu/' $(CURDIR)/debian/heat-api-cloudwatch/etc/heat/heat-api-cloudwatch.conf - sed -i 's/^[ \t]*rpc_backend[ \t]*=[ \t]*heat.openstack.common.rpc.impl_qpid/rpc_backend=heat.openstack.common.rpc.impl_kombu/' $(CURDIR)/debian/heat-api-cfn/etc/heat/heat-api-cfn.conf - sed -i 's/^[ \t]*rpc_backend[ \t]*=[ \t]*heat.openstack.common.rpc.impl_qpid/rpc_backend=heat.openstack.common.rpc.impl_kombu/' $(CURDIR)/debian/heat-api/etc/heat/heat-api.conf + sed -i 's/^[ \t]*rpc_backend[ \t]*=[ \t]*heat.openstack.common.rpc.impl_qpid/rpc_backend=heat.openstack.common.rpc.impl_kombu/' $(CURDIR)/debian/heat-api-cloudwatch/usr/share/heat-api-cloudwatch/heat-api-cloudwatch.conf + sed -i 's/^[ \t]*rpc_backend[ \t]*=[ \t]*heat.openstack.common.rpc.impl_qpid/rpc_backend=heat.openstack.common.rpc.impl_kombu/' $(CURDIR)/debian/heat-api-cfn/usr/share/heat-api-cfn/heat-api-cfn.conf + sed -i 's/^[ \t]*rpc_backend[ \t]*=[ \t]*heat.openstack.common.rpc.impl_qpid/rpc_backend=heat.openstack.common.rpc.impl_kombu/' $(CURDIR)/debian/heat-api/usr/share/heat-api/heat-api.conf override_dh_auto_build: dh_auto_build -- 2.45.2