diff --git a/docker/services/database/mongodb.yaml b/docker/services/database/mongodb.yaml index b94ecf9072..1e6beef982 100644 --- a/docker/services/database/mongodb.yaml +++ b/docker/services/database/mongodb.yaml @@ -167,10 +167,15 @@ outputs: get_attr: [MongodbPuppetBase, role_data, metadata_settings] upgrade_tasks: - name: Check for mongodb service - stat: path=/usr/lib/systemd/system/mongod.service + command: systemctl is-enabled --quiet mongod tags: common - register: mongod_service + ignore_errors: True + register: mongod_enabled + - name: "PreUpgrade step0,validation: Check if mongod is running" + command: systemctl is-active --quiet mongod + when: mongod_enabled.rc == 0 + tags: step0,validation - name: Stop and disable mongodb service tags: step2 + when: mongod_enabled.rc == 0 service: name=mongod state=stopped enabled=no - when: mongod_service.stat.exists diff --git a/docker/services/database/mysql.yaml b/docker/services/database/mysql.yaml index 7456d03735..525d9d9cf6 100644 --- a/docker/services/database/mysql.yaml +++ b/docker/services/database/mysql.yaml @@ -235,6 +235,16 @@ outputs: /var/log/containers/mysql. ignore_errors: true upgrade_tasks: + - name: Check if mysql service is deployed + command: systemctl is-enabled --quiet mariadb + tags: common + ignore_errors: True + register: mariadb_enabled + - name: "PreUpgrade step0,validation: Check if mysql service is running" + command: systemctl is-active --quiet mariadb + when: mariadb_enabled.rc == 0 + tags: step0,validation - name: Stop and disable mysql service tags: step2 + when: mariadb_enabled.rc == 0 service: name=mariadb state=stopped enabled=no diff --git a/docker/services/iscsid.yaml b/docker/services/iscsid.yaml index befa272e6f..9ab41a60b8 100644 --- a/docker/services/iscsid.yaml +++ b/docker/services/iscsid.yaml @@ -106,19 +106,29 @@ outputs: service: name=iscsid.socket state=stopped enabled=no when: stat_iscsid_socket.stat.exists upgrade_tasks: - - name: stat /lib/systemd/system/iscsid.service - tags: step2 - stat: path=/lib/systemd/system/iscsid.service - register: stat_iscsid_service + - name: Check if iscsid service is deployed + tags: common + ignore_errors: True + command: systemctl is-enabled --quiet iscsid + register: iscsid_enabled + - name: "PreUpgrade step0,validation: Check if iscsid is running" + command: systemctl is-active --quiet iscsid + when: iscsid_enabled.rc == 0 + tags: step0,validation - name: Stop and disable iscsid service tags: step2 + when: iscsid_enabled.rc == 0 service: name=iscsid state=stopped enabled=no - when: (stat_iscsid_service.stat|default('')).exists|default(false) - - name: stat /lib/systemd/system/iscsid.socket - tags: step2 - stat: path=/lib/systemd/system/iscsid.socket - register: stat_iscsid_socket + - name: Check if iscsid.socket service is deployed + tags: common + command: systemctl is-enabled --quiet iscsid.socket + ignore_errors: True + register: iscsid_socket_enabled + - name: "PreUpgrade step0,validation: Check if iscsid.socket is running" + command: systemctl is-active --quiet iscsid.socket + when: iscsid_socket_enabled.rc == 0 + tags: step0,validation - name: Stop and disable iscsid.socket service tags: step2 + when: iscsid_socket_enabled.rc == 0 service: name=iscsid.socket state=stopped enabled=no - when: (stat_iscsid_socket.stat|default('')).exists|default(false) diff --git a/docker/services/sensu-client.yaml b/docker/services/sensu-client.yaml index 873cfa2973..f4ee28299e 100644 --- a/docker/services/sensu-client.yaml +++ b/docker/services/sensu-client.yaml @@ -152,6 +152,16 @@ outputs: /var/log/containers/sensu. ignore_errors: true upgrade_tasks: + - name: Check if sensu client is deployed + command: systemctl is-enabled --quiet sensu-client + tags: common + ignore_errors: True + register: sensu_enabled + - name: "PreUpgrade step0,validation: Check if sensu client is running" + command: systemctl is-active --quiet sensu-client + when: sensu_enabled.rc == 0 + tags: step0,validation - name: Stop and disable sensu-client service tags: step2 - service: name=sensu-client.service state=stopped enabled=no + when: sensu_enabled.rc == 0 + service: name=sensu-client state=stopped enabled=no diff --git a/docker/services/tacker.yaml b/docker/services/tacker.yaml index f9a969d0d9..00e74324cc 100644 --- a/docker/services/tacker.yaml +++ b/docker/services/tacker.yaml @@ -144,6 +144,16 @@ outputs: /var/log/containers/tacker. ignore_errors: true upgrade_tasks: + - name: Check if tacker is deployed + command: systemctl is-enabled --quiet openstack-tacker-server + tags: common + ignore_errors: True + register: tacker_enabled + - name: "PreUpgrade step0,validation: Check if tacker is running" + command: systemctl is-active --quiet openstack-tacker-server + when: tacker_enabled.rc == 0 + tags: step0,validation - name: Stop and disable tacker-server service tags: step2 + when: tacker_enabled.rc == 0 service: name=openstack-tacker-server state=stopped enabled=no diff --git a/docker/services/zaqar.yaml b/docker/services/zaqar.yaml index 6a095b6370..eedabdca90 100644 --- a/docker/services/zaqar.yaml +++ b/docker/services/zaqar.yaml @@ -196,8 +196,23 @@ outputs: /var/log/containers/zaqar and /var/log/containers/httpd/zaqar. ignore_errors: true upgrade_tasks: + - name: Check for zaqar running under apache + tags: common + shell: "httpd -t -D DUMP_VHOSTS | grep -q zaqar_wsgi" + ignore_errors: True + register: httpd_enabled + - name: Check if httpd is running + tags: common + command: systemctl is-active --quiet httpd + ignore_errors: True + register: httpd_running + - name: "PreUpgrade step0,validation: Check if zaqar_wsgi is running" + shell: systemctl status 'httpd' | grep -q zaqar_wsgi + tags: step0,validation + when: httpd_enabled.rc == 0 and httpd_running.rc == 0 - name: Stop and disable zaqar service tags: step2 + when: httpd_enabled.rc == 0 and httpd_running.rc == 0 service: name=httpd state=stopped enabled=no metadata_settings: get_attr: [ZaqarBase, role_data, metadata_settings]