diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-30 03:44:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-30 03:44:40 +0000 |
| commit | 28202dc7589bcc18e4f398e9dc00a4095bc45a68 (patch) | |
| tree | 02c412f0ab02c70e8f4815455d4691678579cc45 | |
| parent | 14335bd054b56ab6724fc01abf2fcf8f1b6c69f7 (diff) | |
| parent | c41f483676ce17a9a6b3421c7b0ecd1b4dc3b27c (diff) | |
Merge "Nic config mappings for deployed-server" into stable/ocata
| -rw-r--r-- | environments/deployed-server-environment.j2.yaml | 11 | ||||
| -rw-r--r-- | environments/deployed-server-environment.yaml | 4 |
2 files changed, 11 insertions, 4 deletions
diff --git a/environments/deployed-server-environment.j2.yaml b/environments/deployed-server-environment.j2.yaml new file mode 100644 index 00000000..327934da --- /dev/null +++ b/environments/deployed-server-environment.j2.yaml @@ -0,0 +1,11 @@ +resource_registry: + OS::TripleO::Server: ../deployed-server/deployed-server.yaml + OS::TripleO::DeployedServer::ControlPlanePort: OS::Neutron::Port + OS::TripleO::DeployedServer::Bootstrap: OS::Heat::None + +{% for role in roles %} + # Default nic config mappings + OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../net-config-static.yaml +{% endfor %} + + OS::TripleO::ControllerDeployedServer::Net::SoftwareConfig: ../net-config-static-bridge.yaml diff --git a/environments/deployed-server-environment.yaml b/environments/deployed-server-environment.yaml deleted file mode 100644 index 7bc1bd9b..00000000 --- a/environments/deployed-server-environment.yaml +++ /dev/null @@ -1,4 +0,0 @@ -resource_registry: - OS::TripleO::Server: ../deployed-server/deployed-server.yaml - OS::TripleO::DeployedServer::ControlPlanePort: OS::Neutron::Port - OS::TripleO::DeployedServer::Bootstrap: OS::Heat::None |