Merge "Remove deployed-server bootstrap mappings"

This commit is contained in:
Zuul 2021-01-29 09:00:28 +00:00 committed by Gerrit Code Review
commit 4a9fc08b72
2 changed files with 0 additions and 2 deletions

View File

@ -1,7 +1,6 @@
resource_registry: resource_registry:
OS::TripleO::Server: ../deployed-server/deployed-server.yaml OS::TripleO::Server: ../deployed-server/deployed-server.yaml
OS::TripleO::DeployedServer::ControlPlanePort: OS::Neutron::Port OS::TripleO::DeployedServer::ControlPlanePort: OS::Neutron::Port
OS::TripleO::DeployedServer::Bootstrap: OS::Heat::None
{% for role in roles %} {% for role in roles %}
OS::TripleO::{{role.name}}::Net::SoftwareConfig: OS::Heat::None OS::TripleO::{{role.name}}::Net::SoftwareConfig: OS::Heat::None

View File

@ -1,4 +1,3 @@
resource_registry: resource_registry:
OS::TripleO::DeployedServer::Bootstrap: OS::Heat::None
OS::TripleO::Server: ../deployed-server/deployed-server.yaml OS::TripleO::Server: ../deployed-server/deployed-server.yaml
OS::TripleO::DeployedServer::ControlPlanePort: ../deployed-server/deployed-neutron-port.yaml OS::TripleO::DeployedServer::ControlPlanePort: ../deployed-server/deployed-neutron-port.yaml