Merge "Fix parallel restart of DHCP on IB HA controllers"

deployment_scripts/puppet/modules/mellanox_openstack/manifests/controller_sriov.pp

@@ -57,12 +57,14 @@ class mellanox_openstack::controller_sriov (
       value     => 'True',
     }
 
-    service { $dhcp_agent :
-      ensure     =>  running,
-      enable     =>  true,
-      provider   =>  pacemaker,
-      subscribe  =>  [Neutron_dhcp_agent_config['DEFAULT/dhcp_driver'],
-                      Neutron_dhcp_agent_config['DEFAULT/dhcp_broadcast_reply']],
+    if (hiera('role') == 'primary-controller') {
+      service { $dhcp_agent :
+        ensure     =>  running,
+        enable     =>  true,
+        provider   =>  pacemaker,
+        subscribe  =>  [Neutron_dhcp_agent_config['DEFAULT/dhcp_driver'],
+                        Neutron_dhcp_agent_config['DEFAULT/dhcp_broadcast_reply']],
+      }
     }
   }
 }

deployment_tasks.yaml

@@ -151,7 +151,7 @@
   parameters:
     puppet_manifest: puppet/manifests/controller.pp
     puppet_modules: puppet/modules:/etc/puppet/modules
-    timeout: 500
+    timeout: 2000
 - id: configure_mellanox_compute
   role: ['compute']
   required_for: [post_deployment_end]