summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-18 21:41:03 +0000
committerGerrit Code Review <review@openstack.org>2017-01-18 21:41:03 +0000
commit88e685984fd23416404910a59fa513a82dbbfd57 (patch)
tree8bfe94d0df11c97582aed116545c22add2cfc015 /environments
parent5bea89cc5d10ce6245c680a2b10aeb5ff7b0996b (diff)
parent08c6a8617d200de786549b4f0649228e088f3ada (diff)
Merge "Add deployed server bootstrap to noop-ctlplane"
Diffstat (limited to 'environments')
-rw-r--r--environments/deployed-server-noop-ctlplane.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/environments/deployed-server-noop-ctlplane.yaml b/environments/deployed-server-noop-ctlplane.yaml
index 54f5e41d..8835d5b1 100644
--- a/environments/deployed-server-noop-ctlplane.yaml
+++ b/environments/deployed-server-noop-ctlplane.yaml
@@ -1,3 +1,4 @@
resource_registry:
+ OS::TripleO::DeployedServer::Bootstrap: OS::Heat::None
OS::TripleO::Server: ../deployed-server/deployed-server.yaml
OS::TripleO::DeployedServer::ControlPlanePort: ../deployed-server/deployed-neutron-port.yaml