From d90d57a8c35e066a68a433cac108675dfab1d9e0 Mon Sep 17 00:00:00 2001 From: James Slagle Date: Tue, 18 Jul 2017 20:01:06 -0400 Subject: [PATCH] Use static environment for deployed-server neutron mappings We can't include these mappings for the deployed-server neutron ports when using split-stack in the generated environment file because the path to the actual templates directory is not known from with the templates themselves. This patch removes the mappings from the generated environment from the stack output and adds a static environment file with relative paths that will have to be included on the deploy command cli instead. Change-Id: Id4b8c939fa7b26205609819b66e76bf73c9890d0 Closes-Bug: #1705144 --- .../deployed-server-environment-output.yaml | 10 ---------- .../deployed-server-deployed-neutron-ports.yaml | 4 ++++ 2 files changed, 4 insertions(+), 10 deletions(-) create mode 100644 environments/deployed-server-deployed-neutron-ports.yaml diff --git a/deployed-server/deployed-server-environment-output.yaml b/deployed-server/deployed-server-environment-output.yaml index eaf7745957..89c3886d5f 100644 --- a/deployed-server/deployed-server-environment-output.yaml +++ b/deployed-server/deployed-server-environment-output.yaml @@ -34,21 +34,11 @@ resources: fixed_ips: - ip_address: {get_param: [VipMap, redis]} - ResourceRegistry: - type: OS::Heat::Value - properties: - type: json - value: - OS::TripleO::DeployedServer::ControlPlanePort: tripleo-heat-templates/deployed-server/deployed-neutron-port.yaml - OS::TripleO::Network::Ports::ControlPlaneVipPort: tripleo-heat-templates/deployed-server/deployed-neutron-port.yaml - DeployedServerEnvironment: type: OS::Heat::Value properties: type: json value: - resource_registry: - {get_attr: [ResourceRegistry, value]} parameter_defaults: map_merge: - {get_attr: [DeployedServerPortMapParameter, value]} diff --git a/environments/deployed-server-deployed-neutron-ports.yaml b/environments/deployed-server-deployed-neutron-ports.yaml new file mode 100644 index 0000000000..1464f4be52 --- /dev/null +++ b/environments/deployed-server-deployed-neutron-ports.yaml @@ -0,0 +1,4 @@ +resource_registry: + OS::TripleO::Network::Ports::ControlPlaneVipPort: ../deployed-server/deployed-neutron-port.yaml + OS::TripleO::DeployedServer::ControlPlanePort: ../deployed-server/deployed-neutron-port.yaml +