From 4a862731b0fa5aaac23448a8b67ecea05d0422eb Mon Sep 17 00:00:00 2001 From: James Slagle Date: Wed, 27 Jan 2021 17:16:05 -0500 Subject: [PATCH] Remove deployed-server bootstrap mappings These resources were previously removed from the deployed-server template, so they can also be removed from the deployed-server environments. Signed-off-by: James Slagle Change-Id: I78cfac1344b968e21f7b53306c20df051778a435 --- environments/deployed-server-environment.j2.yaml | 1 - environments/deployed-server-noop-ctlplane.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/environments/deployed-server-environment.j2.yaml b/environments/deployed-server-environment.j2.yaml index 01be012d90..0da423608a 100644 --- a/environments/deployed-server-environment.j2.yaml +++ b/environments/deployed-server-environment.j2.yaml @@ -1,7 +1,6 @@ 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 %} OS::TripleO::{{role.name}}::Net::SoftwareConfig: OS::Heat::None diff --git a/environments/deployed-server-noop-ctlplane.yaml b/environments/deployed-server-noop-ctlplane.yaml index 8835d5b15f..54f5e41deb 100644 --- a/environments/deployed-server-noop-ctlplane.yaml +++ b/environments/deployed-server-noop-ctlplane.yaml @@ -1,4 +1,3 @@ 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