Merge "Make containerized nova-api run with httpd"

1 files changed, 5 insertions, 6 deletions

diff --git a/environments/docker-centos-tripleoupstream.yaml b/environments/docker-centos-tripleoupstream.yaml
index 47f8e528..01a118e4 100644
--- a/environments/docker-centos-tripleoupstream.yaml
+++ b/environments/docker-centos-tripleoupstream.yaml
@@ -1,6 +1,6 @@
-# Generated with the following on 2017-07-12T11:40:50.219622
+# Generated with the following on 2017-08-11T04:58:59.567629
 #
-#   overcloud container image prepare --env-file environments/docker-centos-tripleoupstream.yaml
+#   openstack overcloud container image prepare --env-file environments/docker-centos-tripleoupstream.yaml
 #
 
 parameter_defaults:
@@ -9,6 +9,7 @@ parameter_defaults:
   DockerAodhEvaluatorImage: tripleoupstream/centos-binary-aodh-evaluator:latest
   DockerAodhListenerImage: tripleoupstream/centos-binary-aodh-listener:latest
   DockerAodhNotifierImage: tripleoupstream/centos-binary-aodh-notifier:latest
+  DockerBarbicanApiImage: tripleoupstream/centos-binary-barbican-api:latest
   DockerCeilometerCentralImage: tripleoupstream/centos-binary-ceilometer-central:latest
   DockerCeilometerComputeImage: tripleoupstream/centos-binary-ceilometer-compute:latest
   DockerCeilometerConfigImage: tripleoupstream/centos-binary-ceilometer-central:latest
@@ -45,8 +46,8 @@ parameter_defaults:
   DockerHeatEngineImage: tripleoupstream/centos-binary-heat-engine:latest
   DockerHorizonConfigImage: tripleoupstream/centos-binary-horizon:latest
   DockerHorizonImage: tripleoupstream/centos-binary-horizon:latest
-  DockerIronicApiImage: tripleoupstream/centos-binary-ironic-api:latest
   DockerIronicApiConfigImage: tripleoupstream/centos-binary-ironic-api:latest
+  DockerIronicApiImage: tripleoupstream/centos-binary-ironic-api:latest
   DockerIronicConductorImage: tripleoupstream/centos-binary-ironic-conductor:latest
   DockerIronicConfigImage: tripleoupstream/centos-binary-ironic-pxe:latest
   DockerIronicInspectorConfigImage: tripleoupstream/centos-binary-ironic-inspector:latest
@@ -82,7 +83,7 @@ parameter_defaults:
   DockerNovaComputeImage: tripleoupstream/centos-binary-nova-compute:latest
   DockerNovaComputeIronicImage: tripleoupstream/centos-binary-nova-compute-ironic:latest
   DockerNovaConductorImage: tripleoupstream/centos-binary-nova-conductor:latest
-  DockerNovaConfigImage: tripleoupstream/centos-binary-nova-base:latest
+  DockerNovaConfigImage: tripleoupstream/centos-binary-nova-api:latest
   DockerNovaConsoleauthImage: tripleoupstream/centos-binary-nova-consoleauth:latest
   DockerNovaLibvirtConfigImage: tripleoupstream/centos-binary-nova-compute:latest
   DockerNovaLibvirtImage: tripleoupstream/centos-binary-nova-libvirt:latest
@@ -100,8 +101,6 @@ parameter_defaults:
   DockerOctaviaHealthManagerImage: tripleoupstream/centos-binary-octavia-health-manager:latest
   DockerOctaviaHousekeepingImage: tripleoupstream/centos-binary-octavia-housekeeping:latest
   DockerOctaviaWorkerImage: tripleoupstream/centos-binary-octavia-worker:latest
-  DockerOpendaylightApiImage: tripleoupstream/centos-binary-opendaylight:latest
-  DockerOpendaylightConfigImage: tripleoupstream/centos-binary-opendaylight:latest
   DockerOpenvswitchImage: tripleoupstream/centos-binary-neutron-openvswitch-agent:latest
   DockerPankoApiImage: tripleoupstream/centos-binary-panko-api:latest
   DockerPankoConfigImage: tripleoupstream/centos-binary-panko-api:latest