From f7a84702de0984f77a24da0737408ada019e602a Mon Sep 17 00:00:00 2001 From: Jiri Stransky Date: Tue, 30 May 2017 17:29:51 +0200 Subject: Refactor setup_docker_host.sh as host_prep_tasks Previously what we've been doing with setup_docker_host.sh can now be achieved with host_prep_tasks, and we can free up the NodeUserData interface for other use cases. Closes-Bug: #1711387 Change-Id: Iaac90efd03e37ceb02c312f9c15c1da7d4982510 --- environments/docker.yaml | 6 ------ 1 file changed, 6 deletions(-) (limited to 'environments/docker.yaml') diff --git a/environments/docker.yaml b/environments/docker.yaml index 9b977f6e..ebaf2694 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 -- cgit 1.2.3-korg