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
Merge "Fix grammar nits in bond-with-vlans templates"
[apex-tripleo-heat-templates.git]
/
puppet
/
compute-puppet.yaml
diff --git
a/puppet/compute-puppet.yaml
b/puppet/compute-puppet.yaml
index
9e17b89
..
b34e7a6
100644
(file)
--- a/
puppet/compute-puppet.yaml
+++ b/
puppet/compute-puppet.yaml
@@
-258,6
+258,9
@@
parameters:
description: >
Setting to a previously unused value during stack-update will trigger
package update on all nodes
description: >
Setting to a previously unused value during stack-update will trigger
package update on all nodes
+ Hostname:
+ type: string
+ default: '' # Defaults to Heat created hostname
resources:
resources:
@@
-274,6
+277,7
@@
resources:
- network: ctlplane
user_data_format: SOFTWARE_CONFIG
user_data: {get_resource: NodeUserData}
- network: ctlplane
user_data_format: SOFTWARE_CONFIG
user_data: {get_resource: NodeUserData}
+ name: {get_param: Hostname}
NodeUserData:
type: OS::TripleO::NodeUserData
NodeUserData:
type: OS::TripleO::NodeUserData
@@
-310,7
+314,6
@@
resources:
NetworkDeployment:
type: OS::TripleO::SoftwareDeployment
properties:
NetworkDeployment:
type: OS::TripleO::SoftwareDeployment
properties:
- signal_transport: NO_SIGNAL
config: {get_resource: NetworkConfig}
server: {get_resource: NovaCompute}
input_values:
config: {get_resource: NetworkConfig}
server: {get_resource: NovaCompute}
input_values:
@@
-393,8
+396,8
@@
resources:
NovaComputeDeployment:
type: OS::TripleO::SoftwareDeployment
NovaComputeDeployment:
type: OS::TripleO::SoftwareDeployment
+ depends_on: NetworkDeployment
properties:
properties:
- signal_transport: NO_SIGNAL
config: {get_resource: NovaComputeConfig}
server: {get_resource: NovaCompute}
input_values:
config: {get_resource: NovaComputeConfig}
server: {get_resource: NovaCompute}
input_values:
@@
-427,7
+430,7
@@
resources:
- {get_param: GlancePort}
neutron_flat_networks: {get_param: NeutronFlatNetworks}
neutron_host: {get_param: NeutronHost}
- {get_param: GlancePort}
neutron_flat_networks: {get_param: NeutronFlatNetworks}
neutron_host: {get_param: NeutronHost}
- neutron_local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, Neutron
LocalIp
]}]}
+ neutron_local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, Neutron
TenantNetwork
]}]}
neutron_tenant_network_type: {get_param: NeutronNetworkType}
neutron_tunnel_types: {get_param: NeutronTunnelTypes}
neutron_network_vlan_ranges:
neutron_tenant_network_type: {get_param: NeutronNetworkType}
neutron_tunnel_types: {get_param: NeutronTunnelTypes}
neutron_network_vlan_ranges:
@@
-505,7
+508,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"
+ template: "IP HOST
.localdomain 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]}