diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-12-21 14:52:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-12-21 14:52:36 +0000 |
| commit | 4a7e093a6b31a8bee1afb93e45d7d59114245bcc (patch) | |
| tree | c3d878e5584bf32a1b5867c7b68328cb5b2ac8cd /environments | |
| parent | 64d720a40d19948f51ebdca59557b8b95f74dd65 (diff) | |
| parent | 9313e18f302aafaa1cbe92ef59499af6d2074e1f (diff) | |
Merge "Add "deployed server" fake neutron ports"
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/deployed-server-environment.yaml | 2 | ||||
| -rw-r--r-- | environments/deployed-server-noop-ctlplane.yaml | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/environments/deployed-server-environment.yaml b/environments/deployed-server-environment.yaml index e9004bd6..7a6639f9 100644 --- a/environments/deployed-server-environment.yaml +++ b/environments/deployed-server-environment.yaml @@ -1,3 +1,3 @@ resource_registry: OS::TripleO::Server: ../deployed-server/deployed-server.yaml - OS::TripleO::DeployedServer::ControlPlanePort: ../deployed-server/ctlplane-port.yaml + OS::TripleO::DeployedServer::ControlPlanePort: OS::Neutron::Port diff --git a/environments/deployed-server-noop-ctlplane.yaml b/environments/deployed-server-noop-ctlplane.yaml index cfda314d..54f5e41d 100644 --- a/environments/deployed-server-noop-ctlplane.yaml +++ b/environments/deployed-server-noop-ctlplane.yaml @@ -1,4 +1,3 @@ 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 + OS::TripleO::DeployedServer::ControlPlanePort: ../deployed-server/deployed-neutron-port.yaml |