From 9cce46ea8c7beefac3e2f97026d649b1d6963bec Mon Sep 17 00:00:00 2001
From: aharrisson <anders.harrisson@gmail.com>
Date: Thu, 9 Apr 2020 12:31:44 +0200
Subject: [PATCH] Fix idempotence issue in bootstrap-os (#5916)
---
roles/bootstrap-os/molecule/default/molecule.yml | 14 --------------
roles/bootstrap-os/tasks/bootstrap-debian.yml | 13 +++++++++++++
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/roles/bootstrap-os/molecule/default/molecule.yml b/roles/bootstrap-os/molecule/default/molecule.yml
index 8c6c6bd28..0528ebbb0 100644
--- a/roles/bootstrap-os/molecule/default/molecule.yml
+++ b/roles/bootstrap-os/molecule/default/molecule.yml
@@ -1,18 +1,4 @@
---
-scenario:
- name: default
- test_sequence:
- - lint
- - destroy
- - dependency
- - syntax
- - create
- - prepare
- - converge
- # - idempotence # skip
- - side_effect
- - verify
- - destroy
dependency:
name: galaxy
lint:
diff --git a/roles/bootstrap-os/tasks/bootstrap-debian.yml b/roles/bootstrap-os/tasks/bootstrap-debian.yml
index 74fe83a6f..53d7288df 100644
--- a/roles/bootstrap-os/tasks/bootstrap-debian.yml
+++ b/roles/bootstrap-os/tasks/bootstrap-debian.yml
@@ -50,12 +50,24 @@
- https_proxy is defined
- 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
raw: sed -i 's/^DNSSEC=yes/DNSSEC=allow-downgrade/g' /etc/systemd/resolved.conf
become: true
environment: {}
when:
- '"bionic" in os_release.stdout'
+ - need_dnssec_allow_downgrade.rc
- name: Restart systemd-resolved service
raw: systemctl restart systemd-resolved
@@ -63,6 +75,7 @@
environment: {}
when:
- '"bionic" in os_release.stdout'
+ - need_dnssec_allow_downgrade.rc
- name: Install python
raw:
--
GitLab