summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMykyta Karpin <mkarpin@mirantis.com>2016-03-18 13:57:49 +0200
committerMykyta Karpin <mkarpin@mirantis.com>2016-03-18 14:02:07 +0200
commitb19cbd4d5f31ea6c2b06ddc18198932993b2efc3 (patch)
tree16276b290c8d7e8d70b054baa79a3f69b70a92ad
parentd20decbec77e697ffb3686bc37e41eb42ae6c361 (diff)
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
Notes
Notes (review): Code-Review+1: Maksym Yatsenko <myatsenko@mirantis.com> Code-Review+1: Artem Minasyan <aminasyan@mirantis.com> Code-Review+2: Ivan Berezovskiy <iberezovskiy@mirantis.com> Code-Review+2: Nadya Shakhat <nprivalova@mirantis.com> Workflow+1: Nadya Shakhat <nprivalova@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 22 Mar 2016 10:07:18 +0000 Reviewed-on: https://review.openstack.org/294544 Project: openstack/fuel-plugin-ceilometer-redis Branch: refs/heads/master
-rw-r--r--deployment_scripts/puppet/modules/redis/manifests/main.pp9
-rw-r--r--deployment_tasks.yaml9
-rw-r--r--metadata.yaml2
-rw-r--r--tasks.yaml7
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 (
147 ensure => 'running', 147 ensure => 'running',
148 name => $::ceilometer::params::agent_central_service_name, 148 name => $::ceilometer::params::agent_central_service_name,
149 enable => true, 149 enable => true,
150 hasstatus => true,
151 hasrestart => true,
150 } 152 }
151 153
152 service { 'ceilometer-alarm-evaluator': 154 service { 'ceilometer-alarm-evaluator':
153 ensure => 'running', 155 ensure => 'running',
154 name => $::ceilometer::params::alarm_evaluator_service_name, 156 name => $::ceilometer::params::alarm_evaluator_service_name,
155 enable => true, 157 enable => true,
158 hasstatus => true,
159 hasrestart => true,
156 } 160 }
157 161
158 service { 'ceilometer-agent-notification': 162 service { 'ceilometer-agent-notification':
@@ -190,10 +194,11 @@ class redis::main (
190 } 194 }
191 195
192 Pacemaker_wrappers::Service['redis-server'] -> 196 Pacemaker_wrappers::Service['redis-server'] ->
193 Ceilometer_config <||> ->
194 Pacemaker_wrappers::Service["$::ceilometer::params::agent_central_service_name"] -> 197 Pacemaker_wrappers::Service["$::ceilometer::params::agent_central_service_name"] ->
195 Pacemaker_wrappers::Service["$::ceilometer::params::alarm_evaluator_service_name"] 198 Pacemaker_wrappers::Service["$::ceilometer::params::alarm_evaluator_service_name"]
196 199
200 Ceilometer_config <||> ~> Service["$::ceilometer::params::agent_central_service_name"]
201 Ceilometer_config <||> ~> Service["$::ceilometer::params::alarm_evaluator_service_name"]
197 Ceilometer_config <||> ~> Service['ceilometer-agent-notification'] 202 Ceilometer_config <||> ~> Service['ceilometer-agent-notification']
198 203
199} \ No newline at end of file 204}
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 @@
1- id: ceilometer_redis
2 type: puppet
3 groups: [primary-controller, controller]
4 required_for: [deploy_end]
5 requires: [ceilometer-controller]
6 parameters:
7 puppet_manifest: "puppet/manifests/controller.pp"
8 puppet_modules: "puppet/modules:/etc/puppet/modules"
9 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:
26 repository_path: repositories/ubuntu 26 repository_path: repositories/ubuntu
27 27
28# Version of plugin package 28# Version of plugin package
29package_version: '2.0.0' 29package_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 @@
1- role: ['primary-controller', 'controller']
2 stage: post_deployment
3 type: puppet
4 parameters:
5 puppet_manifest: puppet/manifests/controller.pp
6 puppet_modules: puppet/modules:/etc/puppet/modules
7 timeout: 720