From 4d9b568f6c772269a95811c5f4e8c4b87eff4702 Mon Sep 17 00:00:00 2001 From: ysastri Date: Mon, 10 Feb 2020 16:06:06 +0100 Subject: [PATCH] Fix idempotency for os-lxc-container-setup.yml Added regexp to avoid multiple entry of lxc.start.order in os-lxc-container-setup.yml. Remove insertafter to avoid confusion. Change-Id: I50ea0ba97c79f9c1509e382643b9aecc805862b7 Closes-Bug: 1862625 --- playbooks/common-tasks/os-lxc-container-setup.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/playbooks/common-tasks/os-lxc-container-setup.yml b/playbooks/common-tasks/os-lxc-container-setup.yml index 80df900b3e..53a4ba4cbd 100644 --- a/playbooks/common-tasks/os-lxc-container-setup.yml +++ b/playbooks/common-tasks/os-lxc-container-setup.yml @@ -61,9 +61,9 @@ - name: Extra lxc config lineinfile: - dest: "/var/lib/lxc/{{ inventory_hostname }}/config" + path: "/var/lib/lxc/{{ inventory_hostname }}/config" + regexp: "^{{ item.split('=')[0] }} =" line: "{{ item.split('=')[0] }} = {{ item.split('=', 1)[1] }}" - insertafter: "^{{ item.split('=')[0] }}" backup: "true" with_items: "{{ extra_container_config | default([]) }}" delegate_to: "{{ physical_host }}" @@ -73,9 +73,9 @@ - name: Extra lxc config no restart lineinfile: - dest: "/var/lib/lxc/{{ inventory_hostname }}/config" + path: "/var/lib/lxc/{{ inventory_hostname }}/config" + regexp: "^{{ item.split('=')[0] }} =" line: "{{ item.split('=')[0] }} = {{ item.split('=', 1)[1] }}" - insertafter: "^{{ item.split('=')[0] }}" backup: "true" with_items: "{{ extra_container_config_no_restart | default(['lxc.start.order=100']) }}" delegate_to: "{{ physical_host }}"