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
This commit is contained in:
Mykyta Karpin 2016-03-18 13:57:49 +02:00
parent d20decbec7
commit b19cbd4d5f
4 changed files with 17 additions and 10 deletions

View File

@ -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']
}
}

9
deployment_tasks.yaml Normal file
View File

@ -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

View File

@ -26,4 +26,4 @@ releases:
repository_path: repositories/ubuntu
# Version of plugin package
package_version: '2.0.0'
package_version: '3.0.0'

View File

@ -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