diff options
| author |   Jiri Stransky <jistr@redhat.com> | 2017-05-30 17:29:51 +0200 |
|---|---|---|
| committer | Jiri Stransky <jistr@redhat.com> | 2017-08-17 17:10:22 +0200 |
| commit | f7a84702de0984f77a24da0737408ada019e602a (patch) | |
| tree | 759f53e9368b6c8abfdecff6b8a13bcd54da0507 /environments | |
| parent | 43027fefc081f75bc9ae1fd6f5b6f1978b003d7e (diff) | |
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
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 49d02e6f..2fa0cc16 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 |