aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-13 04:09:03 +0000
committerGerrit Code Review <review@openstack.org>2017-07-13 04:09:03 +0000
commitfe3bf6271a46a2bfe7bb902e5e14aa8e257f9e31 (patch)
tree3fa6b920632c20f001408c9b5fae500dbfc7c798
parentb48487b61b3b352c98cf9b1aec357d8a7b4eae28 (diff)
parent90317db0ebea6711373fee2bdb514ecfae57193f (diff)
Merge "Drop ComputeServices from environments/docker.yaml"
-rw-r--r--environments/docker-services-tls-everywhere.yaml15
-rw-r--r--environments/docker.yaml15
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