X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=environments%2Fdocker.yaml;h=dfa30b089328409956a47cc73926164c59344684;hb=111861fae8981246e9e75fd52162bc0502b6ed19;hp=a7504611e33dd7c7ea377978fdd28500846f78dc;hpb=4a441359fba69b754cbae1fb13c82fb7472f29b6;p=apex-tripleo-heat-templates.git

diff --git a/environments/docker.yaml b/environments/docker.yaml
index a7504611..dfa30b08 100644
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@ -1,10 +1,4 @@
 resource_registry:
-  # This can be used when you don't want to run puppet on the host,
-  # e.g atomic, but it has been replaced with OS::TripleO::Services::Docker
-  # OS::TripleO::NodeUserData: ../docker/firstboot/setup_docker_host.yaml
-  # The compute node still needs extra initialization steps
-  OS::TripleO::Compute::NodeUserData: ../docker/firstboot/setup_docker_host.yaml
-
   OS::TripleO::Services::Docker: ../puppet/services/docker.yaml
   # Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2
   OS::TripleO::Docker::NeutronMl2PluginBase: ../puppet/services/neutron-plugin-ml2.yaml
@@ -22,6 +16,7 @@ resource_registry:
   OS::TripleO::Services::NovaPlacement: ../docker/services/nova-placement.yaml
   OS::TripleO::Services::NovaConductor: ../docker/services/nova-conductor.yaml
   OS::TripleO::Services::NovaConsoleauth: ../docker/services/nova-consoleauth.yaml
+  OS::TripleO::Services::NovaMetadata: ../docker/services/nova-metadata.yaml
   OS::TripleO::Services::NovaMigrationTarget: ../docker/services/nova-migration-target.yaml
   OS::TripleO::Services::NovaScheduler: ../docker/services/nova-scheduler.yaml
   OS::TripleO::Services::NovaVncProxy: ../docker/services/nova-vnc-proxy.yaml
@@ -32,8 +27,8 @@ resource_registry:
   OS::TripleO::Services::NeutronOvsAgent: ../docker/services/neutron-ovs-agent.yaml
   OS::TripleO::Services::NeutronDhcpAgent: ../docker/services/neutron-dhcp.yaml
   OS::TripleO::Services::NeutronL3Agent: ../docker/services/neutron-l3.yaml
+  OS::TripleO::Services::HAproxy: ../docker/services/haproxy.yaml
   OS::TripleO::Services::MySQL: ../docker/services/database/mysql.yaml
-  OS::TripleO::Services::MySQLClient: ../docker/services/database/mysql-client.yaml
   OS::TripleO::Services::RabbitMQ: ../docker/services/rabbitmq.yaml
   OS::TripleO::Services::MongoDb: ../docker/services/database/mongodb.yaml
   OS::TripleO::Services::Redis: ../docker/services/database/redis.yaml
@@ -51,16 +46,14 @@ resource_registry:
   OS::TripleO::Services::PankoApi: ../docker/services/panko-api.yaml
   OS::TripleO::Services::CeilometerAgentCentral: ../docker/services/ceilometer-agent-central.yaml
   OS::TripleO::Services::CeilometerAgentIpmi: ../docker/services/ceilometer-agent-ipmi.yaml
-  OS::TripleO::Services::CeilometerAgentCompute: ../docker/services/ceilometer-agent-compute.yaml
+  OS::TripleO::Services::ComputeCeilometerAgent: ../docker/services/ceilometer-agent-compute.yaml
   OS::TripleO::Services::CeilometerAgentNotification: ../docker/services/ceilometer-agent-notification.yaml
   OS::TripleO::Services::Horizon: ../docker/services/horizon.yaml
   OS::TripleO::Services::Iscsid: ../docker/services/iscsid.yaml
   OS::TripleO::Services::Multipathd: ../docker/services/multipathd.yaml
+  OS::TripleO::Services::ContainersLogrotateCrond: ../docker/services/logrotate-crond.yaml
   # FIXME: Had to remove these to unblock containers CI. They should be put back when fixed.
   # OS::TripleO::Services::CinderApi: ../docker/services/cinder-api.yaml
   # OS::TripleO::Services::CinderScheduler: ../docker/services/cinder-scheduler.yaml
   # OS::TripleO::Services::CinderBackup: ../docker/services/cinder-backup.yaml
   # OS::TripleO::Services::CinderVolume: ../docker/services/cinder-volume.yaml
-
-  OS::TripleO::PostDeploySteps: ../docker/post.yaml
-  OS::TripleO::PostUpgradeSteps: ../docker/post-upgrade.yaml