Merge "[Nova] Suspend db purge job until Antelope released"

Author: MOS CI

rockoon/admission/validators/nova.py

@@ -31,6 +31,7 @@ def validate(self, review_request):
         )
         self._check_ephemeral_encryption(nova_section)
         self._check_vcpu_type(nova_section, os_num_version)
+        self._check_db_cleanup(review_request, os_num_version)
 
     def _check_ephemeral_encryption(self, nova_section):
         if (
@@ -57,3 +58,21 @@ def _check_vcpu_type(self, nova_section, os_version):
                     "Multiple vcpu types are supported "
                     "since OpenStack Train release."
                 )
+
+    def _check_db_cleanup(self, review_request, os_version):
+        nova_db_cleanup = (
+            review_request.get("object", {})
+            .get("spec", {})
+            .get("features", {})
+            .get("database", {})
+            .get("cleanup", {})
+            .get("nova", {})
+        )
+        if (
+            nova_db_cleanup.get("enabled")
+            and os_version < constants.OpenStackVersion["antelope"].value
+        ):
+            raise exception.OsDplValidationFailed(
+                "Nova db cleanup is supported "
+                "since OpenStack Antelope release."
+            )

rockoon/admission/validators/schemas/osdpl.yaml

@@ -339,7 +339,7 @@ properties:
                     type: boolean
                     description: |
                       Enable periodic cleanup of database for Nova.
-                      default: true
+                      default: true for Antelope and newer OS releases and false for the rest
                   schedule:
                     type: string
                     description: |

rockoon/templates/preset/compute-tf.yaml

@@ -64,6 +64,13 @@ features:
   neutron:
     backend: tungstenfabric
   database:
+    cleanup:
+      nova:
+{%- if OSVer[openstack_version] >= OSVer.antelope %}
+        enabled: true
+{%- else %}
+        enabled: false
+{%- endif %}
     local_volumes:
       enabled: true
   ssl:

rockoon/templates/preset/compute.yaml

@@ -64,6 +64,13 @@ features:
   neutron:
     backend: ml2
   database:
+    cleanup:
+      nova:
+{%- if OSVer[openstack_version] >= OSVer.antelope %}
+        enabled: true
+{%- else %}
+        enabled: false
+{%- endif %}
     local_volumes:
       enabled: true
   ssl:

rockoon/templates/preset/core.yaml

@@ -56,6 +56,13 @@ features:
   neutron:
     backend: ml2
   database:
+    cleanup:
+      nova:
+{%- if OSVer[openstack_version] >= OSVer.antelope %}
+        enabled: true
+{%- else %}
+        enabled: false
+{%- endif %}
     local_volumes:
       enabled: true
   ssl:

rockoon/templates/services/compute.yaml

@@ -41,7 +41,7 @@
 {%- set signature = spec.get('features', {}).get('glance', {}).get("signature", {"enabled": false}) %}
 
 {%- set ephemeral_encryption = spec.get('features', {}).get('nova', {}).get('images', {}).get("encryption", {}) %}
-{%- set nova_db_cleanup = spec.get('features', {}).get('database', {}).get('cleanup', {}).get('nova', {'enabled': true}) %}
+{%- set nova_db_cleanup = spec.features.database.cleanup.nova %}
 {%- set cadf_audit = spec.get('features', {}).get('logging', {}).get('cadf', {'enabled': false}) %}
 {%- set cadf_audit_driver = spec.get('features', {}).get('logging', {}).get('cadf', {}).get('driver', 'messagingv2') %}
 
@@ -573,10 +573,7 @@ spec:
             jobs:
               - openstack-mariadb-cluster-wait
       manifests:
-{%- if OSVer[spec.openstack_version] >= OSVer.rocky %}
-# Since Rocky, the --purge command argument has been added.
         cron_job_db_purge: true
-{%- endif %}
         network_policy: {{ spec.features.network_policies.enabled }}
         job_rabbit_init: false
         ceph_conf: true

tests/fixtures/render_service_template/input/antelope_ceph_local_non_dvr/context_spec.yaml

@@ -14,6 +14,9 @@ features:
     discovery:
       interval: 900
   database:
+    cleanup:
+      nova:
+        enabled: true
     local_volumes:
       enabled: true
   messaging:

tests/fixtures/render_service_template/input/antelope_ceph_local_non_dvr_keystone_federation/context_spec.yaml

@@ -9,6 +9,9 @@ features:
         use_ssl: false
         vault_url: http://vault.openstack-vault.svc:8200
   database:
+    cleanup:
+      nova:
+        enabled: true
     local_volumes:
       enabled: true
   horizon:

tests/fixtures/render_service_template/input/caracal_ceph_local_non_dvr_manila_cephfs/context_spec.yaml

@@ -14,6 +14,9 @@ features:
     discovery:
       interval: 900
   database:
+    cleanup:
+      nova:
+        enabled: true
     local_volumes:
       enabled: true
   messaging:

