heat-api-paste.ini, heat-api-cloudwatch.ini and heat-api-cnf-paste.ini don't exist...

Rewritten-From: 2149ba88d78fcea498c8254da7f9bb17b90f1914

diff --git a/xenial/debian/heat-api-cfn.config.in b/xenial/debian/heat-api-cfn.config.in
index 7129f6567eec1ff887aa1f0937a56a6f6c8ebc8c..17ab3dee1ded9c5583a17dffd843e2b3d32081f3 100644 (file)
--- a/xenial/debian/heat-api-cfn.config.in
+++ b/xenial/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/xenial/debian/heat-api-cfn.install b/xenial/debian/heat-api-cfn.install
index 67b8b41e6b43b62a1fc85c3a8331cf9c66fbfa2c..2c5cc85825386e211f1c15e0d039021b063743db 100644 (file)
--- a/xenial/debian/heat-api-cfn.install
+++ b/xenial/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/xenial/debian/heat-api-cfn.postinst.in b/xenial/debian/heat-api-cfn.postinst.in
index f5e8a36acb819ef12bb1a5252271d857f865b149..6fe5f5c1becaa71ffb7346bec63ed8bafa6f4fe2 100644 (file)
--- a/xenial/debian/heat-api-cfn.postinst.in
+++ b/xenial/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/xenial/debian/heat-api-cfn.postrm b/xenial/debian/heat-api-cfn.postrm
index 413152342310ad7eea29e1d69424a02eea0fccff..af1cb591e9d9cab6a324498f1fc7e483a926f6d5 100644 (file)
--- a/xenial/debian/heat-api-cfn.postrm
+++ b/xenial/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/xenial/debian/heat-api-cloudwatch.config.in b/xenial/debian/heat-api-cloudwatch.config.in
index f7dc764bba32681ff9b2a390dac38271d0a75e4a..9d4e065a7a888f8c24f754f8bc2562d5c85efc9a 100644 (file)
--- a/xenial/debian/heat-api-cloudwatch.config.in
+++ b/xenial/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/xenial/debian/heat-api-cloudwatch.install b/xenial/debian/heat-api-cloudwatch.install
index 1895206910db4f65d2cc5338f8b6ef816956648b..f59c1287fccb74c8d9cbe17451b575e9643a1f90 100644 (file)
--- a/xenial/debian/heat-api-cloudwatch.install
+++ b/xenial/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/xenial/debian/heat-api-cloudwatch.postinst.in b/xenial/debian/heat-api-cloudwatch.postinst.in
index 769f7dd3f98e4814ee68188407f9610ecf8783f1..03f0d65274041d5126098a16d99fc45b985f16de 100644 (file)
--- a/xenial/debian/heat-api-cloudwatch.postinst.in
+++ b/xenial/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/xenial/debian/heat-api-cloudwatch.postrm b/xenial/debian/heat-api-cloudwatch.postrm
index 7c59aa93c5978b8e06a44082e6a0075e30657b71..e2bd0e09fcf252ab2567571be78dc5fb1a39a8da 100644 (file)
--- a/xenial/debian/heat-api-cloudwatch.postrm
+++ b/xenial/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/xenial/debian/heat-api.config.in b/xenial/debian/heat-api.config.in
index 55be5965dfc12421666a03b7968f05edc8690f67..4bb82b775283bcdd8a43c01673644b1a2effa3b7 100644 (file)
--- a/xenial/debian/heat-api.config.in
+++ b/xenial/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/xenial/debian/heat-api.install b/xenial/debian/heat-api.install
index 5f738a824656e8b1c3a65acd7e7e7687cb1f8695..c00ec1f335bf634dc45454d4fdf29d446bf278d8 100644 (file)
--- a/xenial/debian/heat-api.install
+++ b/xenial/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/xenial/debian/heat-api.postinst.in b/xenial/debian/heat-api.postinst.in
index 579735c03c90cade624678b4248401babc2d789f..7b9e8a984d89c22c9c7692356fbadfb65246eae9 100644 (file)
--- a/xenial/debian/heat-api.postinst.in
+++ b/xenial/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/xenial/debian/heat-api.postrm b/xenial/debian/heat-api.postrm
index 6f98991436cb7115a38da4a5afee70e7d17277f4..de9e1c4a3663bf5aa9977db8a8b7eea1db33aac0 100644 (file)
--- a/xenial/debian/heat-api.postrm
+++ b/xenial/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/xenial/debian/rules b/xenial/debian/rules
index 4c4ee631c45bdb4de9a5f3c964f5885213836fbc..a9d20d0aa7349c170242576c1e9d26404abd07e1 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/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