Update package version to 3.0.0

This change is required to fix different issues
related to order in which plugin tasks are launched
on controller nodes

Closes-Bug: #1558580

Change-Id: I8d26ca82e70ef80d509203366457779d6a3291a8

4 files changed, 17 insertions, 10 deletions

diff --git a/deployment_scripts/puppet/modules/redis/manifests/main.pp b/deployment_scripts/puppet/modules/redis/manifests/main.pp
index f481815..6ddef59 100644
--- a/deployment_scripts/puppet/modules/redis/manifests/main.pp
+++ b/deployment_scripts/puppet/modules/redis/manifests/main.pp
@@ -147,12 +147,16 @@ class redis::main (
     ensure  => 'running',
     name    => $::ceilometer::params::agent_central_service_name,
     enable  => true,
+    hasstatus  => true,
+    hasrestart => true,
   }
 
   service { 'ceilometer-alarm-evaluator':
     ensure  => 'running',
     name    => $::ceilometer::params::alarm_evaluator_service_name,
     enable  => true,
+    hasstatus  => true,
+    hasrestart => true,
   }
 
   service { 'ceilometer-agent-notification':
@@ -190,10 +194,11 @@ class redis::main (
   }
 
   Pacemaker_wrappers::Service['redis-server'] ->
-  Ceilometer_config <||> ->
   Pacemaker_wrappers::Service["$::ceilometer::params::agent_central_service_name"] ->
   Pacemaker_wrappers::Service["$::ceilometer::params::alarm_evaluator_service_name"]
 
+  Ceilometer_config <||> ~> Service["$::ceilometer::params::agent_central_service_name"]
+  Ceilometer_config <||> ~> Service["$::ceilometer::params::alarm_evaluator_service_name"]
   Ceilometer_config <||> ~> Service['ceilometer-agent-notification']
 
-}
\ No newline at end of file
+}
diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
new file mode 100644
index 0000000..df65581
--- /dev/null
+++ b/deployment_tasks.yaml
@@ -0,0 +1,9 @@
+- id: ceilometer_redis
+  type: puppet
+  groups: [primary-controller, controller]
+  required_for: [deploy_end]
+  requires: [ceilometer-controller]
+  parameters:
+    puppet_manifest: "puppet/manifests/controller.pp"
+    puppet_modules: "puppet/modules:/etc/puppet/modules"
+    timeout: 3600
diff --git a/metadata.yaml b/metadata.yaml
index 8c90b45..b5c311e 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -26,4 +26,4 @@ releases:
     repository_path: repositories/ubuntu
 
 # Version of plugin package
-package_version: '2.0.0'
+package_version: '3.0.0'
diff --git a/tasks.yaml b/tasks.yaml
deleted file mode 100644
index aba2a77..0000000
--- a/tasks.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-- role: ['primary-controller', 'controller']
-  stage: post_deployment
-  type: puppet
-  parameters:
-    puppet_manifest: puppet/manifests/controller.pp
-    puppet_modules: puppet/modules:/etc/puppet/modules
-    timeout: 720