tests/fixtures/render_service_template/input/caracal_ceph_local_non_dvr_telemetry/context_spec.yaml

@@ -9,6 +9,9 @@ features:
         use_ssl: false
         vault_url: http://vault.openstack-vault.svc:8200
   database:
+    cleanup:
+      nova:
+        enabled: true
     local_volumes:
       enabled: true
   messaging:

tests/fixtures/render_service_template/input/caracal_ceph_local_ovn_non_dvr/context_spec.yaml

@@ -9,6 +9,9 @@ features:
         use_ssl: false
         vault_url: http://vault.openstack-vault.svc:8200
   database:
+    cleanup:
+      nova:
+        enabled: true
     local_volumes:
       enabled: true
   messaging:

tests/fixtures/render_service_template/input/caracal_ceph_local_ovn_non_dvr_sriov/context_spec.yaml

@@ -20,6 +20,9 @@ features:
         use_ssl: false
         vault_url: http://vault.openstack-vault.svc:8200
   database:
+    cleanup:
+      nova:
+        enabled: true
     local_volumes:
       enabled: true
   messaging:

tests/fixtures/render_service_template/input/queens_ceph_local_non_dvr/context_spec.yaml

@@ -10,6 +10,9 @@ features:
         vault_url: http://vault.openstack-vault.svc:8200
   cinder:
   database:
+    cleanup:
+      nova:
+        enabled: false
     local_volumes:
       enabled: true
   messaging:

tests/fixtures/render_service_template/input/queens_ceph_local_non_dvr_ironic/context_spec.yaml

@@ -9,6 +9,9 @@ features:
         use_ssl: false
         vault_url: http://vault.openstack-vault.svc:8200
   database:
+    cleanup:
+      nova:
+        enabled: false
     local_volumes:
       enabled: true
   messaging:

tests/fixtures/render_service_template/input/ussuri_ceph_ceph_non_dvr_rmq/context_spec.yaml

@@ -9,6 +9,9 @@ features:
         use_ssl: false
         vault_url: http://vault.openstack-vault.svc:8200
   database:
+    cleanup:
+      nova:
+        enabled: false
     local_volumes:
       enabled: true
   messaging:

tests/fixtures/render_service_template/input/ussuri_ceph_local_dvr_onermq/context_spec.yaml

@@ -9,6 +9,9 @@ features:
         use_ssl: false
         vault_url: http://vault.openstack-vault.svc:8200
   database:
+    cleanup:
+      nova:
+        enabled: false
     local_volumes:
       enabled: true
   network_policies:

tests/fixtures/render_service_template/input/ussuri_ceph_local_non_dvr/context_spec.yaml

@@ -9,6 +9,9 @@ features:
         use_ssl: false
         vault_url: http://vault.openstack-vault.svc:8200
   database:
+    cleanup:
+      nova:
+        enabled: false
     local_volumes:
       enabled: true
   messaging:

tests/fixtures/render_service_template/input/ussuri_ceph_local_non_dvr_adv/context_spec.yaml

@@ -9,6 +9,9 @@ features:
         use_ssl: false
         vault_url: http://vault.openstack-vault.svc:8200
   database:
+    cleanup:
+      nova:
+        enabled: false
     local_volumes:
       enabled: true
   messaging:

tests/fixtures/render_service_template/input/ussuri_ceph_local_non_dvr_barbican_integration/context_spec.yaml

@@ -9,6 +9,9 @@ features:
         use_ssl: false
         vault_url: http://vault.openstack-vault.svc:8200
   database:
+    cleanup:
+      nova:
+        enabled: false
     local_volumes:
       enabled: true
   glance:

tests/fixtures/render_service_template/input/ussuri_ceph_local_non_dvr_bgpvpn/context_spec.yaml

@@ -15,6 +15,9 @@ features:
         use_ssl: false
         vault_url: http://vault.openstack-vault.svc:8200
   database:
+    cleanup:
+      nova:
+        enabled: false
     local_volumes:
       enabled: true
   messaging:

tests/fixtures/render_service_template/input/ussuri_ceph_local_non_dvr_bgpvpn_rr/context_spec.yaml

@@ -16,6 +16,9 @@ features:
         vault_url: http://vault.openstack-vault.svc:8200
   cinder:
   database:
+    cleanup:
+      nova:
+        enabled: false
     local_volumes:
       enabled: true
   messaging:

tests/fixtures/render_service_template/input/ussuri_ceph_local_non_dvr_cadf/context_spec.yaml

@@ -14,6 +14,9 @@ features:
     volume:
       backend: ceph
   database:
+    cleanup:
+      nova:
+        enabled: false
     local_volumes:
       enabled: true
   glance:

tests/fixtures/render_service_template/input/ussuri_ceph_local_non_dvr_db_cleanup/context_spec.yaml

@@ -22,7 +22,7 @@ features:
         schedule: "1 2 3 4 5"
         batch: 2
       nova:
