From fe5e47ba560872378e621bb7c79064c30b61aea4 Mon Sep 17 00:00:00 2001
From: Aviram Bar-Haim <aviramb@mellanox.com>
Date: Fri, 26 Feb 2016 18:19:32 +0200
Subject: [PATCH] Fix parallel restart of DHCP on IB HA controllers

Change-Id: Idd41618587a0f96fadb69553900338c19320e485
---
 .../manifests/controller_sriov.pp                  | 14 ++++++++------
 deployment_tasks.yaml                              |  2 +-
 metadata.yaml                                      |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/deployment_scripts/puppet/modules/mellanox_openstack/manifests/controller_sriov.pp b/deployment_scripts/puppet/modules/mellanox_openstack/manifests/controller_sriov.pp
index 1a7d292..312454d 100644
--- a/deployment_scripts/puppet/modules/mellanox_openstack/manifests/controller_sriov.pp
+++ b/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']],
+      }
     }
   }
 }
diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index e3b45d1..3c940ed 100644
--- a/deployment_tasks.yaml
+++ b/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]
diff --git a/metadata.yaml b/metadata.yaml
index b852817..03805d3 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -5,7 +5,7 @@ name: mellanox-plugin
 title: Mellanox Openstack features
 
 # Plugin version
-version: 2.0.28
+version: 2.0.29
 
 # Description
 description: Enable features over Mellanox hardware