Browse Source

Make deployed-server OS::Neutron::Port optional

This patch makes it possible to set
OS::TripleO::DeployedServer::ControlPlanePort: OS::Heat::None
in your resource_registry and thereby avoid the creation of
a neutron port for the deployed server. This is useful if
you are bootstrapping things in an environment without
Neutron.

Also, includes a new deployed-server-noop-ctlplane.yaml
environment file.

Change-Id: I2990dc816698e0f6e3193a8fc7c9c6767c6e50e5
changes/32/352032/2
Dan Prince 6 years ago
parent
commit
9450cc222d
  1. 23
      deployed-server/ctlplane-port.yaml
  2. 13
      deployed-server/deployed-server.yaml
  3. 1
      environments/deployed-server-environment.yaml
  4. 4
      environments/deployed-server-noop-ctlplane.yaml

23
deployed-server/ctlplane-port.yaml

@ -0,0 +1,23 @@
heat_template_version: 2014-10-16
parameters:
Hostname:
type: string
resources:
ControlPlanePort:
type: OS::Neutron::Port
properties:
network: ctlplane
name:
list_join:
- '-'
- - {get_param: Hostname}
- ctlplane
- port
replacement_policy: AUTO
outputs:
ip_address:
value: {get_attr: [ControlPlanePort, fixed_ips, 0, ip_address]}

13
deployed-server/deployed-server.yaml

@ -94,16 +94,9 @@ resources:
server: {get_resource: deployed-server}
ControlPlanePort:
type: OS::Neutron::Port
type: OS::TripleO::DeployedServer::ControlPlanePort
properties:
network: ctlplane
name:
list_join:
- '-'
- - {get_attr: [HostsEntryDeployment, hostname]}
- ctlplane
- port
replacement_policy: AUTO
Hostname: {get_attr: [HostsEntryDeployment, hostname]}
outputs:
# FIXME(shardy) this is needed because TemplateResource returns an
@ -113,7 +106,7 @@ outputs:
networks:
value:
ctlplane:
- {get_attr: [ControlPlanePort, fixed_ips, 0, ip_address]}
- {get_attr: [ControlPlanePort, ip_address]}
name:
value: {get_attr: [HostsEntryDeployment, hostname]}
hosts_entry:

1
environments/deployed-server-environment.yaml

@ -1,3 +1,4 @@
resource_registry:
OS::TripleO::Server: ../deployed-server/deployed-server.yaml
OS::TripleO::DeployedServerConfig: ../deployed-server/deployed-server-config.yaml
OS::TripleO::DeployedServer::ControlPlanePort: ../deployed-server/ctlplane-port.yaml

4
environments/deployed-server-noop-ctlplane.yaml

@ -0,0 +1,4 @@
resource_registry:
OS::TripleO::Server: ../deployed-server/deployed-server.yaml
OS::TripleO::DeployedServerConfig: ../deployed-server/deployed-server-config.yaml
OS::TripleO::DeployedServer::ControlPlanePort: OS::Heat::None
Loading…
Cancel
Save