Merge "Use a single configuration file for specifying docker containers."

1 files changed, 121 insertions, 115 deletions

diff --git a/environments/docker-centos-tripleoupstream.yaml b/environments/docker-centos-tripleoupstream.yaml
index 9eb45363..d94ac6d7 100644
--- a/environments/docker-centos-tripleoupstream.yaml
+++ b/environments/docker-centos-tripleoupstream.yaml
@@ -1,116 +1,122 @@
-parameter_defaults:
-  # FIXME: Remove this when we uncomment at least one parameter in this file.
-  # It seems an environment file with empty parameter_defaults section has the
-  # potential to confuse Heat in a way that it doesn't deploy a single service
-  # on the overcloud in the multinode job.
-  # https://bugs.launchpad.net/tripleo/+bug/1703599
-  PlaceholderParameter: can be removed when we add a different param to this env file
+# Generated with the following on 2017-07-12T11:40:50.219622
+#
+#   overcloud container image prepare --env-file environments/docker-centos-tripleoupstream.yaml
+#
 
-  #DockerAodhApiImage: 'tripleoupstream/centos-binary-aodh-api:latest'
-  #DockerAodhConfigImage: 'tripleoupstream/centos-binary-aodh-api:latest'
-  #DockerAodhEvaluatorImage: 'tripleoupstream/centos-binary-aodh-evaluator:latest'
-  #DockerAodhListenerImage: 'tripleoupstream/centos-binary-aodh-listener:latest'
-  #DockerAodhNotifierImage: 'tripleoupstream/centos-binary-aodh-notifier:latest'
-  #DockerCeilometerCentralImage: 'tripleoupstream/centos-binary-ceilometer-central:latest'
-  #DockerCeilometerComputeImage: 'tripleoupstream/centos-binary-ceilometer-compute:latest'
-  #DockerCeilometerConfigImage: 'tripleoupstream/centos-binary-ceilometer-central:latest'
-  #DockerCeilometerIpmiImage: 'tripleoupstream/centos-binary-ceilometer-ipmi:latest'
-  #DockerCeilometerNotificationImage: 'tripleoupstream/centos-binary-ceilometer-notification:latest'
-  #DockerCinderApiImage: 'tripleoupstream/centos-binary-cinder-api:latest'
-  #DockerCinderBackupImage: 'tripleoupstream/centos-binary-cinder-backup:latest'
-  #DockerCinderConfigImage: 'tripleoupstream/centos-binary-cinder-api:latest'
-  #DockerCinderSchedulerImage: 'tripleoupstream/centos-binary-cinder-scheduler:latest'
-  #DockerCinderVolumeImage: 'tripleoupstream/centos-binary-cinder-volume:latest'
-  #DockerClustercheckConfigImage: 'tripleoupstream/centos-binary-mariadb:latest'
-  #DockerClustercheckImage: 'tripleoupstream/centos-binary-mariadb:latest'
-  #DockerCollectdConfigImage: 'tripleoupstream/centos-binary-collectd:latest'
-  #DockerCollectdImage: 'tripleoupstream/centos-binary-collectd:latest'
-  #DockerCongressApiImage: 'tripleoupstream/centos-binary-congress-api:latest'
-  #DockerCongressConfigImage: 'tripleoupstream/centos-binary-congress-api:latest'
-  #DockerEc2ApiConfigImage: 'tripleoupstream/centos-binary-ec2-api:latest'
-  #DockerEc2ApiImage: 'tripleoupstream/centos-binary-ec2-api:latest'
-  #DockerEtcdConfigImage: 'tripleoupstream/centos-binary-etcd:latest'
-  #DockerEtcdImage: 'tripleoupstream/centos-binary-etcd:latest'
-  #DockerGlanceApiConfigImage: 'tripleoupstream/centos-binary-glance-api:latest'
-  #DockerGlanceApiImage: 'tripleoupstream/centos-binary-glance-api:latest'
-  #DockerGnocchiApiImage: 'tripleoupstream/centos-binary-gnocchi-api:latest'
-  #DockerGnocchiConfigImage: 'tripleoupstream/centos-binary-gnocchi-api:latest'
-  #DockerGnocchiMetricdImage: 'tripleoupstream/centos-binary-gnocchi-metricd:latest'
-  #DockerGnocchiStatsdImage: 'tripleoupstream/centos-binary-gnocchi-statsd:latest'
-  #DockerHAProxyConfigImage: 'tripleoupstream/centos-binary-haproxy:latest'
-  #DockerHAProxyImage: 'tripleoupstream/centos-binary-haproxy:latest'
-  #DockerHeatApiCfnConfigImage: 'tripleoupstream/centos-binary-heat-api-cfn:latest'
-  #DockerHeatApiCfnImage: 'tripleoupstream/centos-binary-heat-api-cfn:latest'
-  #DockerHeatApiConfigImage: 'tripleoupstream/centos-binary-heat-api:latest'
-  #DockerHeatApiImage: 'tripleoupstream/centos-binary-heat-api:latest'
-  #DockerHeatConfigImage: 'tripleoupstream/centos-binary-heat-api:latest'
-  #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'
-  #DockerIronicConductorImage: 'tripleoupstream/centos-binary-ironic-conductor:latest'
-  #DockerIronicConfigImage: 'tripleoupstream/centos-binary-ironic-pxe:latest'
-  #DockerIronicPxeImage: 'tripleoupstream/centos-binary-ironic-pxe:latest'
-  #DockerIscsidConfigImage: 'tripleoupstream/centos-binary-iscsid:latest'
-  #DockerIscsidImage: 'tripleoupstream/centos-binary-iscsid:latest'
-  #DockerKeystoneConfigImage: 'tripleoupstream/centos-binary-keystone:latest'
-  #DockerKeystoneImage: 'tripleoupstream/centos-binary-keystone:latest'
-  #DockerManilaApiImage: 'tripleoupstream/centos-binary-manila-api:latest'
-  #DockerManilaConfigImage: 'tripleoupstream/centos-binary-manila-api:latest'
-  #DockerManilaSchedulerImage: 'tripleoupstream/centos-binary-manila-scheduler:latest'
-  #DockerMemcachedConfigImage: 'tripleoupstream/centos-binary-memcached:latest'
-  #DockerMemcachedImage: 'tripleoupstream/centos-binary-memcached:latest'
-  #DockerMistralApiImage: 'tripleoupstream/centos-binary-mistral-api:latest'
-  #DockerMistralConfigImage: 'tripleoupstream/centos-binary-mistral-api:latest'
-  #DockerMistralEngineImage: 'tripleoupstream/centos-binary-mistral-engine:latest'
-  #DockerMistralExecutorImage: 'tripleoupstream/centos-binary-mistral-executor:latest'
-  #DockerMongodbConfigImage: 'tripleoupstream/centos-binary-mongodb:latest'
-  #DockerMongodbImage: 'tripleoupstream/centos-binary-mongodb:latest'
-  #DockerMultipathdConfigImage: 'tripleoupstream/centos-binary-multipathd:latest'
-  #DockerMultipathdImage: 'tripleoupstream/centos-binary-multipathd:latest'
-  #DockerMysqlClientConfigImage: 'tripleoupstream/centos-binary-mariadb:latest'
-  #DockerMysqlConfigImage: 'tripleoupstream/centos-binary-mariadb:latest'
-  #DockerMysqlImage: 'tripleoupstream/centos-binary-mariadb:latest'
-  #DockerNeutronApiImage: 'tripleoupstream/centos-binary-neutron-server:latest'
-  #DockerNeutronConfigImage: 'tripleoupstream/centos-binary-neutron-server:latest'
-  #DockerNeutronDHCPImage: 'tripleoupstream/centos-binary-neutron-dhcp-agent:latest'
-  #DockerNeutronL3AgentImage: 'tripleoupstream/centos-binary-neutron-l3-agent:latest'
-  #DockerNeutronMetadataImage: 'tripleoupstream/centos-binary-neutron-metadata-agent:latest'
-  #DockerNovaApiImage: 'tripleoupstream/centos-binary-nova-api:latest'
-  #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'
-  #DockerNovaConsoleauthImage: 'tripleoupstream/centos-binary-nova-consoleauth:latest'
-  #DockerNovaLibvirtConfigImage: 'tripleoupstream/centos-binary-nova-compute:latest'
-  #DockerNovaLibvirtImage: 'tripleoupstream/centos-binary-nova-libvirt:latest'
-  #DockerNovaPlacementConfigImage: 'tripleoupstream/centos-binary-nova-placement-api:latest'
-  #DockerNovaPlacementImage: 'tripleoupstream/centos-binary-nova-placement-api:latest'
-  #DockerNovaSchedulerImage: 'tripleoupstream/centos-binary-nova-scheduler:latest'
-  #DockerNovaVncProxyImage: 'tripleoupstream/centos-binary-nova-novncproxy:latest'
-  #DockerOctaviaApiImage: 'tripleoupstream/centos-binary-octavia-api:latest'
-  #DockerOctaviaConfigImage: 'tripleoupstream/centos-binary-octavia-api:latest'
-  #DockerOctaviaHealthManagerImage: 'tripleoupstream/centos-binary-octavia-health-manager:latest'
-  #DockerOctaviaHousekeepingImage: 'tripleoupstream/centos-binary-octavia-housekeeping:latest'
-  #DockerOctaviaWorkerImage: 'tripleoupstream/centos-binary-octavia-worker:latest'
-  #DockerOpenvswitchImage: 'tripleoupstream/centos-binary-neutron-openvswitch-agent:latest'
-  #DockerPankoApiImage: 'tripleoupstream/centos-binary-panko-api:latest'
-  #DockerPankoConfigImage: 'tripleoupstream/centos-binary-panko-api:latest'
-  #DockerRabbitmqConfigImage: 'tripleoupstream/centos-binary-rabbitmq:latest'
-  #DockerRabbitmqImage: 'tripleoupstream/centos-binary-rabbitmq:latest'
-  #DockerRedisConfigImage: 'tripleoupstream/centos-binary-redis:latest'
-  #DockerRedisImage: 'tripleoupstream/centos-binary-redis:latest'
-  #DockerSaharaApiImage: 'tripleoupstream/centos-binary-sahara-api:latest'
-  #DockerSaharaConfigImage: 'tripleoupstream/centos-binary-sahara-api:latest'
-  #DockerSaharaEngineImage: 'tripleoupstream/centos-binary-sahara-engine:latest'
-  #DockerSensuClientImage: 'tripleoupstream/centos-binary-sensu-client:latest'
-  #DockerSensuConfigImage: 'tripleoupstream/centos-binary-sensu-client:latest'
-  #DockerSwiftAccountImage: 'tripleoupstream/centos-binary-swift-account:latest'
-  #DockerSwiftConfigImage: 'tripleoupstream/centos-binary-swift-proxy-server:latest'
-  #DockerSwiftContainerImage: 'tripleoupstream/centos-binary-swift-container:latest'
-  #DockerSwiftObjectImage: 'tripleoupstream/centos-binary-swift-object:latest'
-  #DockerSwiftProxyImage: 'tripleoupstream/centos-binary-swift-proxy-server:latest'
-  #DockerTackerConfigImage: 'tripleoupstream/centos-binary-tacker:latest'
-  #DockerTackerImage: 'tripleoupstream/centos-binary-tacker:latest'
-  #DockerZaqarConfigImage: 'tripleoupstream/centos-binary-zaqar:latest'
-  #DockerZaqarImage: 'tripleoupstream/centos-binary-zaqar:latest'
+parameter_defaults:
+  DockerAodhApiImage: tripleoupstream/centos-binary-aodh-api:latest
+  DockerAodhConfigImage: tripleoupstream/centos-binary-aodh-api:latest
+  DockerAodhEvaluatorImage: tripleoupstream/centos-binary-aodh-evaluator:latest
+  DockerAodhListenerImage: tripleoupstream/centos-binary-aodh-listener:latest
+  DockerAodhNotifierImage: tripleoupstream/centos-binary-aodh-notifier:latest
+  DockerCeilometerCentralImage: tripleoupstream/centos-binary-ceilometer-central:latest
+  DockerCeilometerComputeImage: tripleoupstream/centos-binary-ceilometer-compute:latest
+  DockerCeilometerConfigImage: tripleoupstream/centos-binary-ceilometer-central:latest
+  DockerCeilometerIpmiImage: tripleoupstream/centos-binary-ceilometer-ipmi:latest
+  DockerCeilometerNotificationImage: tripleoupstream/centos-binary-ceilometer-notification:latest
+  DockerCinderApiImage: tripleoupstream/centos-binary-cinder-api:latest
+  DockerCinderBackupImage: tripleoupstream/centos-binary-cinder-backup:latest
+  DockerCinderConfigImage: tripleoupstream/centos-binary-cinder-api:latest
+  DockerCinderSchedulerImage: tripleoupstream/centos-binary-cinder-scheduler:latest
+  DockerCinderVolumeImage: tripleoupstream/centos-binary-cinder-volume:latest
+  DockerClustercheckConfigImage: tripleoupstream/centos-binary-mariadb:latest
+  DockerClustercheckImage: tripleoupstream/centos-binary-mariadb:latest
+  DockerCollectdConfigImage: tripleoupstream/centos-binary-collectd:latest
+  DockerCollectdImage: tripleoupstream/centos-binary-collectd:latest
+  DockerCongressApiImage: tripleoupstream/centos-binary-congress-api:latest
+  DockerCongressConfigImage: tripleoupstream/centos-binary-congress-api:latest
+  DockerEc2ApiConfigImage: tripleoupstream/centos-binary-ec2-api:latest
+  DockerEc2ApiImage: tripleoupstream/centos-binary-ec2-api:latest
+  DockerEtcdConfigImage: tripleoupstream/centos-binary-etcd:latest
+  DockerEtcdImage: tripleoupstream/centos-binary-etcd:latest
+  DockerGlanceApiConfigImage: tripleoupstream/centos-binary-glance-api:latest
+  DockerGlanceApiImage: tripleoupstream/centos-binary-glance-api:latest
+  DockerGnocchiApiImage: tripleoupstream/centos-binary-gnocchi-api:latest
+  DockerGnocchiConfigImage: tripleoupstream/centos-binary-gnocchi-api:latest
+  DockerGnocchiMetricdImage: tripleoupstream/centos-binary-gnocchi-metricd:latest
+  DockerGnocchiStatsdImage: tripleoupstream/centos-binary-gnocchi-statsd:latest
+  DockerHAProxyConfigImage: tripleoupstream/centos-binary-haproxy:latest
+  DockerHAProxyImage: tripleoupstream/centos-binary-haproxy:latest
+  DockerHeatApiCfnConfigImage: tripleoupstream/centos-binary-heat-api-cfn:latest
+  DockerHeatApiCfnImage: tripleoupstream/centos-binary-heat-api-cfn:latest
+  DockerHeatApiConfigImage: tripleoupstream/centos-binary-heat-api:latest
+  DockerHeatApiImage: tripleoupstream/centos-binary-heat-api:latest
+  DockerHeatConfigImage: tripleoupstream/centos-binary-heat-api:latest
+  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
+  DockerIronicConductorImage: tripleoupstream/centos-binary-ironic-conductor:latest
+  DockerIronicConfigImage: tripleoupstream/centos-binary-ironic-pxe:latest
+  DockerIronicInspectorConfigImage: tripleoupstream/centos-binary-ironic-inspector:latest
+  DockerIronicInspectorImage: tripleoupstream/centos-binary-ironic-inspector:latest
+  DockerIronicPxeImage: tripleoupstream/centos-binary-ironic-pxe:latest
+  DockerIscsidConfigImage: tripleoupstream/centos-binary-iscsid:latest
+  DockerIscsidImage: tripleoupstream/centos-binary-iscsid:latest
+  DockerKeystoneConfigImage: tripleoupstream/centos-binary-keystone:latest
+  DockerKeystoneImage: tripleoupstream/centos-binary-keystone:latest
+  DockerManilaApiImage: tripleoupstream/centos-binary-manila-api:latest
+  DockerManilaConfigImage: tripleoupstream/centos-binary-manila-api:latest
+  DockerManilaSchedulerImage: tripleoupstream/centos-binary-manila-scheduler:latest
+  DockerMemcachedConfigImage: tripleoupstream/centos-binary-memcached:latest
+  DockerMemcachedImage: tripleoupstream/centos-binary-memcached:latest
+  DockerMistralApiImage: tripleoupstream/centos-binary-mistral-api:latest
+  DockerMistralConfigImage: tripleoupstream/centos-binary-mistral-api:latest
+  DockerMistralEngineImage: tripleoupstream/centos-binary-mistral-engine:latest
+  DockerMistralExecutorImage: tripleoupstream/centos-binary-mistral-executor:latest
+  DockerMongodbConfigImage: tripleoupstream/centos-binary-mongodb:latest
+  DockerMongodbImage: tripleoupstream/centos-binary-mongodb:latest
+  DockerMultipathdConfigImage: tripleoupstream/centos-binary-multipathd:latest
+  DockerMultipathdImage: tripleoupstream/centos-binary-multipathd:latest
+  DockerMysqlClientConfigImage: tripleoupstream/centos-binary-mariadb:latest
+  DockerMysqlConfigImage: tripleoupstream/centos-binary-mariadb:latest
+  DockerMysqlImage: tripleoupstream/centos-binary-mariadb:latest
+  DockerNeutronApiImage: tripleoupstream/centos-binary-neutron-server:latest
+  DockerNeutronConfigImage: tripleoupstream/centos-binary-neutron-server:latest
+  DockerNeutronDHCPImage: tripleoupstream/centos-binary-neutron-dhcp-agent:latest
+  DockerNeutronL3AgentImage: tripleoupstream/centos-binary-neutron-l3-agent:latest
+  DockerNeutronMetadataImage: tripleoupstream/centos-binary-neutron-metadata-agent:latest
+  DockerNovaApiImage: tripleoupstream/centos-binary-nova-api:latest
+  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
+  DockerNovaConsoleauthImage: tripleoupstream/centos-binary-nova-consoleauth:latest
+  DockerNovaLibvirtConfigImage: tripleoupstream/centos-binary-nova-compute:latest
+  DockerNovaLibvirtImage: tripleoupstream/centos-binary-nova-libvirt:latest
+  DockerNovaPlacementConfigImage: tripleoupstream/centos-binary-nova-placement-api:latest
+  DockerNovaPlacementImage: tripleoupstream/centos-binary-nova-placement-api:latest
+  DockerNovaSchedulerImage: tripleoupstream/centos-binary-nova-scheduler:latest
+  DockerNovaVncProxyImage: tripleoupstream/centos-binary-nova-novncproxy:latest
+  DockerOVNControllerConfigImage: tripleoupstream/centos-binary-ovn-controller:latest
+  DockerOVNControllerImage: tripleoupstream/centos-binary-ovn-controller:latest
+  DockerOVNNbDbImage: tripleoupstream/centos-binary-ovn-nb-db-server:latest
+  DockerOVNNorthdImage: tripleoupstream/centos-binary-ovn-northd:latest
+  DockerOVNSbDbImage: tripleoupstream/centos-binary-ovn-sb-db-server:latest
+  DockerOctaviaApiImage: tripleoupstream/centos-binary-octavia-api:latest
+  DockerOctaviaConfigImage: tripleoupstream/centos-binary-octavia-api:latest
+  DockerOctaviaHealthManagerImage: tripleoupstream/centos-binary-octavia-health-manager:latest
+  DockerOctaviaHousekeepingImage: tripleoupstream/centos-binary-octavia-housekeeping:latest
+  DockerOctaviaWorkerImage: tripleoupstream/centos-binary-octavia-worker:latest
+  DockerOpenvswitchImage: tripleoupstream/centos-binary-neutron-openvswitch-agent:latest
+  DockerPankoApiImage: tripleoupstream/centos-binary-panko-api:latest
+  DockerPankoConfigImage: tripleoupstream/centos-binary-panko-api:latest
+  DockerRabbitmqConfigImage: tripleoupstream/centos-binary-rabbitmq:latest
+  DockerRabbitmqImage: tripleoupstream/centos-binary-rabbitmq:latest
+  DockerRedisConfigImage: tripleoupstream/centos-binary-redis:latest
+  DockerRedisImage: tripleoupstream/centos-binary-redis:latest
+  DockerSaharaApiImage: tripleoupstream/centos-binary-sahara-api:latest
+  DockerSaharaConfigImage: tripleoupstream/centos-binary-sahara-api:latest
+  DockerSaharaEngineImage: tripleoupstream/centos-binary-sahara-engine:latest
+  DockerSensuClientImage: tripleoupstream/centos-binary-sensu-client:latest
+  DockerSensuConfigImage: tripleoupstream/centos-binary-sensu-client:latest
+  DockerSwiftAccountImage: tripleoupstream/centos-binary-swift-account:latest
+  DockerSwiftConfigImage: tripleoupstream/centos-binary-swift-proxy-server:latest
+  DockerSwiftContainerImage: tripleoupstream/centos-binary-swift-container:latest
+  DockerSwiftObjectImage: tripleoupstream/centos-binary-swift-object:latest
+  DockerSwiftProxyImage: tripleoupstream/centos-binary-swift-proxy-server:latest
+  DockerTackerConfigImage: tripleoupstream/centos-binary-tacker:latest
+  DockerTackerImage: tripleoupstream/centos-binary-tacker:latest
+  DockerZaqarConfigImage: tripleoupstream/centos-binary-zaqar:latest
+  DockerZaqarImage: tripleoupstream/centos-binary-zaqar:latest