Merge "Disable mlockall if postcopy is enabled" into stable/victoria

tripleo_ansible/roles/tripleo_ovs_dpdk/defaults/main.yml

@@ -33,3 +33,4 @@ tripleo_ovs_dpdk_pmd_load_threshold: ""
 tripleo_ovs_dpdk_pmd_improvement_threshold: ""
 tripleo_ovs_dpdk_pmd_rebal_interval: ""
 tripleo_ovs_dpdk_vhost_postcopy_support: false
+tripleo_ovs_dpdk_vhost_postcopy_ovs_options: "--mlockall=no"

tripleo_ansible/roles/tripleo_ovs_dpdk/tasks/config.yml

@@ -144,23 +144,37 @@
     key: userspace-tso-enable
   when: not tripleo_ovs_dpdk_enable_tso|bool
 
-- name: Enable vhost-postcopy-support
-  openvswitch_db:
-    table: open_vswitch
-    record: .
-    col: other_config
-    key: vhost-postcopy-support
-    value: "{{ tripleo_ovs_dpdk_vhost_postcopy_support }}"
+- name: Enable postcopy support
   when: tripleo_ovs_dpdk_vhost_postcopy_support|bool
+  block:
+    - name: Enable vhost-postcopy-support
+      openvswitch_db:
+        table: open_vswitch
+        record: .
+        col: other_config
+        key: vhost-postcopy-support
+        value: "{{ tripleo_ovs_dpdk_vhost_postcopy_support }}"
+    - name: Disable mlockall in ovs
+      replace:
+        path: '/etc/sysconfig/openvswitch'
+        regexp: '^OPTIONS.*'
+        replace: 'OPTIONS="{{ tripleo_ovs_dpdk_vhost_postcopy_ovs_options }}"'
 
-- name: Disable vhost-postcopy-support
-  openvswitch_db:
-    state: absent
-    table: open_vswitch
-    record: .
-    col: other_config
-    key: vhost-postcopy-support
+- name: Disable postcopy support
   when: not tripleo_ovs_dpdk_vhost_postcopy_support|bool
+  block:
+    - name: Disable vhost-postcopy-support
+      openvswitch_db:
+        state: absent
+        table: open_vswitch
+        record: .
+        col: other_config
+        key: vhost-postcopy-support
+    - name: Return ovs OPTIONS to default
+      replace:
+        path: '/etc/sysconfig/openvswitch'
+        regexp: '^OPTIONS.*'
+        replace: 'OPTIONS=""'
 
 - name: Enable DPDK OVS PMD Auto Load Balance
   openvswitch_db: