openstack/tripleo-heat-templates
Code Issues Proposed changes

Rename tripleo-hieradata to tripleo_hieradata

Browse Source 
The role is now tripleo_hieradata for the new versions of Ansible.

Change-Id: Idd2606db44cd7514537ee870be189760fdf70ae4
This commit is contained in:
Emilien Macchi 2020-02-25 10:01:05 -05:00
parent 6ba727a493
commit bb1c568857
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/deploy-steps.j2
View File

@ -939,7 +939,7 @@ outputs:
register: whoami register: whoami
- name: render all_nodes data as group_vars for overcloud - name: render all_nodes data as group_vars for overcloud
template: template:
src: "{{ '{{' }} lookup('first_found', lookup('config', 'DEFAULT_ROLES_PATH') | map('regex_replace', '$', '/tripleo-hieradata') | list) ~ '/templates/all_nodes.j2' {{ '}}'}}" src: "{{ '{{' }} lookup('first_found', lookup('config', 'DEFAULT_ROLES_PATH') | map('regex_replace', '$', '/tripleo_hieradata') | list) ~ '/templates/all_nodes.j2' {{ '}}'}}"
dest: "{{ '{{' }} playbook_dir {{ '}}' }}/group_vars/overcloud.json" dest: "{{ '{{' }} playbook_dir {{ '}}' }}/group_vars/overcloud.json"
owner: "{{ '{{' }} whoami.stdout {{ '}}' }}" owner: "{{ '{{' }} whoami.stdout {{ '}}' }}"
group: "{{ '{{' }} whoami.stdout {{ '}}' }}" group: "{{ '{{' }} whoami.stdout {{ '}}' }}"
@ -1223,7 +1223,7 @@ outputs:
register: whoami register: whoami
- name: render all_nodes data as group_vars for overcloud - name: render all_nodes data as group_vars for overcloud
template: template:
src: "{{ '{{' }} lookup('first_found', lookup('config', 'DEFAULT_ROLES_PATH') | map('regex_replace', '$', '/tripleo-hieradata') | list) ~ '/templates/all_nodes.j2' {{ '}}'}}" src: "{{ '{{' }} lookup('first_found', lookup('config', 'DEFAULT_ROLES_PATH') | map('regex_replace', '$', '/tripleo_hieradata') | list) ~ '/templates/all_nodes.j2' {{ '}}'}}"
dest: "{{ '{{' }} playbook_dir {{ '}}' }}/group_vars/overcloud.json" dest: "{{ '{{' }} playbook_dir {{ '}}' }}/group_vars/overcloud.json"
owner: "{{ '{{' }} whoami.stdout {{ '}}' }}" owner: "{{ '{{' }} whoami.stdout {{ '}}' }}"
group: "{{ '{{' }} whoami.stdout {{ '}}' }}" group: "{{ '{{' }} whoami.stdout {{ '}}' }}"
@ -1357,7 +1357,7 @@ outputs:
register: whoami register: whoami
- name: render all_nodes data as group_vars for overcloud - name: render all_nodes data as group_vars for overcloud
template: template:
src: "{{ '{{' }} lookup('first_found', lookup('config', 'DEFAULT_ROLES_PATH') | map('regex_replace', '$', '/tripleo-hieradata') | list) ~ '/templates/all_nodes.j2' {{ '}}'}}" src: "{{ '{{' }} lookup('first_found', lookup('config', 'DEFAULT_ROLES_PATH') | map('regex_replace', '$', '/tripleo_hieradata') | list) ~ '/templates/all_nodes.j2' {{ '}}'}}"
dest: "{{ '{{' }} playbook_dir {{ '}}' }}/group_vars/overcloud.json" dest: "{{ '{{' }} playbook_dir {{ '}}' }}/group_vars/overcloud.json"
owner: "{{ '{{' }} whoami.stdout {{ '}}' }}" owner: "{{ '{{' }} whoami.stdout {{ '}}' }}"
group: "{{ '{{' }} whoami.stdout {{ '}}' }}" group: "{{ '{{' }} whoami.stdout {{ '}}' }}"
@ -1485,7 +1485,7 @@ outputs:
register: whoami register: whoami
- name: render all_nodes data as group_vars for overcloud - name: render all_nodes data as group_vars for overcloud
template: template:
src: "{{ '{{' }} lookup('first_found', lookup('config', 'DEFAULT_ROLES_PATH') | map('regex_replace', '$', '/tripleo-hieradata') | list) ~ '/templates/all_nodes.j2' {{ '}}'}}" src: "{{ '{{' }} lookup('first_found', lookup('config', 'DEFAULT_ROLES_PATH') | map('regex_replace', '$', '/tripleo_hieradata') | list) ~ '/templates/all_nodes.j2' {{ '}}'}}"
dest: "{{ '{{' }} playbook_dir {{ '}}' }}/group_vars/overcloud.json" dest: "{{ '{{' }} playbook_dir {{ '}}' }}/group_vars/overcloud.json"
owner: "{{ '{{' }} whoami.stdout {{ '}}' }}" owner: "{{ '{{' }} whoami.stdout {{ '}}' }}"
group: "{{ '{{' }} whoami.stdout {{ '}}' }}" group: "{{ '{{' }} whoami.stdout {{ '}}' }}"

4
common/hiera-steps-tasks.yaml
View File

@ -1,6 +1,6 @@
- name: Hiera config - name: Hiera config
include_role: include_role:
name: tripleo-hieradata name: tripleo_hieradata
- name: Hiera symlink - name: Hiera symlink
file: file:
src: /etc/puppet/hiera.yaml src: /etc/puppet/hiera.yaml
@ -9,7 +9,7 @@
force: true force: true
- name: Hieradata from vars - name: Hieradata from vars
include_role: include_role:
name: tripleo-hieradata name: tripleo_hieradata
tasks_from: hieradata_vars.yaml tasks_from: hieradata_vars.yaml
vars: vars:
hieradata_templates_list: hieradata_templates_list:

6
overcloud.j2.yaml
View File

@ -597,9 +597,9 @@ resources:
- service_names - service_names
- service_configs - service_configs
- cloud_domain - cloud_domain
- bootstrap_node # provided by tripleo-hieradata - bootstrap_node # provided by tripleo_hieradata
- all_nodes # provided by tripleo-hieradata - all_nodes # provided by tripleo_hieradata
- vip_data # provided by tripleo-hieradata - vip_data # provided by tripleo_hieradata
- net_ip_map - net_ip_map
- '"%{::osfamily}"' - '"%{::osfamily}"'
# The following are required for compatibility with the Controller role # The following are required for compatibility with the Controller role