From 6f20304c43bd010f656e9000f098d1d5d02cdc78 Mon Sep 17 00:00:00 2001 From: James Slagle Date: Mon, 9 Jan 2017 14:40:27 -0500 Subject: Add deployed-server backwards compatible template In Newton, the ctlplane port on deployed-server was called -ctlplane-port. When this code was refactored in I29fbc720c3d582cbb94385e65e4b64b101f7eac9, the -port suffix was dropped in favor of - convention, and the port resource was created directly in deployed-server.yaml instead of in a nested stack. Both of those changes were backwards incompatible -- making it impossible to upgrade to the new version of deployed-server.yaml without the ctlplane port getting deleted/recreated, which causes a change in IP address. The IP address change causes services to be misconfigured on upgrade attempts. Change-Id: I45991b60a151abf3c5e4d05a3aa7246b2d25ac5a --- deployed-server/deployed-server.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'deployed-server/deployed-server.yaml') diff --git a/deployed-server/deployed-server.yaml b/deployed-server/deployed-server.yaml index 3ff63613..77968f6c 100644 --- a/deployed-server/deployed-server.yaml +++ b/deployed-server/deployed-server.yaml @@ -106,7 +106,7 @@ resources: config: {get_resource: HostsEntryConfig} server: {get_resource: deployed-server} - ControlPlanePortImpl: + ControlPlanePort: type: OS::TripleO::DeployedServer::ControlPlanePort properties: network: ctlplane @@ -123,6 +123,6 @@ outputs: networks: value: ctlplane: - - {get_attr: [ControlPlanePortImpl, fixed_ips, 0, ip_address]} + - {get_attr: [ControlPlanePort, fixed_ips, 0, ip_address]} name: value: {get_attr: [HostsEntryDeployment, hostname]} -- cgit 1.2.3-korg