Merge "Prevent the abusive restart of the octavia services" into stab…

…le/train
openstack-archive · Apr 19, 2022 · 85e112b · 85e112b
2 parents ad4985c + 0870220
commit 85e112b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/tripleo_ansible/roles/octavia-controller-config/tasks/netinterface.yml b/tripleo_ansible/roles/octavia-controller-config/tasks/netinterface.yml
@@ -13,10 +13,13 @@
   template:
     dest: "/etc/sysconfig/network-scripts/ifcfg-{{ mgmt_port_dev }}"
     src: "ifcfg.j2"
+  register: octavia_ifcfg_file
 
 - name: Bring the management port interface up
   become: true
   become_user: root
   command: "ifup {{ mgmt_port_dev }}"
   notify:
     - octavia config updated
+  when:
+    - octavia_ifcfg_file.changed|bool
diff --git a/tripleo_ansible/roles/octavia-controller-post-config/tasks/main.yml b/tripleo_ansible/roles/octavia-controller-post-config/tasks/main.yml
@@ -71,7 +71,7 @@
 
 - name: retrieve current ip list
   set_fact:
-    current_ip_list: "{{ config_contents.stdout }}"
+    current_ip_list: "{{ config_contents.stdout | trim }}"
 
 # This isn't perfect as they execution order will make them not match, but we can avoid a restart
 # if things have stayed the same.