Fix idempotence issue in bootstrap-os (#5916)
This commit is contained in:
parent
2e67289473
commit
9cce46ea8c
2 changed files with 13 additions and 14 deletions
|
@ -1,18 +1,4 @@
|
||||||
---
|
---
|
||||||
scenario:
|
|
||||||
name: default
|
|
||||||
test_sequence:
|
|
||||||
- lint
|
|
||||||
- destroy
|
|
||||||
- dependency
|
|
||||||
- syntax
|
|
||||||
- create
|
|
||||||
- prepare
|
|
||||||
- converge
|
|
||||||
# - idempotence # skip
|
|
||||||
- side_effect
|
|
||||||
- verify
|
|
||||||
- destroy
|
|
||||||
dependency:
|
dependency:
|
||||||
name: galaxy
|
name: galaxy
|
||||||
lint:
|
lint:
|
||||||
|
|
|
@ -50,12 +50,24 @@
|
||||||
- https_proxy is defined
|
- https_proxy is defined
|
||||||
- need_https_proxy.rc != 0
|
- need_https_proxy.rc != 0
|
||||||
|
|
||||||
|
- name: Check Network Name Resolution configuration
|
||||||
|
raw: grep '^DNSSEC=allow-downgrade' /etc/systemd/resolved.conf
|
||||||
|
register: need_dnssec_allow_downgrade
|
||||||
|
failed_when: false
|
||||||
|
changed_when: false
|
||||||
|
# This command should always run, even in check mode
|
||||||
|
check_mode: false
|
||||||
|
environment: {}
|
||||||
|
when:
|
||||||
|
- '"bionic" in os_release.stdout'
|
||||||
|
|
||||||
- name: Change Network Name Resolution configuration
|
- name: Change Network Name Resolution configuration
|
||||||
raw: sed -i 's/^DNSSEC=yes/DNSSEC=allow-downgrade/g' /etc/systemd/resolved.conf
|
raw: sed -i 's/^DNSSEC=yes/DNSSEC=allow-downgrade/g' /etc/systemd/resolved.conf
|
||||||
become: true
|
become: true
|
||||||
environment: {}
|
environment: {}
|
||||||
when:
|
when:
|
||||||
- '"bionic" in os_release.stdout'
|
- '"bionic" in os_release.stdout'
|
||||||
|
- need_dnssec_allow_downgrade.rc
|
||||||
|
|
||||||
- name: Restart systemd-resolved service
|
- name: Restart systemd-resolved service
|
||||||
raw: systemctl restart systemd-resolved
|
raw: systemctl restart systemd-resolved
|
||||||
|
@ -63,6 +75,7 @@
|
||||||
environment: {}
|
environment: {}
|
||||||
when:
|
when:
|
||||||
- '"bionic" in os_release.stdout'
|
- '"bionic" in os_release.stdout'
|
||||||
|
- need_dnssec_allow_downgrade.rc
|
||||||
|
|
||||||
- name: Install python
|
- name: Install python
|
||||||
raw:
|
raw:
|
||||||
|
|
Loading…
Reference in a new issue