From 1962bfb16e70835af83d93155018933dec866f30 Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Tue, 9 Jun 2015 18:55:44 -0400 Subject: [PATCH] Fix Heat container env vars and dependencies This commit adds a few dependencies (that are actually packaging errors) present in all of the containers, as well as specifically in heat-engine. Some of the environment variables were not set correctly in the heat-api-cfn container. The environment variables have also been correctly added to the genenv script. Also removed duplicated compose file data already present in heat-api-engine. Closes-Bug: #1461872 Change-Id: I9631d1bc6ea42425272570a9dda8cbf5edcef4f3 --- compose/heat-api-cfn.yml | 7 ------- docker/centos/binary/heat/heat-base/Dockerfile | 3 +++ docker/centos/binary/heat/heat-engine/Dockerfile | 4 ++++ docker/common/heat/heat-base/config-heat.sh | 4 +++- tools/genenv | 11 ++++++++++- 5 files changed, 20 insertions(+), 9 deletions(-) delete mode 100644 compose/heat-api-cfn.yml diff --git a/compose/heat-api-cfn.yml b/compose/heat-api-cfn.yml deleted file mode 100644 index 4399b88559..0000000000 --- a/compose/heat-api-cfn.yml +++ /dev/null @@ -1,7 +0,0 @@ -heatapicfn: - image: kollaglue/centos-rdo-heat-api-cfn:latest - name: heat-api-cfn - net: "host" - restart: always - env_file: - - openstack.env diff --git a/docker/centos/binary/heat/heat-base/Dockerfile b/docker/centos/binary/heat/heat-base/Dockerfile index ebe9fa15c2..5108861649 100644 --- a/docker/centos/binary/heat/heat-base/Dockerfile +++ b/docker/centos/binary/heat/heat-base/Dockerfile @@ -1,5 +1,8 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) +# necessary until https://bugzilla.redhat.com/show_bug.cgi?id=1229477 is fixed +RUN yum -y install python-oslo-policy && yum clean all + RUN mkdir -p /opt/kolla COPY config-heat.sh /opt/kolla/config-heat.sh diff --git a/docker/centos/binary/heat/heat-engine/Dockerfile b/docker/centos/binary/heat/heat-engine/Dockerfile index 227ac335d9..b97454e705 100644 --- a/docker/centos/binary/heat/heat-engine/Dockerfile +++ b/docker/centos/binary/heat/heat-engine/Dockerfile @@ -2,6 +2,10 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum -y install \ + # until http://pkgs.fedoraproject.org/cgit/openstack-heat.git/tree/openstack-heat.spec#n248 \ + # is updated, the clients must remain here: \ + python-barbicanclient \ + python-zaqarclient \ openstack-heat-engine \ && yum clean all diff --git a/docker/common/heat/heat-base/config-heat.sh b/docker/common/heat/heat-base/config-heat.sh index 74b2718a4b..449fbd9980 100755 --- a/docker/common/heat/heat-base/config-heat.sh +++ b/docker/common/heat/heat-base/config-heat.sh @@ -15,7 +15,9 @@ set -e : ${RABBIT_PASSWORD:=guest} check_required_vars HEAT_DB_PASSWORD HEAT_KEYSTONE_PASSWORD \ - KEYSTONE_PUBLIC_SERVICE_HOST RABBITMQ_SERVICE_HOST + HEAT_API_CFN_URL_HOST HEAT_API_CFN_SERVICE_PORT \ + KEYSTONE_PUBLIC_SERVICE_HOST KEYSTONE_PUBLIC_SERVICE_PORT \ + RABBITMQ_SERVICE_HOST MARIADB_SERVICE_HOST fail_unless_db dump_vars diff --git a/tools/genenv b/tools/genenv index b1a13fd378..ba77c2fc8b 100755 --- a/tools/genenv +++ b/tools/genenv @@ -126,9 +126,13 @@ NEUTRON_SHARED_SECRET=sharedsecret # Heat HEAT_DB_NAME=heat HEAT_DB_PASSWORD=kolla +HEAT_KEYSTONE_USER=heat HEAT_KEYSTONE_PASSWORD=heat +HEAT_CFN_KEYSTONE_USER=heat-cfn +HEAT_CFN_KEYSTONE_PASSWORD=heat HEAT_API_SERVICE_HOST=$HOST_IP HEAT_API_CFN_SERVICE_HOST=$HOST_IP +HEAT_API_CFN_SERVICE_PORT=8000 HEAT_API_CFN_URL_HOST=$HOST_IP # Magnum @@ -267,8 +271,14 @@ NEUTRON_FLAT_NETWORK_NAME=$NEUTRON_FLAT_NETWORK_NAME NEUTRON_FLAT_NETWORK_INTERFACE=$NEUTRON_FLAT_NETWORK_INTERFACE HEAT_DB_NAME=$HEAT_DB_NAME HEAT_DB_PASSWORD=$HEAT_DB_PASSWORD +HEAT_KEYSTONE_USER=$HEAT_KEYSTONE_USER HEAT_KEYSTONE_PASSWORD=$HEAT_KEYSTONE_PASSWORD +HEAT_CFN_KEYSTONE_USER=$HEAT_CFN_KEYSTONE_USER +HEAT_CFN_KEYSTONE_PASSWORD=$HEAT_CFN_KEYSTONE_PASSWORD HEAT_API_SERVICE_HOST=$HEAT_API_SERVICE_HOST +HEAT_API_CFN_SERVICE_HOST=$HEAT_API_CFN_SERVICE_HOST +HEAT_API_CFN_SERVICE_PORT=$HEAT_API_CFN_SERVICE_PORT +HEAT_API_CFN_URL_HOST=$HEAT_API_CFN_URL_HOST MAGNUM_DB_NAME=$MAGNUM_DB_NAME MAGNUM_DB_PASSWORD=$MAGNUM_DB_PASSWORD MAGNUM_KEYSTONE_PASSWORD=$MAGNUM_KEYSTONE_PASSWORD @@ -281,7 +291,6 @@ RABBITMQ_SERVICE_HOST=$RABBITMQ_SERVICE_HOST RABBITMQ_USER=$RABBIT_USER RABBIT_PASSWORD=$RABBIT_PASSWORD RABBIT_USERID=$RABBIT_USER -HEAT_API_CFN_SERVICE_HOST=$HEAT_API_CFN_SERVICE_HOST DESIGNATE_DB_NAME=$DESIGNATE_DB_NAME DESIGNATE_DB_USER=$DESIGNATE_DB_USER DESIGNATE_DB_PASSWORD=$DESIGNATE_DB_PASSWORD