diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-08 19:56:53 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-08 19:56:53 +0000 |
| commit | 22a8fab24af11d495d6d8adceb770482cdf57058 (patch) | |
| tree | 03d869594d75fafbfc559f9aeac395161ac960ad /environments | |
| parent | db229cd82c86bcadc5cd5290f3a2e107770d0bf1 (diff) | |
| parent | 9450cc222df49f3679cb179fdfdc04e22d39fa0b (diff) | |
Merge "Make deployed-server OS::Neutron::Port optional"
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/deployed-server-environment.yaml | 1 | ||||
| -rw-r--r-- | environments/deployed-server-noop-ctlplane.yaml | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/environments/deployed-server-environment.yaml b/environments/deployed-server-environment.yaml index 3c9e3459..c63d399a 100644 --- a/environments/deployed-server-environment.yaml +++ b/environments/deployed-server-environment.yaml @@ -1,3 +1,4 @@ resource_registry: OS::TripleO::Server: ../deployed-server/deployed-server.yaml OS::TripleO::DeployedServerConfig: ../deployed-server/deployed-server-config.yaml + OS::TripleO::DeployedServer::ControlPlanePort: ../deployed-server/ctlplane-port.yaml diff --git a/environments/deployed-server-noop-ctlplane.yaml b/environments/deployed-server-noop-ctlplane.yaml new file mode 100644 index 00000000..cfda314d --- /dev/null +++ b/environments/deployed-server-noop-ctlplane.yaml @@ -0,0 +1,4 @@ +resource_registry: + OS::TripleO::Server: ../deployed-server/deployed-server.yaml + OS::TripleO::DeployedServerConfig: ../deployed-server/deployed-server-config.yaml + OS::TripleO::DeployedServer::ControlPlanePort: OS::Heat::None |