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 "Make build_endpoint_map.py output an ocata versioned template"
[apex-tripleo-heat-templates.git]
/
puppet
/
compute-role.yaml
diff --git
a/puppet/compute-role.yaml
b/puppet/compute-role.yaml
index
0a2598c
..
62adcd3
100644
(file)
--- a/
puppet/compute-role.yaml
+++ b/
puppet/compute-role.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
2016-10-14
+heat_template_version:
ocata
description: >
OpenStack hypervisor node configured via Puppet.
description: >
OpenStack hypervisor node configured via Puppet.
@@
-120,6
+120,9
@@
parameters:
MonitoringSubscriptions:
type: comma_delimited_list
default: []
MonitoringSubscriptions:
type: comma_delimited_list
default: []
+ ServiceMetadataSettings:
+ type: json
+ default: {}
ConfigCommand:
type: string
description: Command which will be run whenever configuration data changes
ConfigCommand:
type: string
description: Command which will be run whenever configuration data changes
@@
-157,6
+160,7
@@
resources:
map_merge:
- {get_param: ServerMetadata}
- {get_param: NovaComputeServerMetadata}
map_merge:
- {get_param: ServerMetadata}
- {get_param: NovaComputeServerMetadata}
+ - {get_param: ServiceMetadataSettings}
scheduler_hints: {get_param: NovaComputeSchedulerHints}
# Combine the NodeAdminUserData and NodeUserData mime archives
scheduler_hints: {get_param: NovaComputeSchedulerHints}
# Combine the NodeAdminUserData and NodeUserData mime archives
@@
-168,6
+172,8
@@
resources:
type: multipart
- config: {get_resource: NodeUserData}
type: multipart
type: multipart
- config: {get_resource: NodeUserData}
type: multipart
+ - config: {get_resource: RoleUserData}
+ type: multipart
# Creates the "heat-admin" user if configured via the environment
# Should return a OS::Heat::MultipartMime reference via OS::stack_id
# Creates the "heat-admin" user if configured via the environment
# Should return a OS::Heat::MultipartMime reference via OS::stack_id
@@
-179,6
+185,11
@@
resources:
NodeUserData:
type: OS::TripleO::NodeUserData
NodeUserData:
type: OS::TripleO::NodeUserData
+ # For optional operator role-specific userdata
+ # Should return a OS::Heat::MultipartMime reference via OS::stack_id
+ RoleUserData:
+ type: OS::TripleO::Compute::NodeUserData
+
ExternalPort:
type: OS::TripleO::Compute::Ports::ExternalPort
properties:
ExternalPort:
type: OS::TripleO::Compute::Ports::ExternalPort
properties:
@@
-334,6
+345,11
@@
resources:
- - {get_attr: [NovaCompute, name]}
- ctlplane
- - {get_attr: [NovaCompute, name]}
- ctlplane
+ PreNetworkConfig:
+ type: OS::TripleO::Compute::PreNetworkConfig
+ properties:
+ server: {get_resource: NovaCompute}
+
NetworkConfig:
type: OS::TripleO::Compute::Net::SoftwareConfig
properties:
NetworkConfig:
type: OS::TripleO::Compute::Net::SoftwareConfig
properties:
@@
-347,6
+363,7
@@
resources:
NetworkDeployment:
type: OS::TripleO::SoftwareDeployment
NetworkDeployment:
type: OS::TripleO::SoftwareDeployment
+ depends_on: PreNetworkConfig
properties:
name: NetworkDeployment
config: {get_resource: NetworkConfig}
properties:
name: NetworkDeployment
config: {get_resource: NetworkConfig}