X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=environments%2Fdocker.yaml;h=58691cc1e97e394d73ab42af1c48575db7bca41e;hb=a158a257216790d6e295bf81d7a7d99472e45bf7;hp=9b977f6eff70c802fb2a967de4cd3a5bdc0f7b2c;hpb=5dea7c99d2b1211b35298135ee40f9ae73b47fc8;p=apex-tripleo-heat-templates.git

diff --git a/environments/docker.yaml b/environments/docker.yaml
index 9b977f6e..58691cc1 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
@@ -35,9 +30,9 @@ resource_registry:
   OS::TripleO::Services::HAproxy: ../docker/services/haproxy.yaml
   OS::TripleO::Services::MySQL: ../docker/services/database/mysql.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
   OS::TripleO::Services::Memcached: ../docker/services/memcached.yaml
+  OS::TripleO::Services::Sshd: ../docker/services/sshd.yaml
   OS::TripleO::Services::SwiftProxy: ../docker/services/swift-proxy.yaml
   OS::TripleO::Services::SwiftStorage: ../docker/services/swift-storage.yaml
   OS::TripleO::Services::SwiftRingBuilder: ../docker/services/swift-ringbuilder.yaml
@@ -56,8 +51,15 @@ resource_registry:
   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::Services::SwiftDispersion: OS::Heat::None
+
+  # If SR-IOV is enabled on the compute nodes, it will need the SR-IOV
+  # host configuration.
+  OS::TripleO::Services::NeutronSriovHostConfig: OS::Heat::None