Merge "Remove /var/lib/config-data context task" into stable/ussuri
This commit is contained in:
commit
6881c82425
|
@ -34,30 +34,6 @@
|
||||||
tags:
|
tags:
|
||||||
- always
|
- always
|
||||||
|
|
||||||
- hosts: "{{ deploy_target_host }}"
|
|
||||||
strategy: tripleo_linear
|
|
||||||
name: Ensure /var/lib/config-data context
|
|
||||||
become: true
|
|
||||||
gather_facts: false
|
|
||||||
any_errors_fatal: false
|
|
||||||
ignore_unreachable: true
|
|
||||||
tasks:
|
|
||||||
- name: Ensure /var/lib/config-data context
|
|
||||||
shell: |-
|
|
||||||
set -o pipefail
|
|
||||||
if [[ -e /var/lib/config-data ]]; then
|
|
||||||
chcon -R -t svirt_sandbox_file_t /var/lib/config-data
|
|
||||||
exit 2
|
|
||||||
fi
|
|
||||||
args:
|
|
||||||
executable: /bin/bash
|
|
||||||
warn: no
|
|
||||||
register: _selinux_config_data
|
|
||||||
changed_when: _selinux_config_data.rc == 2
|
|
||||||
failed_when: _selinux_config_data.rc not in [0,2]
|
|
||||||
tags:
|
|
||||||
- always
|
|
||||||
|
|
||||||
- hosts: "{{ deploy_target_host }}"
|
- hosts: "{{ deploy_target_host }}"
|
||||||
name: Render all_nodes data as group_vars for overcloud
|
name: Render all_nodes data as group_vars for overcloud
|
||||||
gather_facts: "{{ gather_facts | default(false) }}"
|
gather_facts: "{{ gather_facts | default(false) }}"
|
||||||
|
|
|
@ -52,7 +52,7 @@
|
||||||
path: "/var/lib/tripleo-config/container-puppet-config"
|
path: "/var/lib/tripleo-config/container-puppet-config"
|
||||||
mode: 0700
|
mode: 0700
|
||||||
recurse: true
|
recurse: true
|
||||||
setype: svirt_sandbox_file_t
|
setype: container_file_t
|
||||||
|
|
||||||
- name: "Generate container puppet configs for step {{ step }}"
|
- name: "Generate container puppet configs for step {{ step }}"
|
||||||
container_puppet_config:
|
container_puppet_config:
|
||||||
|
|
Loading…
Reference in New Issue