aboutsummaryrefslogtreecommitdiff
path: root/compose
diff options
context:
space:
mode:
authorJeff Peeler <jpeeler@redhat.com>2015-06-09 18:55:44 -0400
committerJeff Peeler <jpeeler@redhat.com>2015-06-19 17:33:32 -0400
commit1962bfb16e70835af83d93155018933dec866f30 (patch)
tree49527671223e96740fe1b9ac60adfc9d7a8521aa /compose
parentb87f16fac59236c1c1047f75457fa8ea8cab976c (diff)
downloadkolla-1962bfb16e70835af83d93155018933dec866f30.tar.gz
kolla-1962bfb16e70835af83d93155018933dec866f30.zip
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
Diffstat (limited to 'compose')
-rw-r--r--compose/heat-api-cfn.yml7
1 files changed, 0 insertions, 7 deletions
diff --git a/compose/heat-api-cfn.yml b/compose/heat-api-cfn.yml
deleted file mode 100644
index 4399b8855..000000000
--- 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