diff options
| author |   Dan Prince <dprince@redhat.com> | 2017-07-07 16:05:43 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2017-07-12 09:04:06 -0400 |
| commit | 90317db0ebea6711373fee2bdb514ecfae57193f (patch) | |
| tree | c4d235c0dd1e2c76b0f0bc528d29db49c0717178 | |
| parent | f2b68a1d13a1b7357182cdbc07872f84dcade3c9 (diff) | |
Drop ComputeServices from environments/docker.yaml
Change-Id: Ibfc568755764203b68aed524d6f334eeb7cd5da7
Closes-bug: #1703001
| -rw-r--r-- | environments/docker-services-tls-everywhere.yaml | 15 | ||||
| -rw-r--r-- | environments/docker.yaml | 15 |
2 files changed, 0 insertions, 30 deletions
diff --git a/environments/docker-services-tls-everywhere.yaml b/environments/docker-services-tls-everywhere.yaml index 3ca04697..8d304494 100644 --- a/environments/docker-services-tls-everywhere.yaml +++ b/environments/docker-services-tls-everywhere.yaml @@ -34,18 +34,3 @@ resource_registry: OS::TripleO::PostDeploySteps: ../docker/post.yaml OS::TripleO::PostUpgradeSteps: ../docker/post-upgrade.yaml - -parameter_defaults: - # To specify a local docker registry, enable these - # where 192.168.24.1 is the host running docker-distribution - #DockerNamespace: 192.168.24.1:8787/tripleoupstream - #DockerNamespaceIsRegistry: true - - ComputeServices: - - OS::TripleO::Services::CACerts - - OS::TripleO::Services::CertmongerUser - - OS::TripleO::Services::NovaCompute - - OS::TripleO::Services::NovaLibvirt - - OS::TripleO::Services::ComputeNeutronOvsAgent - - OS::TripleO::Services::Docker - - OS::TripleO::Services::Sshd diff --git a/environments/docker.yaml b/environments/docker.yaml index c32001a7..52b2dc05 100644 --- a/environments/docker.yaml +++ b/environments/docker.yaml @@ -63,18 +63,3 @@ resource_registry: OS::TripleO::PostDeploySteps: ../docker/post.yaml OS::TripleO::PostUpgradeSteps: ../docker/post-upgrade.yaml - -parameter_defaults: - # To specify a local docker registry, enable these - # where 192.168.24.1 is the host running docker-distribution - #DockerNamespace: 192.168.24.1:8787/tripleoupstream - #DockerNamespaceIsRegistry: true - - ComputeServices: - - OS::TripleO::Services::NovaCompute - - OS::TripleO::Services::NovaLibvirt - - OS::TripleO::Services::ComputeNeutronOvsAgent - - OS::TripleO::Services::Docker - - OS::TripleO::Services::CeilometerAgentCompute - - OS::TripleO::Services::Sshd - - OS::TripleO::Services::OpenDaylightOvs |