diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-08-18 09:17:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-08-18 09:17:15 +0000 |
| commit | 9436d87e7e3b2767bf8dcb69e9fc0eb62173e6fb (patch) | |
| tree | 927d899f4b6e43abc630cad6ea06f9a98f6439f7 /environments | |
| parent | 79b3c12e15d66ca652bdc7285b9291d228e31194 (diff) | |
| parent | f7a84702de0984f77a24da0737408ada019e602a (diff) | |
Merge "Refactor setup_docker_host.sh as host_prep_tasks"
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/docker-services-tls-everywhere.yaml | 5 | ||||
| -rw-r--r-- | environments/docker.yaml | 6 |
2 files changed, 0 insertions, 11 deletions
diff --git a/environments/docker-services-tls-everywhere.yaml b/environments/docker-services-tls-everywhere.yaml index 0b01da4d..1062e4f7 100644 --- a/environments/docker-services-tls-everywhere.yaml +++ b/environments/docker-services-tls-everywhere.yaml @@ -1,11 +1,6 @@ # This environment contains the services that can work with TLS-everywhere. 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 OS::TripleO::Services::Docker: ../puppet/services/docker.yaml - # The compute node still needs extra initialization steps - OS::TripleO::Compute::NodeUserData: ../docker/firstboot/setup_docker_host.yaml # Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2 OS::TripleO::Docker::NeutronMl2PluginBase: ../puppet/services/neutron-plugin-ml2.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 |