From 7558789bbf78223ec2c431a1f157772ccdba43b4 Mon Sep 17 00:00:00 2001
From: Aviram Bar-Haim <aviramb@mellanox.com>
Date: Wed, 3 Jun 2015 14:10:51 +0300
Subject: [PATCH] Fix Ubuntu duplicated declaration of nova-compute

Change-Id: I389bb54b2f8d7e4fbf50b93ea72465ba619e1fcf
---
 .../modules/mellanox_openstack/manifests/agent.pp  | 14 +++++++++-----
 .../mellanox_openstack/manifests/snapshot_patch.pp |  4 ----
 metadata.yaml                                      |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/deployment_scripts/puppet/modules/mellanox_openstack/manifests/agent.pp b/deployment_scripts/puppet/modules/mellanox_openstack/manifests/agent.pp
index ba0d490..f211985 100644
--- a/deployment_scripts/puppet/modules/mellanox_openstack/manifests/agent.pp
+++ b/deployment_scripts/puppet/modules/mellanox_openstack/manifests/agent.pp
@@ -29,10 +29,6 @@ class mellanox_openstack::agent (
             source => 'puppet:///modules/mellanox_openstack/network.filters',
         }
 
-        service { $compute_service_name :
-            ensure => running
-        }
-
         File <| title == '/etc/nova/nova.conf' |> ->
         File[$filters_dir] ->
         File[$filters_file] ~>
@@ -59,10 +55,18 @@ class mellanox_openstack::agent (
         hasrestart => true,
     }
 
+    service { $compute_service_name :
+        ensure     => running,
+        enable     => true,
+        hasstatus  => true,
+        hasrestart => true,
+    }
+
     Package[$package] ->
     File[$mlnx_agent_conf] ->
     Mellanox_agent_config <||> ~>
-    Service[$agent]
+    Service[$agent] ~>
+    Service[$compute_service_name]
 
     Package[$package] ~>
     Service[$agent]
diff --git a/deployment_scripts/puppet/modules/mellanox_openstack/manifests/snapshot_patch.pp b/deployment_scripts/puppet/modules/mellanox_openstack/manifests/snapshot_patch.pp
index 8d05c7f..74c46ef 100644
--- a/deployment_scripts/puppet/modules/mellanox_openstack/manifests/snapshot_patch.pp
+++ b/deployment_scripts/puppet/modules/mellanox_openstack/manifests/snapshot_patch.pp
@@ -17,8 +17,4 @@ class mellanox_openstack::snapshot_patch {
     notify      => Service[$compute_service_name]
   }
 
-  service { $compute_service_name :
-    ensure      => running
-  }
-
 }
diff --git a/metadata.yaml b/metadata.yaml
index d7eacd0..06a7b5b 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -5,7 +5,7 @@ name: mellanox-plugin
 title: Mellanox Openstack features
 
 # Plugin version
-version: 0.2.20
+version: 0.2.21
 
 # Description
 description: Enable features over Mellanox hardware