Add deployed-server backwards compatible template

In Newton, the ctlplane port on deployed-server was called
<hostname>-ctlplane-port. When this code was refactored in
I29fbc720c3d582cbb94385e65e4b64b101f7eac9, the -port suffix was dropped
in favor of <hostname>-<network> 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
This commit is contained in:
James Slagle 2017-01-09 14:40:27 -05:00
parent c9596b72a1
commit 6f20304c43
4 changed files with 35 additions and 2 deletions

View File

@ -0,0 +1,28 @@
heat_template_version: ocata
parameters:
network:
type: string
default: ctlplane
name:
type: string
replacement_policy:
type: string
default: AUTO
resources:
ControlPlanePort:
type: OS::Neutron::Port
properties:
network: ctlplane
name:
list_join:
- '-'
- - {get_param: name}
- port
replacement_policy: AUTO
outputs:
fixed_ips:
value: {get_attr: [ControlPlanePort, fixed_ips]}

View File

@ -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]}

View File

@ -10,3 +10,6 @@ Contents
**update-from-publicvip-on-ctlplane.yaml**
To be used if the PublicVirtualIP resource was deployed as an additional VIP on the 'ctlplane'.
**update-from-deloyed-server-newton.yaml**
To be used when updating from the deployed-server template from Newton.

View File

@ -0,0 +1,2 @@
resource_registry:
OS::TripleO::DeployedServer::ControlPlanePort: ../../deployed-server/ctlplane-port.yaml