diff --git a/tripleo_ansible/roles/octavia_controller_config/tasks/netinterface.yml b/tripleo_ansible/roles/octavia_controller_config/tasks/netinterface.yml
index 0d60eea84..0feaeeec7 100644
--- a/tripleo_ansible/roles/octavia_controller_config/tasks/netinterface.yml
+++ b/tripleo_ansible/roles/octavia_controller_config/tasks/netinterface.yml
@@ -13,6 +13,7 @@
   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
@@ -20,3 +21,5 @@
   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
index dab8be43c..03ffc7974 100644
--- 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.