Browse Source

Merge "Add deployed-server backwards compatible template"

changes/09/417109/7
Jenkins 6 years ago committed by Gerrit Code Review
parent
commit
6998edc64a
  1. 28
      deployed-server/ctlplane-port.yaml
  2. 4
      deployed-server/deployed-server.yaml
  3. 3
      environments/updates/README.md
  4. 2
      environments/updates/update-from-deployed-server-newton.yaml

28
deployed-server/ctlplane-port.yaml

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

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

3
environments/updates/README.md

@ -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.

2
environments/updates/update-from-deployed-server-newton.yaml

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