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
This commit is contained in:
parent
77cca14bd7
commit
9450cc222d
|
@ -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]}
|
|
@ -94,16 +94,9 @@ resources:
|
||||||
server: {get_resource: deployed-server}
|
server: {get_resource: deployed-server}
|
||||||
|
|
||||||
ControlPlanePort:
|
ControlPlanePort:
|
||||||
type: OS::Neutron::Port
|
type: OS::TripleO::DeployedServer::ControlPlanePort
|
||||||
properties:
|
properties:
|
||||||
network: ctlplane
|
Hostname: {get_attr: [HostsEntryDeployment, hostname]}
|
||||||
name:
|
|
||||||
list_join:
|
|
||||||
- '-'
|
|
||||||
- - {get_attr: [HostsEntryDeployment, hostname]}
|
|
||||||
- ctlplane
|
|
||||||
- port
|
|
||||||
replacement_policy: AUTO
|
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
# FIXME(shardy) this is needed because TemplateResource returns an
|
# FIXME(shardy) this is needed because TemplateResource returns an
|
||||||
|
@ -113,7 +106,7 @@ outputs:
|
||||||
networks:
|
networks:
|
||||||
value:
|
value:
|
||||||
ctlplane:
|
ctlplane:
|
||||||
- {get_attr: [ControlPlanePort, fixed_ips, 0, ip_address]}
|
- {get_attr: [ControlPlanePort, ip_address]}
|
||||||
name:
|
name:
|
||||||
value: {get_attr: [HostsEntryDeployment, hostname]}
|
value: {get_attr: [HostsEntryDeployment, hostname]}
|
||||||
hosts_entry:
|
hosts_entry:
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
resource_registry:
|
resource_registry:
|
||||||
OS::TripleO::Server: ../deployed-server/deployed-server.yaml
|
OS::TripleO::Server: ../deployed-server/deployed-server.yaml
|
||||||
OS::TripleO::DeployedServerConfig: ../deployed-server/deployed-server-config.yaml
|
OS::TripleO::DeployedServerConfig: ../deployed-server/deployed-server-config.yaml
|
||||||
|
OS::TripleO::DeployedServer::ControlPlanePort: ../deployed-server/ctlplane-port.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…
Reference in New Issue