Browse Source

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
Mykyta Karpin 3 years ago
parent
commit
b19cbd4d5f
4 changed files with 17 additions and 10 deletions
  1. 7
    2
      deployment_scripts/puppet/modules/redis/manifests/main.pp
  2. 9
    0
      deployment_tasks.yaml
  3. 1
    1
      metadata.yaml
  4. 0
    7
      tasks.yaml

+ 7
- 2
deployment_scripts/puppet/modules/redis/manifests/main.pp View File

@@ -147,12 +147,16 @@ class redis::main (
147 147
     ensure  => 'running',
148 148
     name    => $::ceilometer::params::agent_central_service_name,
149 149
     enable  => true,
150
+    hasstatus  => true,
151
+    hasrestart => true,
150 152
   }
151 153
 
152 154
   service { 'ceilometer-alarm-evaluator':
153 155
     ensure  => 'running',
154 156
     name    => $::ceilometer::params::alarm_evaluator_service_name,
155 157
     enable  => true,
158
+    hasstatus  => true,
159
+    hasrestart => true,
156 160
   }
157 161
 
158 162
   service { 'ceilometer-agent-notification':
@@ -190,10 +194,11 @@ class redis::main (
190 194
   }
191 195
 
192 196
   Pacemaker_wrappers::Service['redis-server'] ->
193
-  Ceilometer_config <||> ->
194 197
   Pacemaker_wrappers::Service["$::ceilometer::params::agent_central_service_name"] ->
195 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 202
   Ceilometer_config <||> ~> Service['ceilometer-agent-notification']
198 203
 
199
-}
204
+}

+ 9
- 0
deployment_tasks.yaml View File

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

+ 1
- 1
metadata.yaml View File

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

+ 0
- 7
tasks.yaml View File

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

Loading…
Cancel
Save