-        enabled: true
+        enabled: false
         age: 1
         schedule: "1 2 3 4 5"
         batch: 2

tests/fixtures/render_service_template/input/ussuri_ceph_local_non_dvr_ironic/context_spec.yaml

@@ -9,6 +9,9 @@ features:
         use_ssl: false
         vault_url: http://vault.openstack-vault.svc:8200
   database:
+    cleanup:
+      nova:
+        enabled: false
     local_volumes:
       enabled: true
   messaging:

tests/fixtures/render_service_template/input/ussuri_ceph_local_non_dvr_ironic_mt/context_spec.yaml

@@ -9,6 +9,9 @@ features:
         use_ssl: false
         vault_url: http://vault.openstack-vault.svc:8200
   database:
+    cleanup:
+      nova:
+        enabled: false
     local_volumes:
       enabled: true
   messaging:

tests/fixtures/render_service_template/input/ussuri_ceph_local_non_dvr_ironic_mt_old/context_spec.yaml

@@ -9,6 +9,9 @@ features:
         use_ssl: false
         vault_url: http://vault.openstack-vault.svc:8200
   database:
+    cleanup:
+      nova:
+        enabled: false
     local_volumes:
       enabled: true
   messaging:

tests/fixtures/render_service_template/input/ussuri_ceph_local_non_dvr_keycloak/context_spec.yaml

@@ -9,6 +9,9 @@ features:
         use_ssl: false
         vault_url: http://vault.openstack-vault.svc:8200
   database:
+    cleanup:
+      nova:
+        enabled: false
     local_volumes:
       enabled: true
   messaging:

tests/fixtures/render_service_template/input/ussuri_ceph_local_non_dvr_libvirt_tls/context_spec.yaml

@@ -9,6 +9,9 @@ features:
         use_ssl: false
         vault_url: http://vault.openstack-vault.svc:8200
   database:
+    cleanup:
+      nova:
+        enabled: false
     local_volumes:
       enabled: true
   messaging:

tests/fixtures/render_service_template/input/ussuri_ceph_local_non_dvr_local_proxy/context_spec.yaml

@@ -9,6 +9,9 @@ features:
         use_ssl: false
         vault_url: http://vault.openstack-vault.svc:8200
   database:
+    cleanup:
+      nova:
+        enabled: false
     local_volumes:
       enabled: true
   messaging:

tests/fixtures/render_service_template/input/ussuri_ceph_local_non_dvr_non_sl/context_spec.yaml

@@ -9,6 +9,9 @@ features:
         use_ssl: false
         vault_url: http://vault.openstack-vault.svc:8200
   database:
+    cleanup:
+      nova:
+        enabled: false
     local_volumes:
       enabled: true
   keystone:

tests/fixtures/render_service_template/input/ussuri_ceph_local_non_dvr_novnc/context_spec.yaml

@@ -9,6 +9,9 @@ features:
         use_ssl: false
         vault_url: http://vault.openstack-vault.svc:8200
   database:
+    cleanup:
+      nova:
+        enabled: false
     local_volumes:
       enabled: true
   messaging:

tests/fixtures/render_service_template/input/ussuri_ceph_local_non_dvr_policies/context_spec.yaml

@@ -40,6 +40,9 @@ features:
         use_ssl: false
         vault_url: http://vault.openstack-vault.svc:8200
   database:
+    cleanup:
+      nova:
+        enabled: false
     local_volumes:
       enabled: true
   messaging:

tests/fixtures/render_service_template/input/ussuri_ceph_local_non_dvr_sriov/context_spec.yaml

@@ -20,6 +20,9 @@ features:
         use_ssl: false
         vault_url: http://vault.openstack-vault.svc:8200
   database:
+    cleanup:
+      nova:
+        enabled: false
     local_volumes:
       enabled: true
   messaging:

tests/fixtures/render_service_template/input/ussuri_ceph_local_non_dvr_telemetry/context_spec.yaml

@@ -9,6 +9,9 @@ features:
         use_ssl: false
         vault_url: http://vault.openstack-vault.svc:8200
   database:
+    cleanup:
+      nova:
+        enabled: false
     local_volumes:
       enabled: true
   messaging:

tests/fixtures/render_service_template/input/ussuri_ceph_local_non_dvr_telemetry_rmq/context_spec.yaml

@@ -9,6 +9,9 @@ features:
         use_ssl: false
         vault_url: http://vault.openstack-vault.svc:8200
   database:
+    cleanup:
+      nova:
+        enabled: false
     local_volumes:
       enabled: true
   messaging:

tests/fixtures/render_service_template/input/ussuri_ceph_local_tf/context_spec.yaml

@@ -10,6 +10,9 @@ features:
         use_ssl: false
         vault_url: http://vault.openstack-vault.svc:8200
   database:
+    cleanup:
+      nova:
+        enabled: false
     local_volumes:
       enabled: true
   messaging: