Browse Source

Merge "Fix tripleo_hierdata permissions" into stable/train

changes/87/739587/8
Zuul 1 month ago
committed by Gerrit Code Review
parent
commit
0e712d5c98
3 changed files with 5 additions and 0 deletions
  1. +1
    -0
      tripleo_ansible/roles/tripleo-hieradata/tasks/ansible_hieradata.yml
  2. +2
    -0
      tripleo_ansible/roles/tripleo-hieradata/tasks/hieradata_vars.yaml
  3. +2
    -0
      tripleo_ansible/roles/tripleo-hieradata/tasks/main.yml

+ 1
- 0
tripleo_ansible/roles/tripleo-hieradata/tasks/ansible_hieradata.yml View File

@@ -1,5 +1,6 @@
---
- name: Check for hieradata file
become: true
stat:
path:
src: "{{ hieradata_ansible_file }}"


+ 2
- 0
tripleo_ansible/roles/tripleo-hieradata/tasks/hieradata_vars.yaml View File

@@ -15,11 +15,13 @@
# under the License.

- name: Copy overcloud.json to all_nodes.json
become: true
copy:
src: "{{ playbook_dir }}/group_vars/overcloud.json"
dest: "{{ dest_path | default('/etc/puppet/hieradata/all_nodes.json') }}"

- name: Render hieradata from template
become: true
template:
src: templates/{{ item }}.j2
dest: "{{ dest_path | default('/etc/puppet/hieradata/' ~ item ~ '.json') }}"


+ 2
- 0
tripleo_ansible/roles/tripleo-hieradata/tasks/main.yml View File

@@ -15,12 +15,14 @@
# under the License.

- name: Create /etc/puppet/hieradata
become: true
file:
path: /etc/puppet/hieradata
state: directory
mode: 0700

- name: Write hiera config
become: true
when:
- (hieradata_files | length) > 0
copy:


Loading…
Cancel
Save