aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-24 18:08:52 +0000
committerGerrit Code Review <review@openstack.org>2017-08-24 18:08:52 +0000
commit98f578b7789cb4edef1090574ab7ab854f886fed (patch)
tree0ba8048b8c64dcc04b633ad1be1fad403b2b58da /docker
parentadff7d36f9bfdea36a4983b7b6018d128e4fd47c (diff)
parent59e29b17f4a9f5f65b6f8a7b8e82ef6426d8a581 (diff)
Merge "Remove baremetal cron jobs on docker upgrade"
Diffstat (limited to 'docker')
-rw-r--r--docker/services/cinder-api.yaml4
-rw-r--r--docker/services/heat-api.yaml4
-rw-r--r--docker/services/keystone.yaml4
-rw-r--r--docker/services/nova-api.yaml4
4 files changed, 16 insertions, 0 deletions
diff --git a/docker/services/cinder-api.yaml b/docker/services/cinder-api.yaml
index 900131c..519b232 100644
--- a/docker/services/cinder-api.yaml
+++ b/docker/services/cinder-api.yaml
@@ -184,3 +184,7 @@ outputs:
- name: Stop and disable cinder_api service
tags: step2
service: name=httpd state=stopped enabled=no
+ - name: remove old cinder cron jobs
+ file:
+ path: /var/spool/cron/cinder
+ state: absent
diff --git a/docker/services/heat-api.yaml b/docker/services/heat-api.yaml
index 9e38b06..54c7bed 100644
--- a/docker/services/heat-api.yaml
+++ b/docker/services/heat-api.yaml
@@ -156,6 +156,10 @@ outputs:
tags: common
ignore_errors: True
register: heat_api_enabled
+ - name: remove old heat cron jobs
+ file:
+ path: /var/spool/cron/heat
+ state: absent
- name: check for heat_api running under apache (post upgrade)
tags: step2
shell: "httpd -t -D DUMP_VHOSTS | grep -q heat_api_wsgi"
diff --git a/docker/services/keystone.yaml b/docker/services/keystone.yaml
index fcc458a..4c2c1d1 100644
--- a/docker/services/keystone.yaml
+++ b/docker/services/keystone.yaml
@@ -200,5 +200,9 @@ outputs:
- name: Stop and disable keystone service (running under httpd)
tags: step2
service: name=httpd state=stopped enabled=no
+ - name: remove old keystone cron jobs
+ file:
+ path: /var/spool/cron/keystone
+ state: absent
metadata_settings:
get_attr: [KeystoneBase, role_data, metadata_settings]
diff --git a/docker/services/nova-api.yaml b/docker/services/nova-api.yaml
index be2c8a5..37c4da5 100644
--- a/docker/services/nova-api.yaml
+++ b/docker/services/nova-api.yaml
@@ -225,3 +225,7 @@ outputs:
- name: Stop and disable nova_api service
tags: step2
service: name=openstack-nova-api state=stopped enabled=no
+ - name: remove old nova cron jobs
+ file:
+ path: /var/spool/cron/nova
+ state: absent