From 4ba1c013a71128243fbf0f928853d74143a317cf Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 27 Apr 2020 21:40:42 -0400 Subject: [PATCH] Re-validate healthcheck work on nova/keystone containers They were disabled until the native podman healthcheck was integrated in tripleo-ansible and it finally merged; so we can remove that safeguard and it should be working. Change-Id: I03361c33e54f0c8e71b420b144464ccb29a1ca4e --- deployment/keystone/keystone-container-puppet.yaml | 1 - deployment/nova/nova-api-container-puppet.yaml | 1 - deployment/nova/nova-compute-container-puppet.yaml | 1 - deployment/nova/nova-conductor-container-puppet.yaml | 1 - deployment/nova/nova-libvirt-container-puppet.yaml | 1 - deployment/nova/nova-metadata-container-puppet.yaml | 1 - deployment/nova/nova-migration-target-container-puppet.yaml | 1 - deployment/nova/nova-scheduler-container-puppet.yaml | 1 - deployment/nova/nova-vnc-proxy-container-puppet.yaml | 1 - 9 files changed, 9 deletions(-) diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml index 5749d0a588..79dfdf9dc8 100644 --- a/deployment/keystone/keystone-container-puppet.yaml +++ b/deployment/keystone/keystone-container-puppet.yaml @@ -753,7 +753,6 @@ outputs: - opendev-validation - opendev-validation-keystone when: - - false - container_cli == 'podman' - not container_healthcheck_disabled - step|int == 4 diff --git a/deployment/nova/nova-api-container-puppet.yaml b/deployment/nova/nova-api-container-puppet.yaml index 4c810afbad..591d57d1c5 100644 --- a/deployment/nova/nova-api-container-puppet.yaml +++ b/deployment/nova/nova-api-container-puppet.yaml @@ -479,7 +479,6 @@ outputs: - opendev-validation - opendev-validation-nova when: - - false - container_cli == 'podman' - not container_healthcheck_disabled - step|int == 4 diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml index 5e172fcd3c..de7415073e 100644 --- a/deployment/nova/nova-compute-container-puppet.yaml +++ b/deployment/nova/nova-compute-container-puppet.yaml @@ -1066,7 +1066,6 @@ outputs: - opendev-validation - opendev-validation-nova when: - - false - container_cli == 'podman' - not container_healthcheck_disabled - step|int == 6 #FIXME: there is no step6 diff --git a/deployment/nova/nova-conductor-container-puppet.yaml b/deployment/nova/nova-conductor-container-puppet.yaml index d85540b225..571be25748 100644 --- a/deployment/nova/nova-conductor-container-puppet.yaml +++ b/deployment/nova/nova-conductor-container-puppet.yaml @@ -190,7 +190,6 @@ outputs: - opendev-validation - opendev-validation-nova when: - - false - container_cli == 'podman' - not container_healthcheck_disabled - step|int == 5 diff --git a/deployment/nova/nova-libvirt-container-puppet.yaml b/deployment/nova/nova-libvirt-container-puppet.yaml index b5e9e1999a..8dd30cd8e1 100644 --- a/deployment/nova/nova-libvirt-container-puppet.yaml +++ b/deployment/nova/nova-libvirt-container-puppet.yaml @@ -806,7 +806,6 @@ outputs: - opendev-validation - opendev-validation-nova when: - - false - container_cli == 'podman' - not container_healthcheck_disabled - step|int == 4 diff --git a/deployment/nova/nova-metadata-container-puppet.yaml b/deployment/nova/nova-metadata-container-puppet.yaml index d48390d45c..c15ac3865d 100644 --- a/deployment/nova/nova-metadata-container-puppet.yaml +++ b/deployment/nova/nova-metadata-container-puppet.yaml @@ -249,7 +249,6 @@ outputs: - opendev-validation - opendev-validation-nova when: - - false - container_cli == 'podman' - not container_healthcheck_disabled - step|int == 5 diff --git a/deployment/nova/nova-migration-target-container-puppet.yaml b/deployment/nova/nova-migration-target-container-puppet.yaml index 5a166fc6ea..dfaf69f9f7 100644 --- a/deployment/nova/nova-migration-target-container-puppet.yaml +++ b/deployment/nova/nova-migration-target-container-puppet.yaml @@ -193,7 +193,6 @@ outputs: - opendev-validation - opendev-validation-nova when: - - false - container_cli == 'podman' - not container_healthcheck_disabled - step|int == 5 diff --git a/deployment/nova/nova-scheduler-container-puppet.yaml b/deployment/nova/nova-scheduler-container-puppet.yaml index e217479421..7d642d1ef9 100644 --- a/deployment/nova/nova-scheduler-container-puppet.yaml +++ b/deployment/nova/nova-scheduler-container-puppet.yaml @@ -220,7 +220,6 @@ outputs: - opendev-validation - opendev-validation-nova when: - - false - container_cli == 'podman' - not container_healthcheck_disabled - step|int == 5 diff --git a/deployment/nova/nova-vnc-proxy-container-puppet.yaml b/deployment/nova/nova-vnc-proxy-container-puppet.yaml index 0c0d038477..12a2469dbc 100644 --- a/deployment/nova/nova-vnc-proxy-container-puppet.yaml +++ b/deployment/nova/nova-vnc-proxy-container-puppet.yaml @@ -312,7 +312,6 @@ outputs: - opendev-validation - opendev-validation-nova when: - - false - container_cli == 'podman' - not container_healthcheck_disabled - step|int == 5