Browse Source

Merge "Remove /var/lib/config-data context task" into stable/ussuri

changes/83/744183/1
Zuul 4 days ago
committed by Gerrit Code Review
parent
commit
6881c82425
2 changed files with 1 additions and 25 deletions
  1. +0
    -24
      common/deploy-steps-playbooks-common.yaml
  2. +1
    -1
      common/generate-config-tasks.yaml

+ 0
- 24
common/deploy-steps-playbooks-common.yaml View File

@@ -34,30 +34,6 @@
tags:
- 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 }}"
name: Render all_nodes data as group_vars for overcloud
gather_facts: "{{ gather_facts | default(false) }}"


+ 1
- 1
common/generate-config-tasks.yaml View File

@@ -52,7 +52,7 @@
path: "/var/lib/tripleo-config/container-puppet-config"
mode: 0700
recurse: true
setype: svirt_sandbox_file_t
setype: container_file_t

- name: "Generate container puppet configs for step {{ step }}"
container_puppet_config:


Loading…
Cancel
Save