diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-08-12 03:19:08 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-08-12 03:19:08 +0000 |
commit | 699ec62274d909d61e2f1545342a1b6f48e44962 (patch) | |
tree | 1d912a24caf580e6621662c41d78b23f5f8a18a1 /puppet/role.role.j2.yaml | |
parent | 0785c93df294620229a5dcbe8d27c3521016ce8a (diff) | |
parent | d8e253182053d5e813cd2c067ee1da453813a2fc (diff) |
Merge "Convert compute-role.yaml to role.role.j2.yaml"
Diffstat (limited to 'puppet/role.role.j2.yaml')
-rw-r--r-- | puppet/role.role.j2.yaml | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml index c494141d..5453e65c 100644 --- a/puppet/role.role.j2.yaml +++ b/puppet/role.role.j2.yaml @@ -131,6 +131,12 @@ parameters: role-specific and is merged with the values given to the ServerMetadata parameter. type: json +{%- if role.deprecated_param_metadata is defined %} + {{role.deprecated_param_metadata}}: + default: {} + description: DEPRECATED - use {{role.name}}ServerMetadata instead + type: json +{%- endif %} ServerMetadata: default: {} description: > @@ -142,6 +148,12 @@ parameters: type: json description: Optional scheduler hints to pass to nova default: {} +{%- if role.deprecated_param_scheduler_hints is defined %} + {{role.deprecated_param_scheduler_hints}}: + type: json + description: DEPRECATED - use {{role.name}}SchedulerHints instead + default: {} +{%- endif %} NodeIndex: type: number default: 0 @@ -245,7 +257,6 @@ conditions: - DeploymentSwiftDataMap - {get_param: Hostname} - "" - {%- if role.deprecated_param_image is defined %} deprecated_param_image_set: not: @@ -301,9 +312,17 @@ resources: metadata: map_merge: - {get_param: ServerMetadata} +{%- if role.deprecated_param_metadata is defined %} + - {get_param: {{role.deprecated_param_metadata}}} +{%- endif %} - {get_param: {{role.name}}ServerMetadata} - {get_param: ServiceMetadataSettings} - scheduler_hints: {get_param: {{role.name}}SchedulerHints} + scheduler_hints: + map_merge: +{%- if role.deprecated_param_scheduler_hints is defined %} + - {get_param: {{role.deprecated_param_scheduler_hints}}} +{%- endif %} + - {get_param: {{role.name}}SchedulerHints} deployment_swift_data: if: - deployment_swift_data_map_unset @@ -343,7 +362,12 @@ resources: type: OS::TripleO::{{role.name}}::Ports::{{network.name}}Port properties: ControlPlaneIP: {get_attr: [{{server_resource_name}}, networks, ctlplane, 0]} - IPPool: {get_param: {{server_resource_name}}IPs} + IPPool: + map_merge: +{%- if role.deprecated_param_ips is defined %} + - {get_param: {{role.deprecated_param_ips}}} +{%- endif %} + - {get_param: {{role.name}}IPs} NodeIndex: {get_param: NodeIndex} {%- endfor %} |