From 59e29b17f4a9f5f65b6f8a7b8e82ef6426d8a581 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Thu, 3 Aug 2017 10:20:15 -0400
Subject: Remove baremetal cron jobs on docker upgrade

Change-Id: I072a3f582cdb978187d14233ea1ba636d12a1293
Closes-bug: #1708466
---
 docker/services/cinder-api.yaml | 4 ++++
 docker/services/heat-api.yaml   | 4 ++++
 docker/services/keystone.yaml   | 4 ++++
 docker/services/nova-api.yaml   | 4 ++++
 4 files changed, 16 insertions(+)

(limited to 'docker')

diff --git a/docker/services/cinder-api.yaml b/docker/services/cinder-api.yaml
index 900131c9..519b2328 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 9e38b060..54c7bedd 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 fcc458a2..4c2c1d16 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 da461049..dd4f96c0 100644
--- a/docker/services/nova-api.yaml
+++ b/docker/services/nova-api.yaml
@@ -210,3 +210,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
-- 
cgit 1.2.3-korg