Merge "Use hiera config from ansible group_vars"
This commit is contained in:
commit
6b0b69f891
|
@ -112,11 +112,6 @@ parameters:
|
|||
description: Mapping of service name to network name
|
||||
type: json
|
||||
default: {}
|
||||
{%- for role in roles %}
|
||||
{{role.name}}DeploymentHierarchy:
|
||||
type: json
|
||||
default: {}
|
||||
{%- endfor %}
|
||||
ValidateControllersIcmp:
|
||||
default: true
|
||||
description: Validation to ensure that all controllers can be reached with ICMP
|
||||
|
@ -500,18 +495,9 @@ outputs:
|
|||
gather_facts: {{ '"{{' }} gather_facts | default(false) {{ '}}"' }}
|
||||
any_errors_fatal: yes
|
||||
tasks:
|
||||
{%- for role in roles %}
|
||||
- name: Deployment hieradata
|
||||
- name: Hiera config
|
||||
include_role:
|
||||
name: tripleo-hieradata
|
||||
vars:
|
||||
hieradata_template: ""
|
||||
hieradata_variable_start_string: $$
|
||||
hieradata_variable_end_string: $$
|
||||
hieradata_files: "{{ '{{' }} lookup('file', '{{role.name}}/deployment-hierarchy.yaml') {{ '}}' }}"
|
||||
when: tripleo_role_name == '{{role.name}}'
|
||||
|
||||
{%- endfor %}
|
||||
- name: Hiera symlink
|
||||
file:
|
||||
src: /etc/puppet/hiera.yaml
|
||||
|
@ -522,7 +508,6 @@ outputs:
|
|||
- overcloud
|
||||
- pre_deploy_steps
|
||||
|
||||
{%- for role in roles %}
|
||||
- hosts: {{primary_role_name}}:DEPLOY_TARGET_HOST
|
||||
name: Server hieradata from vars
|
||||
gather_facts: {{ '"{{' }} gather_facts | default(false) {{ '}}"' }}
|
||||
|
@ -542,11 +527,9 @@ outputs:
|
|||
- service_configs
|
||||
- extraconfig
|
||||
- role_extraconfig
|
||||
when: tripleo_role_name == '{{role.name}}'
|
||||
tags:
|
||||
- overcloud
|
||||
- pre_deploy_steps
|
||||
{%- endfor %}
|
||||
|
||||
- hosts: {{primary_role_name}}:DEPLOY_TARGET_HOST
|
||||
name: Server deployments
|
||||
|
@ -809,9 +792,6 @@ outputs:
|
|||
|
||||
external_deploy_steps_tasks: {get_attr: [ExternalDeployTasks, value]}
|
||||
external_post_deploy_steps_tasks: {get_attr: [ExternalPostDeployTasks, value]}
|
||||
{%- for role in roles %}
|
||||
{{role.name}}/deployment-hierarchy.yaml: {get_param: {{role.name}}DeploymentHierarchy}
|
||||
{%- endfor %}
|
||||
update_steps_tasks: |
|
||||
{%- for role in roles %}
|
||||
- import_tasks: {{role.name}}/update_tasks.yaml
|
||||
|
|
|
@ -499,6 +499,26 @@ resources:
|
|||
{%- endif %}
|
||||
- {get_param: {{role.name}}ExtraConfig}
|
||||
extraconfig: {get_param: ExtraConfig}
|
||||
hieradata_files:
|
||||
- '"%{::uuid}"'
|
||||
- fqdn
|
||||
- docker_puppet # Optionally provided by container-puppet.py
|
||||
- heat_config_%{::deploy_config_name}
|
||||
- config_step
|
||||
- role_extraconfig
|
||||
- extraconfig
|
||||
- service_configs
|
||||
- cloud_domain
|
||||
- bootstrap_node # provided by tripleo-hieradata
|
||||
- all_nodes # provided by tripleo-hieradata
|
||||
- vip_data # provided by tripleo-hieradata
|
||||
- net_ip_map
|
||||
- '"%{::osfamily}"'
|
||||
# The following are required for compatibility with the Controller role
|
||||
# where some vendor integrations added hieradata via ExtraConfigPre
|
||||
- neutron_bigswitch_data # Optionally provided by Controller/ComputeExtraConfigPre
|
||||
# Special variable for upgrade
|
||||
- upgrade
|
||||
|
||||
{{role.name}}ServiceConfigSettings:
|
||||
type: OS::Heat::Value
|
||||
|
@ -903,32 +923,6 @@ resources:
|
|||
- {get_attr: [{{role.name}}, blacklist_hostname]}
|
||||
{%- endfor %}
|
||||
|
||||
{%- for role in roles %}
|
||||
{{role.name}}ConfigHierarchy:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
value:
|
||||
- '"%{::uuid}"'
|
||||
- fqdn
|
||||
- docker_puppet # Optionally provided by container-puppet.py
|
||||
- heat_config_%{::deploy_config_name}
|
||||
- config_step
|
||||
- role_extraconfig
|
||||
- extraconfig
|
||||
- service_configs
|
||||
- cloud_domain
|
||||
- bootstrap_node # provided by tripleo-hieradata
|
||||
- all_nodes # provided by tripleo-hieradata
|
||||
- vip_data # provided by tripleo-hieradata
|
||||
- net_ip_map
|
||||
- '"%{::osfamily}"'
|
||||
# The following are required for compatibility with the Controller role
|
||||
# where some vendor integrations added hieradata via ExtraConfigPre
|
||||
- neutron_bigswitch_data # Optionally provided by Controller/ComputeExtraConfigPre
|
||||
# Special variable for upgrade
|
||||
- upgrade
|
||||
{%- endfor %}
|
||||
|
||||
# Post deployment steps for all roles
|
||||
AllNodesDeploySteps:
|
||||
type: OS::TripleO::PostDeploySteps
|
||||
|
@ -946,8 +940,6 @@ resources:
|
|||
{%- endfor %}
|
||||
{%- for role in roles %}
|
||||
{{role.name}}Count: {get_param: {{role.name}}Count}
|
||||
{{role.name}}DeploymentHierarchy:
|
||||
{get_attr: [{{role.name}}ConfigHierarchy, value]}
|
||||
{%- endfor %}
|
||||
ServiceNetMapLower: {get_attr: [ServiceNetMap, service_net_map_lower]}
|
||||
PingTestIpsMap:
|
||||
|
|
Loading…
Reference in New Issue