Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Create split out neutron networks via Heat.
[apex-tripleo-heat-templates.git]
/
compute.yaml
diff --git
a/compute.yaml
b/compute.yaml
index
1bc59e1
..
672687c
100644
(file)
--- a/
compute.yaml
+++ b/
compute.yaml
@@
-110,13
+110,13
@@
parameters:
network) - if changing this either use different post-install network
scripts or be sure to keep 'datacentre' as a mapping network name.
type: string
network) - if changing this either use different post-install network
scripts or be sure to keep 'datacentre' as a mapping network name.
type: string
- default: ""
+ default: "
datacentre:br-ex
"
NeutronEnableTunnelling:
type: string
default: "True"
NeutronFlatNetworks:
type: string
NeutronEnableTunnelling:
type: string
default: "True"
NeutronFlatNetworks:
type: string
- default: ''
+ default: '
datacentre
'
description: >
If set, flat networks to configure in neutron plugins.
NeutronHost:
description: >
If set, flat networks to configure in neutron plugins.
NeutronHost:
@@
-168,10
+168,12
@@
parameters:
The mechanism drivers for the Neutron tenant network. To specify multiple
values, use a comma separated string, like so: 'openvswitch,l2_population'
type: string
The mechanism drivers for the Neutron tenant network. To specify multiple
values, use a comma separated string, like so: 'openvswitch,l2_population'
type: string
+ # Not relevant for Computes, should be removed
NeutronAllowL3AgentFailover:
default: 'True'
description: Allow automatic l3-agent failover
type: string
NeutronAllowL3AgentFailover:
default: 'True'
description: Allow automatic l3-agent failover
type: string
+ # Not relevant for Computes, should be removed
NeutronL3HA:
default: 'False'
description: Whether to enable l3-agent HA
NeutronL3HA:
default: 'False'
description: Whether to enable l3-agent HA
@@
-257,9
+259,13
@@
resources:
networks:
- network: ctlplane
user_data_format: SOFTWARE_CONFIG
networks:
- network: ctlplane
user_data_format: SOFTWARE_CONFIG
+ user_data: {get_resource: NodeUserData}
+
+ NodeUserData:
+ type: OS::TripleO::NodeUserData
NetworkConfig:
NetworkConfig:
- type: OS::TripleO::Net::SoftwareConfig
+ type: OS::TripleO::
Compute::
Net::SoftwareConfig
NetworkDeployment:
type: OS::TripleO::SoftwareDeployment
NetworkDeployment:
type: OS::TripleO::SoftwareDeployment
@@
-421,7
+427,7
@@
outputs:
Server's IP address and hostname in the /etc/hosts format
value:
str_replace:
Server's IP address and hostname in the /etc/hosts format
value:
str_replace:
- template: "IP HOST
HOST.novalocal
"
+ template: "IP HOST"
params:
IP: {get_attr: [NovaCompute, networks, ctlplane, 0]}
HOST: {get_attr: [NovaCompute, name]}
params:
IP: {get_attr: [NovaCompute, networks, ctlplane, 0]}
HOST: {get_attr: [NovaCompute, name]}