diff --git a/tests/kuttl/common/osp_check_noapi_service_cert.sh b/tests/kuttl/common/osp_check_noapi_service_cert.sh new file mode 100755 index 000000000..caa39557b --- /dev/null +++ b/tests/kuttl/common/osp_check_noapi_service_cert.sh @@ -0,0 +1,51 @@ +#!/bin/bash + +declare -a services=( + # Format: ("" "" "" "") + "cert-ceilometer-internal-svc service=ceilometer proxy-httpd /etc/pki/tls/certs/tls.crt" + "cert-galera-openstack-cell1-svc service=openstack-cell1-galera galera /etc/pki/tls/certs/galera.crt" + "cert-galera-openstack-svc service=openstack-galera galera /etc/pki/tls/certs/galera.crt" + "cert-memcached-svc service=memcached memcached /etc/pki/tls/certs/memcached.crt" + "cert-neutron-ovndbs service=neutron neutron-api /etc/pki/tls/certs/ovndb.crt" + "cert-nova-novncproxy-cell1-vencrypt service=nova-novncproxy nova-cell1-novncproxy-novncproxy /etc/pki/tls/certs/vencrypt.crt" + "cert-ovndbcluster-nb-ovndbs service=ovsdbserver-nb ovsdbserver-nb /etc/pki/tls/certs/ovndb.crt" + "cert-ovndbcluster-sb-ovndbs service=ovsdbserver-sb ovsdbserver-sb /etc/pki/tls/certs/ovndb.crt" + "cert-ovnnorthd-ovndbs service=ovn-northd ovn-northd /etc/pki/tls/certs/ovndb.crt" + "cert-rabbitmq-cell1-svc app.kubernetes.io/name=rabbitmq-cell1 rabbitmq /etc/rabbitmq-tls/tls.crt" + "cert-rabbitmq-svc app.kubernetes.io/name=rabbitmq rabbitmq /etc/rabbitmq-tls/tls.crt" +) + +for service in "${services[@]}"; do + IFS=" " read -r secret label_selector container volume_mount <<< "$service" + + # Retrieve the pod name dynamically using the label selector + pod=$(oc get pods -l "$label_selector" -o jsonpath="{.items[0].metadata.name}" 2>&1) + + if [[ "$?" -ne 0 || -z "$pod" ]]; then + echo "Error retrieving pod name for secret $secret with label selector $label_selector." + echo "Error message: $pod" + continue + fi + + # Fetch the certificate from the pod and compare with the secret + pod_cert=$(oc exec "$pod" --container="$container" -- cat "$volume_mount" 2>&1) + if [[ "$?" -ne 0 ]]; then + echo "Error reading certificate from pod $pod, container $container, path $volume_mount." + echo "Error message: $pod_cert" + continue + fi + + secret_cert=$(oc get secret "$secret" -o jsonpath="{.data['tls\.crt']}" | base64 --decode 2>&1) + if [[ "$?" -ne 0 ]]; then + echo "Error retrieving secret $secret." + echo "Error message: $secret_cert" + continue + fi + + # Compare the certificates + if [[ "$pod_cert" == "$secret_cert" ]]; then + echo "Certificates for $pod and $secret match." + else + echo "Certificates for $pod and $secret DO NOT match." + fi +done diff --git a/tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/01-create-nic-mappings.yaml b/tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/01-create-nic-mappings.yaml deleted file mode 100644 index aef2ee26f..000000000 --- a/tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/01-create-nic-mappings.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: | - oc apply -n $NAMESPACE -f ../../../../config/samples/nad_datacentre.yaml diff --git a/tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/02-assert-deploy-openstack.yaml b/tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/02-assert-deploy-openstack.yaml deleted file mode 120000 index 762a8cf31..000000000 --- a/tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/02-assert-deploy-openstack.yaml +++ /dev/null @@ -1 +0,0 @@ -../../common/assert-sample-deployment.yaml \ No newline at end of file diff --git a/tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/02-deploy-openstack.yaml b/tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/02-deploy-openstack.yaml deleted file mode 100644 index 6c9d0887d..000000000 --- a/tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/02-deploy-openstack.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: | - oc kustomize ../../../../config/samples/base/openstackcontrolplane | oc apply -n $NAMESPACE -f - diff --git a/tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/03-add-ovn-nic-mappings.yaml b/tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/03-add-ovn-nic-mappings.yaml deleted file mode 100644 index ae2e618e9..000000000 --- a/tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/03-add-ovn-nic-mappings.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -timeout: 60 -commands: - - script: | - oc patch openstackcontrolplane -n $NAMESPACE openstack --type='json' -p='[{ - "op": "replace", - "path": "/spec/ovn/template/ovnController/nicMappings", - "value":{"datacentre":"ospbr"} - }]' diff --git a/tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/03-assert.yaml b/tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/03-assert.yaml deleted file mode 100644 index b15044e0f..000000000 --- a/tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/03-assert.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - labels: - service: ovn-controller -status: - phase: Running ---- -apiVersion: v1 -kind: Pod -metadata: - labels: - service: ovn-controller-ovs -status: - phase: Running diff --git a/tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/04-assert.yaml b/tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/04-assert.yaml deleted file mode 100644 index 93835505e..000000000 --- a/tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/04-assert.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 300 -commands: - - script: | - ovs_controller_pod_count=$(oc get pod -n $NAMESPACE -l service=ovn-controller-ovs --no-headers=true --ignore-not-found=true | wc -l) - ovn_controller_pod_count=$(oc get pod -n $NAMESPACE -l service=ovn-controller --no-headers=true --ignore-not-found=true | wc -l) - if [ $ovs_controller_pod_count -eq 0 ] && [ $ovn_controller_pod_count -eq 0 ]; then - exit 0 - fi - exit 1 diff --git a/tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/04-remove-ovn-nic-mappings.yaml b/tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/04-remove-ovn-nic-mappings.yaml deleted file mode 100644 index 49882f502..000000000 --- a/tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/04-remove-ovn-nic-mappings.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -timeout: 60 -commands: - - script: | - oc patch OpenStackControlPlane -n $NAMESPACE openstack --type='json' -p='[{ - "op": "remove", - "path": "/spec/ovn/template/ovnController/nicMappings", - }]' diff --git a/tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/05-cleanup.yaml b/tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/05-cleanup.yaml deleted file mode 100644 index 6b4992512..000000000 --- a/tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/05-cleanup.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: core.openstack.org/v1beta1 - kind: OpenStackControlPlane - name: openstack -commands: -- script: | - oc delete --ignore-not-found=true -n $NAMESPACE pvc \ - srv-swift-storage-0 - oc delete secret --ignore-not-found=true combined-ca-bundle -n $NAMESPACE - oc delete secret -l service-cert -n $NAMESPACE - oc delete secret -l ca-cert -n $NAMESPACE diff --git a/tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/05-errors-cleanup.yaml b/tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/05-errors-cleanup.yaml deleted file mode 100644 index 8b9f6e6f9..000000000 --- a/tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/05-errors-cleanup.yaml +++ /dev/null @@ -1,334 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - labels: - app: mariadb - cr: mariadb-openstack - owner: mariadb-operator - name: mariadb-openstack ---- -apiVersion: mariadb.openstack.org/v1beta1 -kind: Galera -metadata: - name: openstack ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: openstack-galera ---- -apiVersion: v1 -kind: Pod -metadata: - name: openstack-galera-0 ---- -apiVersion: v1 -kind: Pod -metadata: - name: openstack-galera-1 ---- -apiVersion: v1 -kind: Pod -metadata: - name: openstack-galera-2 ---- -apiVersion: v1 -kind: Service -metadata: - name: openstack-galera ---- -apiVersion: v1 -kind: Endpoints -metadata: - name: openstack-galera ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: openstack-config-data ---- -apiVersion: ovn.openstack.org/v1beta1 -kind: OVNNorthd -metadata: - finalizers: - - openstack.org/ovnnorthd - name: ovnnorthd-sample ---- -apiVersion: ovn.openstack.org/v1beta1 -kind: OVNDBCluster -metadata: - finalizers: - - openstack.org/ovndbcluster - name: ovndbcluster-nb-sample ---- -apiVersion: ovn.openstack.org/v1beta1 -kind: OVNDBCluster -metadata: - finalizers: - - openstack.org/ovndbcluster - name: ovndbcluster-sb-sample ---- -apiVersion: ovn.openstack.org/v1beta1 -kind: OVNController -metadata: - finalizers: - - openstack.org/ovncontroller - name: ovncontroller-sample ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: ovn-northd ---- -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: ovncontroller ---- -apiVersion: v1 -kind: Pod -metadata: - labels: - service: ovn-northd ---- -apiVersion: v1 -kind: Pod -metadata: - labels: - service: ovsdbserver-nb - name: ovsdbserver-nb-0 ---- -apiVersion: v1 -kind: Pod -metadata: - labels: - service: ovsdbserver-sb - name: ovsdbserver-sb-0 ---- -apiVersion: v1 -kind: Pod -metadata: - annotations: - openshift.io/scc: privileged - generateName: ovn-controller- - labels: - service: ovn-controller ---- -apiVersion: v1 -kind: Service -metadata: - labels: - service: ovsdbserver-nb - name: ovsdbserver-nb ---- -apiVersion: v1 -kind: Service -metadata: - labels: - service: ovsdbserver-nb - statefulset.kubernetes.io/pod-name: ovsdbserver-nb-0 - name: ovsdbserver-nb-0 ---- -apiVersion: v1 -kind: Service -metadata: - labels: - service: ovsdbserver-sb - name: ovsdbserver-sb ---- -apiVersion: v1 -kind: Service -metadata: - labels: - service: ovsdbserver-sb - statefulset.kubernetes.io/pod-name: ovsdbserver-sb-0 - name: ovsdbserver-sb-0 ---- -apiVersion: v1 -kind: Pod -metadata: - name: nova-api-0 ---- -apiVersion: v1 -kind: Pod -metadata: - name: nova-cell1-novncproxy-0 ---- -apiVersion: v1 -kind: Pod -metadata: - name: nova-metadata-0 ---- -apiVersion: v1 -kind: Pod -metadata: - labels: - app.kubernetes.io/name: SwiftProxy ---- -apiVersion: v1 -kind: Pod -metadata: - name: swift-storage-0 ---- -apiVersion: v1 -kind: Pod -metadata: - annotations: - openshift.io/scc: anyuid - labels: - service: neutron ---- -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: cinder-public ---- -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: glance-public ---- -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: barbican-public ---- -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: keystone-public ---- -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: neutron-public ---- -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: nova-public ---- -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: nova-novncproxy-cell1-public ---- -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: placement-public ---- -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: swift-public ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: barbican-public-route ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: cinder-public-route ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: barbican-public-svc ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: cinder-public-svc ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: glance-default-public-route ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: glance-default-public-svc ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: keystone-public-route ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: keystone-public-svc ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: neutron-public-route ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: neutron-public-svc ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: nova-public-route ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: nova-public-svc ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: nova-novncproxy-cell1-public-route ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: nova-novncproxy-cell1-public-svc ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: placement-public-route ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: placement-public-svc ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: swift-public-route ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: swift-public-svc ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: rootca-internal ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: rootca-libvirt ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: rootca-ovn ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: rootca-public diff --git a/tests/kuttl/tests/ctlplane-basic-deployment/01-assert-deploy-openstack.yaml b/tests/kuttl/tests/ctlplane-basic-deployment/01-assert-deploy-openstack.yaml deleted file mode 120000 index 762a8cf31..000000000 --- a/tests/kuttl/tests/ctlplane-basic-deployment/01-assert-deploy-openstack.yaml +++ /dev/null @@ -1 +0,0 @@ -../../common/assert-sample-deployment.yaml \ No newline at end of file diff --git a/tests/kuttl/tests/ctlplane-basic-deployment/01-deploy-openstack.yaml b/tests/kuttl/tests/ctlplane-basic-deployment/01-deploy-openstack.yaml deleted file mode 100644 index 6c9d0887d..000000000 --- a/tests/kuttl/tests/ctlplane-basic-deployment/01-deploy-openstack.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: | - oc kustomize ../../../../config/samples/base/openstackcontrolplane | oc apply -n $NAMESPACE -f - diff --git a/tests/kuttl/tests/ctlplane-basic-deployment/02-assert-custom-cacert-secret.yaml b/tests/kuttl/tests/ctlplane-basic-deployment/02-assert-custom-cacert-secret.yaml deleted file mode 100644 index 2d2b2c4df..000000000 --- a/tests/kuttl/tests/ctlplane-basic-deployment/02-assert-custom-cacert-secret.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: ca-custom-kuttl diff --git a/tests/kuttl/tests/ctlplane-basic-deployment/02-deploy-custom-cacert-secret.yaml b/tests/kuttl/tests/ctlplane-basic-deployment/02-deploy-custom-cacert-secret.yaml deleted file mode 100644 index 586b50326..000000000 --- a/tests/kuttl/tests/ctlplane-basic-deployment/02-deploy-custom-cacert-secret.yaml +++ /dev/null @@ -1,6 +0,0 @@ -# Deploys the custom CA to be added to the combined-ca-bundle by operator -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: | - oc apply -n $NAMESPACE -f ../../common/custom-ca.yaml diff --git a/tests/kuttl/tests/ctlplane-basic-deployment/03-assert-deploy-custom-cacert.yaml b/tests/kuttl/tests/ctlplane-basic-deployment/03-assert-deploy-custom-cacert.yaml deleted file mode 100644 index 7e938bf0a..000000000 --- a/tests/kuttl/tests/ctlplane-basic-deployment/03-assert-deploy-custom-cacert.yaml +++ /dev/null @@ -1,113 +0,0 @@ -apiVersion: core.openstack.org/v1beta1 -kind: OpenStackControlPlane -metadata: - name: openstack -spec: - tls: - caBundleSecretName: ca-custom-kuttl -status: - conditions: - - message: Setup complete - reason: Ready - status: "True" - type: Ready - - message: OpenStackControlPlane Barbican completed - reason: Ready - status: "True" - type: OpenStackControlPlaneBarbicanReady - - message: OpenStackControlPlane CAs completed - reason: Ready - status: "True" - type: OpenStackControlPlaneCAReadyCondition - - message: OpenStackControlPlane Cinder completed - reason: Ready - status: "True" - type: OpenStackControlPlaneCinderReady - - message: OpenStackControlPlane Client completed - reason: Ready - status: "True" - type: OpenStackControlPlaneClientReady - - message: OpenStackControlPlane barbican service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeBarbicanReady - - message: OpenStackControlPlane cinder service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeCinderReady - - message: OpenStackControlPlane glance service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeGlanceReady - - message: OpenStackControlPlane keystone service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeKeystoneAPIReady - - message: OpenStackControlPlane neutron service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeNeutronReady - - message: OpenStackControlPlane nova service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeNovaReady - - message: OpenStackControlPlane placement service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposePlacementAPIReady - - message: OpenStackControlPlane swift service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeSwiftReady - - message: OpenStackControlPlane Glance completed - reason: Ready - status: "True" - type: OpenStackControlPlaneGlanceReady - - message: OpenStackControlPlane InstanceHa CM is available - reason: Ready - status: "True" - type: OpenStackControlPlaneInstanceHaCMReadyCondition - - message: OpenStackControlPlane KeystoneAPI completed - reason: Ready - status: "True" - type: OpenStackControlPlaneKeystoneAPIReady - - message: OpenStackControlPlane MariaDB completed - reason: Ready - status: "True" - type: OpenStackControlPlaneMariaDBReady - - message: OpenStackControlPlane Memcached completed - reason: Ready - status: "True" - type: OpenStackControlPlaneMemcachedReady - - message: OpenStackControlPlane Neutron completed - reason: Ready - status: "True" - type: OpenStackControlPlaneNeutronReady - - message: OpenStackControlPlane Nova completed - reason: Ready - status: "True" - type: OpenStackControlPlaneNovaReady - - message: OpenStackControlPlane OVN completed - reason: Ready - status: "True" - type: OpenStackControlPlaneOVNReady - - message: OpenStackControlPlane PlacementAPI completed - reason: Ready - status: "True" - type: OpenStackControlPlanePlacementAPIReady - - message: OpenStackControlPlane RabbitMQ completed - reason: Ready - status: "True" - type: OpenStackControlPlaneRabbitMQReady - - message: OpenStackControlPlane Swift completed - reason: Ready - status: "True" - type: OpenStackControlPlaneSwiftReady - - message: OpenStackControlPlane Telemetry completed - reason: Ready - status: "True" - type: OpenStackControlPlaneTelemetryReady - - message: OpenStackControlPlane Test Operator CM is available - reason: Ready - status: "True" - type: OpenStackControlPlaneTestCMReadyCondition diff --git a/tests/kuttl/tests/ctlplane-basic-deployment/03-deploy-custom-cacert.yaml b/tests/kuttl/tests/ctlplane-basic-deployment/03-deploy-custom-cacert.yaml deleted file mode 100644 index 70b04687d..000000000 --- a/tests/kuttl/tests/ctlplane-basic-deployment/03-deploy-custom-cacert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -# Deploys the custom CA to be added to the combined-ca-bundle by operator -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: | - oc kustomize ../../../../config/samples/tls/custom_ca | oc apply -n $NAMESPACE -f - diff --git a/tests/kuttl/tests/ctlplane-basic-deployment/04-assert-custom-cacert.yaml b/tests/kuttl/tests/ctlplane-basic-deployment/04-assert-custom-cacert.yaml deleted file mode 100644 index f935d7db6..000000000 --- a/tests/kuttl/tests/ctlplane-basic-deployment/04-assert-custom-cacert.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# Checks the presence of the ca-custom-kuttl cert data in the combined-ca-bundle secret -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -commands: - - script: | - echo "Checking ca-custom-kuttl.pem is present in combined-ca-bundle..." - CUSTOM_CERT_CONTENT=$(oc get secret ca-custom-kuttl -n $NAMESPACE -o jsonpath="{.data['ca-custom-kuttl\.pem']}" | base64 --decode | tr -d '\n') - TLS_BUNDLE_CONTENT=$(oc get secret combined-ca-bundle -n $NAMESPACE -o jsonpath="{.data['tls-ca-bundle\.pem']}" | base64 --decode | tr -d '\n') - if [[ "$TLS_BUNDLE_CONTENT" == *"$CUSTOM_CERT_CONTENT"* ]]; then - echo "OK" - exit 0 - else - echo "Not present" - exit 1 - fi diff --git a/tests/kuttl/tests/ctlplane-basic-deployment/05-cleanup.yaml b/tests/kuttl/tests/ctlplane-basic-deployment/05-cleanup.yaml deleted file mode 100644 index 6b4992512..000000000 --- a/tests/kuttl/tests/ctlplane-basic-deployment/05-cleanup.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: core.openstack.org/v1beta1 - kind: OpenStackControlPlane - name: openstack -commands: -- script: | - oc delete --ignore-not-found=true -n $NAMESPACE pvc \ - srv-swift-storage-0 - oc delete secret --ignore-not-found=true combined-ca-bundle -n $NAMESPACE - oc delete secret -l service-cert -n $NAMESPACE - oc delete secret -l ca-cert -n $NAMESPACE diff --git a/tests/kuttl/tests/ctlplane-basic-deployment/05-errors-cleanup.yaml b/tests/kuttl/tests/ctlplane-basic-deployment/05-errors-cleanup.yaml deleted file mode 120000 index 4d7b8362e..000000000 --- a/tests/kuttl/tests/ctlplane-basic-deployment/05-errors-cleanup.yaml +++ /dev/null @@ -1 +0,0 @@ -../../common/errors_cleanup_openstack.yaml \ No newline at end of file diff --git a/tests/kuttl/tests/ctlplane-collapsed/01-assert-collapsed-cell.yaml b/tests/kuttl/tests/ctlplane-collapsed/01-assert-collapsed-cell.yaml deleted file mode 100644 index 93d81af55..000000000 --- a/tests/kuttl/tests/ctlplane-collapsed/01-assert-collapsed-cell.yaml +++ /dev/null @@ -1,249 +0,0 @@ -apiVersion: core.openstack.org/v1beta1 -kind: OpenStackControlPlane -metadata: - name: openstack-collapsed-cell -spec: - secret: osp-secret - keystone: - template: - databaseInstance: openstack - secret: osp-secret - galera: - templates: - openstack: - storageRequest: 500M - rabbitmq: - templates: - rabbitmq: - replicas: 1 - memcached: - templates: - memcached: - replicas: 1 - placement: - template: - databaseInstance: openstack - secret: osp-secret - glance: - template: - databaseInstance: openstack - glanceAPIs: - default: - replicas: 1 - storage: - storageRequest: 10G - cinder: - template: - databaseInstance: openstack - secret: osp-secret - cinderAPI: - replicas: 1 - cinderScheduler: - replicas: 1 - cinderBackup: - replicas: 0 # backend needs to be configured - cinderVolumes: - volume1: - replicas: 0 # backend needs to be configured - ovn: - template: - ovnDBCluster: - ovndbcluster-nb: - replicas: 1 - dbType: NB - storageRequest: 10G - ovndbcluster-sb: - replicas: 1 - dbType: SB - storageRequest: 10G - ovnNorthd: - replicas: 1 - ovnController: - external-ids: - system-id: "random" - ovn-bridge: "br-int" - ovn-encap-type: "geneve" - neutron: - template: - databaseInstance: openstack - secret: osp-secret - nova: - template: - secret: osp-secret - # This creates a collapsed cell deployment same as what OSP17 does by - # default. The conductor in cell1 acts as both the cell conductor and the - # super conductor hence cell0 conductor is disabled. Also in this - # deployment both the top level services and cell1 service will share the - # same message bus and database service instance so there is no cell - # separation implemented. - cellTemplates: - cell0: - cellDatabaseAccount: nova-cell0 - conductorServiceTemplate: - replicas: 0 - hasAPIAccess: true - cell1: - cellDatabaseAccount: nova-cell1 - cellDatabaseInstance: openstack - cellMessageBusInstance: rabbitmq - conductorServiceTemplate: - replicas: 1 - hasAPIAccess: true - ironic: - template: - databaseInstance: openstack - ironicAPI: - replicas: 1 - ironicConductors: - - replicas: 1 - storageRequest: 10G - ironicInspector: - replicas: 1 - ironicNeutronAgent: - replicas: 1 - secret: osp-secret - telemetry: - enabled: true - template: - autoscaling: - aodh: - secret: osp-secret - serviceUser: aodh - ceilometer: - passwordSelector: - ceilometerService: CeilometerPassword - secret: osp-secret - serviceUser: ceilometer - barbican: - enabled: true - template: - databaseInstance: openstack - secret: osp-secret - barbicanAPI: - replicas: 1 - barbicanWorker: - replicas: 1 - barbicanKeystoneListener: - replicas: 1 - tls: - ingress: - ca: - duration: 87600h0m0s - cert: - duration: 43800h0m0s - enabled: true - podLevel: - enabled: true - internal: - ca: - duration: 87600h0m0s - cert: - duration: 43800h0m0s - libvirt: - ca: - duration: 87600h0m0s - cert: - duration: 43800h0m0s - ovn: - ca: - duration: 87600h0m0s - cert: - duration: 43800h0m0s -status: - conditions: - - message: Setup complete - reason: Ready - status: "True" - type: Ready - - message: OpenStackControlPlane Barbican completed - reason: Ready - status: "True" - type: OpenStackControlPlaneBarbicanReady - - message: OpenStackControlPlane CAs completed - reason: Ready - status: "True" - type: OpenStackControlPlaneCAReadyCondition - - message: OpenStackControlPlane Cinder completed - reason: Ready - status: "True" - type: OpenStackControlPlaneCinderReady - - message: OpenStackControlPlane Client completed - reason: Ready - status: "True" - type: OpenStackControlPlaneClientReady - - message: OpenStackControlPlane barbican service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeBarbicanReady - - message: OpenStackControlPlane cinder service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeCinderReady - - message: OpenStackControlPlane glance service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeGlanceReady - - message: OpenStackControlPlane keystone service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeKeystoneAPIReady - - message: OpenStackControlPlane neutron service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeNeutronReady - - message: OpenStackControlPlane nova service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeNovaReady - - message: OpenStackControlPlane placement service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposePlacementAPIReady - - message: OpenStackControlPlane Glance completed - reason: Ready - status: "True" - type: OpenStackControlPlaneGlanceReady - - message: OpenStackControlPlane InstanceHa CM is available - reason: Ready - status: "True" - type: OpenStackControlPlaneInstanceHaCMReadyCondition - - message: OpenStackControlPlane KeystoneAPI completed - reason: Ready - status: "True" - type: OpenStackControlPlaneKeystoneAPIReady - - message: OpenStackControlPlane MariaDB completed - reason: Ready - status: "True" - type: OpenStackControlPlaneMariaDBReady - - message: OpenStackControlPlane Memcached completed - reason: Ready - status: "True" - type: OpenStackControlPlaneMemcachedReady - - message: OpenStackControlPlane Neutron completed - reason: Ready - status: "True" - type: OpenStackControlPlaneNeutronReady - - message: OpenStackControlPlane Nova completed - reason: Ready - status: "True" - type: OpenStackControlPlaneNovaReady - - message: OpenStackControlPlane OVN completed - reason: Ready - status: "True" - type: OpenStackControlPlaneOVNReady - - message: OpenStackControlPlane PlacementAPI completed - reason: Ready - status: "True" - type: OpenStackControlPlanePlacementAPIReady - - message: OpenStackControlPlane RabbitMQ completed - reason: Ready - status: "True" - type: OpenStackControlPlaneRabbitMQReady - - message: OpenStackControlPlane Telemetry completed - reason: Ready - status: "True" - type: OpenStackControlPlaneTelemetryReady - - message: OpenStackControlPlane Test Operator CM is available - reason: Ready - status: "True" - type: OpenStackControlPlaneTestCMReadyCondition diff --git a/tests/kuttl/tests/ctlplane-collapsed/01-deploy-openstack-collapsed-cell.yaml b/tests/kuttl/tests/ctlplane-collapsed/01-deploy-openstack-collapsed-cell.yaml deleted file mode 100644 index 9f9434cb8..000000000 --- a/tests/kuttl/tests/ctlplane-collapsed/01-deploy-openstack-collapsed-cell.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: | - oc apply -n $NAMESPACE -f ../../../../config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml diff --git a/tests/kuttl/tests/ctlplane-collapsed/02-cleanup.yaml b/tests/kuttl/tests/ctlplane-collapsed/02-cleanup.yaml deleted file mode 100644 index 0f45e50bc..000000000 --- a/tests/kuttl/tests/ctlplane-collapsed/02-cleanup.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: core.openstack.org/v1beta1 - kind: OpenStackControlPlane - name: openstack-collapsed-cell -commands: -- script: | - oc delete secret --ignore-not-found=true combined-ca-bundle -n $NAMESPACE - oc delete secret -l service-cert -n $NAMESPACE - oc delete secret -l ca-cert -n $NAMESPACE diff --git a/tests/kuttl/tests/ctlplane-collapsed/02-errors-cleanup.yaml b/tests/kuttl/tests/ctlplane-collapsed/02-errors-cleanup.yaml deleted file mode 120000 index 4d7b8362e..000000000 --- a/tests/kuttl/tests/ctlplane-collapsed/02-errors-cleanup.yaml +++ /dev/null @@ -1 +0,0 @@ -../../common/errors_cleanup_openstack.yaml \ No newline at end of file diff --git a/tests/kuttl/tests/ctlplane-galera-3replicas/01-assert-galera-3replicas.yaml b/tests/kuttl/tests/ctlplane-galera-3replicas/01-assert-galera-3replicas.yaml deleted file mode 100644 index dc4d6d776..000000000 --- a/tests/kuttl/tests/ctlplane-galera-3replicas/01-assert-galera-3replicas.yaml +++ /dev/null @@ -1,252 +0,0 @@ -apiVersion: core.openstack.org/v1beta1 -kind: OpenStackControlPlane -metadata: - name: openstack-galera-3replicas -spec: - secret: osp-secret - keystone: - template: - databaseInstance: openstack - secret: osp-secret - galera: - enabled: true - templates: - openstack: - storageRequest: 500M - secret: osp-secret - replicas: 3 - openstack-cell1: - storageRequest: 500M - secret: osp-secret - replicas: 3 - rabbitmq: - templates: - rabbitmq: - replicas: 3 - rabbitmq-cell1: - replicas: 3 - memcached: - templates: - memcached: - replicas: 1 - placement: - template: - databaseInstance: openstack - secret: osp-secret - glance: - template: - databaseInstance: openstack - glanceAPIs: - default: - replicas: 1 - storage: - storageRequest: 10G - cinder: - template: - databaseInstance: openstack - secret: osp-secret - cinderAPI: - replicas: 1 - cinderScheduler: - replicas: 1 - cinderBackup: - replicas: 0 # backend needs to be configured - cinderVolumes: - volume1: - replicas: 0 # backend needs to be configured - barbican: - enabled: true - template: - databaseInstance: openstack - secret: osp-secret - barbicanAPI: - replicas: 1 - barbicanWorker: - replicas: 1 - barbicanKeystoneListener: - replicas: 1 - manila: - template: - manilaAPI: - replicas: 1 - manilaScheduler: - replicas: 1 - manilaShares: - share1: - replicas: 1 - ovn: - template: - ovnDBCluster: - ovndbcluster-nb: - replicas: 1 - dbType: NB - storageRequest: 10G - ovndbcluster-sb: - replicas: 1 - dbType: SB - storageRequest: 10G - ovnNorthd: - replicas: 1 - ovnController: - external-ids: - system-id: "random" - ovn-bridge: "br-int" - ovn-encap-type: "geneve" - neutron: - template: - databaseInstance: openstack - secret: osp-secret - horizon: - template: - replicas: 1 - secret: osp-secret - nova: - template: - secret: osp-secret - ironic: - template: - databaseInstance: openstack - ironicAPI: - replicas: 1 - ironicConductors: - - replicas: 1 - storageRequest: 10G - ironicInspector: - replicas: 1 - ironicNeutronAgent: - replicas: 1 - secret: osp-secret - telemetry: - enabled: true - template: - autoscaling: - aodh: - secret: osp-secret - serviceUser: aodh - ceilometer: - passwordSelector: - ceilometerService: CeilometerPassword - secret: osp-secret - serviceUser: ceilometer - tls: - ingress: - ca: - duration: 87600h0m0s - cert: - duration: 43800h0m0s - enabled: true - podLevel: - enabled: true - internal: - ca: - duration: 87600h0m0s - cert: - duration: 43800h0m0s - libvirt: - ca: - duration: 87600h0m0s - cert: - duration: 43800h0m0s - ovn: - ca: - duration: 87600h0m0s - cert: - duration: 43800h0m0s -status: - conditions: - - message: Setup complete - reason: Ready - status: "True" - type: Ready - - message: OpenStackControlPlane Barbican completed - reason: Ready - status: "True" - type: OpenStackControlPlaneBarbicanReady - - message: OpenStackControlPlane CAs completed - reason: Ready - status: "True" - type: OpenStackControlPlaneCAReadyCondition - - message: OpenStackControlPlane Cinder completed - reason: Ready - status: "True" - type: OpenStackControlPlaneCinderReady - - message: OpenStackControlPlane Client completed - reason: Ready - status: "True" - type: OpenStackControlPlaneClientReady - - message: OpenStackControlPlane barbican service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeBarbicanReady - - message: OpenStackControlPlane cinder service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeCinderReady - - message: OpenStackControlPlane glance service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeGlanceReady - - message: OpenStackControlPlane keystone service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeKeystoneAPIReady - - message: OpenStackControlPlane neutron service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeNeutronReady - - message: OpenStackControlPlane nova service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeNovaReady - - message: OpenStackControlPlane placement service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposePlacementAPIReady - - message: OpenStackControlPlane Glance completed - reason: Ready - status: "True" - type: OpenStackControlPlaneGlanceReady - - message: OpenStackControlPlane InstanceHa CM is available - reason: Ready - status: "True" - type: OpenStackControlPlaneInstanceHaCMReadyCondition - - message: OpenStackControlPlane KeystoneAPI completed - reason: Ready - status: "True" - type: OpenStackControlPlaneKeystoneAPIReady - - message: OpenStackControlPlane MariaDB completed - reason: Ready - status: "True" - type: OpenStackControlPlaneMariaDBReady - - message: OpenStackControlPlane Memcached completed - reason: Ready - status: "True" - type: OpenStackControlPlaneMemcachedReady - - message: OpenStackControlPlane Neutron completed - reason: Ready - status: "True" - type: OpenStackControlPlaneNeutronReady - - message: OpenStackControlPlane Nova completed - reason: Ready - status: "True" - type: OpenStackControlPlaneNovaReady - - message: OpenStackControlPlane OVN completed - reason: Ready - status: "True" - type: OpenStackControlPlaneOVNReady - - message: OpenStackControlPlane PlacementAPI completed - reason: Ready - status: "True" - type: OpenStackControlPlanePlacementAPIReady - - message: OpenStackControlPlane RabbitMQ completed - reason: Ready - status: "True" - type: OpenStackControlPlaneRabbitMQReady - - message: OpenStackControlPlane Telemetry completed - reason: Ready - status: "True" - type: OpenStackControlPlaneTelemetryReady - - message: OpenStackControlPlane Test Operator CM is available - reason: Ready - status: "True" - type: OpenStackControlPlaneTestCMReadyCondition diff --git a/tests/kuttl/tests/ctlplane-galera-3replicas/01-deploy-galera-3replicas.yaml b/tests/kuttl/tests/ctlplane-galera-3replicas/01-deploy-galera-3replicas.yaml deleted file mode 100644 index 8cd3c29b8..000000000 --- a/tests/kuttl/tests/ctlplane-galera-3replicas/01-deploy-galera-3replicas.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: | - oc apply -n $NAMESPACE -f ../../../../config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml diff --git a/tests/kuttl/tests/ctlplane-galera-3replicas/02-cleanup.yaml b/tests/kuttl/tests/ctlplane-galera-3replicas/02-cleanup.yaml deleted file mode 100644 index 22507881a..000000000 --- a/tests/kuttl/tests/ctlplane-galera-3replicas/02-cleanup.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: core.openstack.org/v1beta1 - kind: OpenStackControlPlane - name: openstack-galera-3replicas -commands: -- script: | - oc delete --ignore-not-found=true -n $NAMESPACE pvc \ - mysql-db-openstack-galera-0 \ - mysql-db-openstack-galera-1 \ - mysql-db-openstack-galera-2 \ - mysql-db-openstack-cell1-galera-0 \ - mysql-db-openstack-cell1-galera-1 \ - mysql-db-openstack-cell1-galera-2 - oc delete secret --ignore-not-found=true combined-ca-bundle -n $NAMESPACE - oc delete secret -l service-cert -n $NAMESPACE - oc delete secret -l ca-cert -n $NAMESPACE diff --git a/tests/kuttl/tests/ctlplane-galera-3replicas/02-errors-cleanup.yaml b/tests/kuttl/tests/ctlplane-galera-3replicas/02-errors-cleanup.yaml deleted file mode 120000 index 4d7b8362e..000000000 --- a/tests/kuttl/tests/ctlplane-galera-3replicas/02-errors-cleanup.yaml +++ /dev/null @@ -1 +0,0 @@ -../../common/errors_cleanup_openstack.yaml \ No newline at end of file diff --git a/tests/kuttl/tests/ctlplane-galera-basic/01-assert-galera.yaml b/tests/kuttl/tests/ctlplane-galera-basic/01-assert-galera.yaml deleted file mode 100644 index 1b04eb11f..000000000 --- a/tests/kuttl/tests/ctlplane-galera-basic/01-assert-galera.yaml +++ /dev/null @@ -1,279 +0,0 @@ -apiVersion: core.openstack.org/v1beta1 -kind: OpenStackControlPlane -metadata: - name: openstack-galera -spec: - secret: osp-secret - keystone: - template: - databaseInstance: openstack - secret: osp-secret - galera: - enabled: true - templates: - openstack: - storageRequest: 500M - secret: osp-secret - replicas: 1 - openstack-cell1: - storageRequest: 500M - secret: osp-secret - replicas: 1 - rabbitmq: - templates: - rabbitmq: - replicas: 1 - rabbitmq-cell1: - replicas: 1 - memcached: - templates: - memcached: - replicas: 1 - placement: - template: - databaseInstance: openstack - secret: osp-secret - glance: - template: - databaseInstance: openstack - glanceAPIs: - default: - replicas: 1 - storage: - storageRequest: 10G - cinder: - template: - databaseInstance: openstack - secret: osp-secret - cinderAPI: - replicas: 1 - cinderScheduler: - replicas: 1 - cinderBackup: - replicas: 0 # backend needs to be configured - cinderVolumes: - volume1: - replicas: 0 # backend needs to be configured - barbican: - enabled: true - template: - databaseInstance: openstack - secret: osp-secret - barbicanAPI: - replicas: 1 - barbicanWorker: - replicas: 1 - barbicanKeystoneListener: - replicas: 1 - manila: - template: - manilaAPI: - replicas: 1 - manilaScheduler: - replicas: 1 - manilaShares: - share1: - replicas: 1 - ovn: - template: - ovnDBCluster: - ovndbcluster-nb: - replicas: 1 - dbType: NB - storageRequest: 10G - ovndbcluster-sb: - replicas: 1 - dbType: SB - storageRequest: 10G - ovnNorthd: - replicas: 1 - ovnController: - external-ids: - system-id: "random" - ovn-bridge: "br-int" - ovn-encap-type: "geneve" - neutron: - template: - databaseInstance: openstack - secret: osp-secret - horizon: - template: - replicas: 1 - secret: osp-secret - nova: - template: - secret: osp-secret - heat: - enabled: false - template: - databaseInstance: openstack - heatAPI: - replicas: 1 - heatEngine: - replicas: 1 - secret: osp-secret - ironic: - enabled: false - template: - databaseInstance: openstack - ironicAPI: - replicas: 1 - ironicConductors: - - replicas: 1 - storageRequest: 10G - ironicInspector: - replicas: 1 - ironicNeutronAgent: - replicas: 1 - secret: osp-secret - telemetry: - enabled: true - template: - autoscaling: - aodh: - secret: osp-secret - serviceUser: aodh - ceilometer: - passwordSelector: - ceilometerService: CeilometerPassword - secret: osp-secret - serviceUser: ceilometer - swift: - enabled: true - template: - swiftRing: - ringReplicas: 1 - swiftStorage: - replicas: 1 - swiftProxy: - replicas: 1 - tls: - ingress: - ca: - duration: 87600h0m0s - cert: - duration: 43800h0m0s - enabled: true - podLevel: - enabled: true - internal: - ca: - duration: 87600h0m0s - cert: - duration: 43800h0m0s - libvirt: - ca: - duration: 87600h0m0s - cert: - duration: 43800h0m0s - ovn: - ca: - duration: 87600h0m0s - cert: - duration: 43800h0m0s -status: - conditions: - - message: Setup complete - reason: Ready - status: "True" - type: Ready - - message: OpenStackControlPlane Barbican completed - reason: Ready - status: "True" - type: OpenStackControlPlaneBarbicanReady - - message: OpenStackControlPlane CAs completed - reason: Ready - status: "True" - type: OpenStackControlPlaneCAReadyCondition - - message: OpenStackControlPlane Cinder completed - reason: Ready - status: "True" - type: OpenStackControlPlaneCinderReady - - message: OpenStackControlPlane Client completed - reason: Ready - status: "True" - type: OpenStackControlPlaneClientReady - - message: OpenStackControlPlane barbican service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeBarbicanReady - - message: OpenStackControlPlane cinder service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeCinderReady - - message: OpenStackControlPlane glance service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeGlanceReady - - message: OpenStackControlPlane keystone service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeKeystoneAPIReady - - message: OpenStackControlPlane neutron service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeNeutronReady - - message: OpenStackControlPlane nova service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeNovaReady - - message: OpenStackControlPlane placement service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposePlacementAPIReady - - message: OpenStackControlPlane swift service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeSwiftReady - - message: OpenStackControlPlane Glance completed - reason: Ready - status: "True" - type: OpenStackControlPlaneGlanceReady - - message: OpenStackControlPlane InstanceHa CM is available - reason: Ready - status: "True" - type: OpenStackControlPlaneInstanceHaCMReadyCondition - - message: OpenStackControlPlane KeystoneAPI completed - reason: Ready - status: "True" - type: OpenStackControlPlaneKeystoneAPIReady - - message: OpenStackControlPlane MariaDB completed - reason: Ready - status: "True" - type: OpenStackControlPlaneMariaDBReady - - message: OpenStackControlPlane Memcached completed - reason: Ready - status: "True" - type: OpenStackControlPlaneMemcachedReady - - message: OpenStackControlPlane Neutron completed - reason: Ready - status: "True" - type: OpenStackControlPlaneNeutronReady - - message: OpenStackControlPlane Nova completed - reason: Ready - status: "True" - type: OpenStackControlPlaneNovaReady - - message: OpenStackControlPlane OVN completed - reason: Ready - status: "True" - type: OpenStackControlPlaneOVNReady - - message: OpenStackControlPlane PlacementAPI completed - reason: Ready - status: "True" - type: OpenStackControlPlanePlacementAPIReady - - message: OpenStackControlPlane RabbitMQ completed - reason: Ready - status: "True" - type: OpenStackControlPlaneRabbitMQReady - - message: OpenStackControlPlane Swift completed - reason: Ready - status: "True" - type: OpenStackControlPlaneSwiftReady - - message: OpenStackControlPlane Telemetry completed - reason: Ready - status: "True" - type: OpenStackControlPlaneTelemetryReady - - message: OpenStackControlPlane Test Operator CM is available - reason: Ready - status: "True" - type: OpenStackControlPlaneTestCMReadyCondition diff --git a/tests/kuttl/tests/ctlplane-galera-basic/01-deploy-galera.yaml b/tests/kuttl/tests/ctlplane-galera-basic/01-deploy-galera.yaml deleted file mode 100644 index cacf35aa0..000000000 --- a/tests/kuttl/tests/ctlplane-galera-basic/01-deploy-galera.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: | - oc apply -n $NAMESPACE -f ../../../../config/samples/core_v1beta1_openstackcontrolplane_galera.yaml diff --git a/tests/kuttl/tests/ctlplane-galera-basic/02-cleanup.yaml b/tests/kuttl/tests/ctlplane-galera-basic/02-cleanup.yaml deleted file mode 100644 index 1067fba89..000000000 --- a/tests/kuttl/tests/ctlplane-galera-basic/02-cleanup.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: core.openstack.org/v1beta1 - kind: OpenStackControlPlane - name: openstack-galera -commands: -- script: | - oc delete --ignore-not-found=true -n $NAMESPACE pvc \ - mysql-db-openstack-galera-0 \ - mysql-db-openstack-cell1-galera-0 \ - srv-swift-storage-0 - oc delete secret --ignore-not-found=true combined-ca-bundle -n $NAMESPACE - oc delete secret -l service-cert -n $NAMESPACE - oc delete secret -l ca-cert -n $NAMESPACE diff --git a/tests/kuttl/tests/ctlplane-galera-basic/02-errors-cleanup.yaml b/tests/kuttl/tests/ctlplane-galera-basic/02-errors-cleanup.yaml deleted file mode 120000 index 4d7b8362e..000000000 --- a/tests/kuttl/tests/ctlplane-galera-basic/02-errors-cleanup.yaml +++ /dev/null @@ -1 +0,0 @@ -../../common/errors_cleanup_openstack.yaml \ No newline at end of file diff --git a/tests/kuttl/tests/ctlplane-tls-cert-rotation/01-assert-deploy-openstack.yaml b/tests/kuttl/tests/ctlplane-tls-cert-rotation/01-assert-deploy-openstack.yaml deleted file mode 120000 index 762a8cf31..000000000 --- a/tests/kuttl/tests/ctlplane-tls-cert-rotation/01-assert-deploy-openstack.yaml +++ /dev/null @@ -1 +0,0 @@ -../../common/assert-sample-deployment.yaml \ No newline at end of file diff --git a/tests/kuttl/tests/ctlplane-tls-cert-rotation/01-deploy-openstack.yaml b/tests/kuttl/tests/ctlplane-tls-cert-rotation/01-deploy-openstack.yaml deleted file mode 100644 index 6c9d0887d..000000000 --- a/tests/kuttl/tests/ctlplane-tls-cert-rotation/01-deploy-openstack.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: | - oc kustomize ../../../../config/samples/base/openstackcontrolplane | oc apply -n $NAMESPACE -f - diff --git a/tests/kuttl/tests/ctlplane-tls-cert-rotation/02-get-endpoints-certs.yaml b/tests/kuttl/tests/ctlplane-tls-cert-rotation/02-get-endpoints-certs.yaml deleted file mode 100644 index 7719160a1..000000000 --- a/tests/kuttl/tests/ctlplane-tls-cert-rotation/02-get-endpoints-certs.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: | - echo "Get fingerprints of all service certs" - oc exec -i openstackclient -n $NAMESPACE -- bash -s < ../../common/osp_endpoint_fingerprints.sh > /tmp/endpoint_fingerprints_before diff --git a/tests/kuttl/tests/ctlplane-tls-cert-rotation/03-assert-new-certs.yaml b/tests/kuttl/tests/ctlplane-tls-cert-rotation/03-assert-new-certs.yaml deleted file mode 100644 index e99c26993..000000000 --- a/tests/kuttl/tests/ctlplane-tls-cert-rotation/03-assert-new-certs.yaml +++ /dev/null @@ -1,323 +0,0 @@ -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: keystone-public-route -spec: - duration: 500h0m0s ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: keystone-public-svc -spec: - duration: 500h0m0s ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: keystone-internal-svc -spec: - duration: 500h0m0s ---- -apiVersion: core.openstack.org/v1beta1 -kind: OpenStackControlPlane -metadata: - name: openstack -spec: - secret: osp-secret - keystone: - template: - databaseInstance: openstack - secret: osp-secret - galera: - enabled: true - templates: - openstack: - storageRequest: 500M - secret: osp-secret - replicas: 1 - openstack-cell1: - storageRequest: 500M - secret: osp-secret - replicas: 1 - rabbitmq: - templates: - rabbitmq: - replicas: 1 - rabbitmq-cell1: - replicas: 1 - memcached: - templates: - memcached: - replicas: 1 - placement: - template: - databaseInstance: openstack - secret: osp-secret - glance: - template: - databaseInstance: openstack - secret: osp-secret - glanceAPIs: - default: - replicas: 1 - storage: - storageRequest: 10G - cinder: - template: - databaseInstance: openstack - secret: osp-secret - cinderAPI: - replicas: 1 - cinderScheduler: - replicas: 1 - cinderBackup: - replicas: 0 # backend needs to be configured - cinderVolumes: - volume1: - replicas: 0 # backend needs to be configured - manila: - template: - manilaAPI: - replicas: 1 - manilaScheduler: - replicas: 1 - manilaShares: - share1: - replicas: 1 - ovn: - template: - ovnDBCluster: - ovndbcluster-nb: - replicas: 1 - dbType: NB - storageRequest: 10G - ovndbcluster-sb: - replicas: 1 - dbType: SB - storageRequest: 10G - ovnNorthd: - replicas: 1 - ovnController: - external-ids: - system-id: "random" - ovn-bridge: "br-int" - ovn-encap-type: "geneve" - neutron: - template: - databaseInstance: openstack - secret: osp-secret - horizon: - template: - replicas: 1 - secret: osp-secret - nova: - template: - secret: osp-secret - heat: - enabled: false - template: - databaseInstance: openstack - heatAPI: - replicas: 1 - heatEngine: - replicas: 1 - secret: osp-secret - octavia: - enabled: false - template: - databaseInstance: openstack - octaviaAPI: - replicas: 1 - secret: osp-secret - ironic: - enabled: false - template: - databaseInstance: openstack - ironicAPI: - replicas: 1 - ironicConductors: - - replicas: 1 - storageRequest: 10G - ironicInspector: - replicas: 1 - ironicNeutronAgent: - replicas: 1 - secret: osp-secret - telemetry: - enabled: true - template: - autoscaling: - aodh: - secret: osp-secret - serviceUser: aodh - ceilometer: - passwordSelector: - ceilometerService: CeilometerPassword - secret: osp-secret - serviceUser: ceilometer - swift: - enabled: true - template: - swiftRing: - ringReplicas: 1 - swiftStorage: - replicas: 1 - swiftProxy: - replicas: 1 - designate: - enabled: false - template: - databaseInstance: openstack - secret: osp-secret - designateAPI: - replicas: 1 - designateCentral: - replicas: 0 # backend needs to be configured - designateWorker: - replicas: 0 # backend needs to be configured - designateProducer: - replicas: 0 # backend needs to be configured - designateBackendbind9: - replicas: 0 # backend needs to be configured - barbican: - enabled: true - template: - databaseInstance: openstack - secret: osp-secret - barbicanAPI: - replicas: 1 - barbicanWorker: - replicas: 1 - barbicanKeystoneListener: - replicas: 1 - tls: - ingress: - enabled: true - ca: - duration: 1000h0m0s - cert: - duration: 500h0m0s - podLevel: - enabled: true - internal: - ca: - duration: 1000h0m0s - cert: - duration: 500h0m0s - libvirt: - ca: - duration: 1000h0m0s - cert: - duration: 500h0m0s - ovn: - ca: - duration: 1000h0m0s - cert: - duration: 500h0m0s -status: - conditions: - - message: Setup complete - reason: Ready - status: "True" - type: Ready - - message: OpenStackControlPlane Barbican completed - reason: Ready - status: "True" - type: OpenStackControlPlaneBarbicanReady - - message: OpenStackControlPlane CAs completed - reason: Ready - status: "True" - type: OpenStackControlPlaneCAReadyCondition - - message: OpenStackControlPlane Cinder completed - reason: Ready - status: "True" - type: OpenStackControlPlaneCinderReady - - message: OpenStackControlPlane Client completed - reason: Ready - status: "True" - type: OpenStackControlPlaneClientReady - - message: OpenStackControlPlane barbican service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeBarbicanReady - - message: OpenStackControlPlane cinder service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeCinderReady - - message: OpenStackControlPlane glance service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeGlanceReady - - message: OpenStackControlPlane keystone service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeKeystoneAPIReady - - message: OpenStackControlPlane neutron service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeNeutronReady - - message: OpenStackControlPlane nova service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeNovaReady - - message: OpenStackControlPlane placement service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposePlacementAPIReady - - message: OpenStackControlPlane swift service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeSwiftReady - - message: OpenStackControlPlane Glance completed - reason: Ready - status: "True" - type: OpenStackControlPlaneGlanceReady - - message: OpenStackControlPlane InstanceHa CM is available - reason: Ready - status: "True" - type: OpenStackControlPlaneInstanceHaCMReadyCondition - - message: OpenStackControlPlane KeystoneAPI completed - reason: Ready - status: "True" - type: OpenStackControlPlaneKeystoneAPIReady - - message: OpenStackControlPlane MariaDB completed - reason: Ready - status: "True" - type: OpenStackControlPlaneMariaDBReady - - message: OpenStackControlPlane Memcached completed - reason: Ready - status: "True" - type: OpenStackControlPlaneMemcachedReady - - message: OpenStackControlPlane Neutron completed - reason: Ready - status: "True" - type: OpenStackControlPlaneNeutronReady - - message: OpenStackControlPlane Nova completed - reason: Ready - status: "True" - type: OpenStackControlPlaneNovaReady - - message: OpenStackControlPlane OVN completed - reason: Ready - status: "True" - type: OpenStackControlPlaneOVNReady - - message: OpenStackControlPlane PlacementAPI completed - reason: Ready - status: "True" - type: OpenStackControlPlanePlacementAPIReady - - message: OpenStackControlPlane RabbitMQ completed - reason: Ready - status: "True" - type: OpenStackControlPlaneRabbitMQReady - - message: OpenStackControlPlane Swift completed - reason: Ready - status: "True" - type: OpenStackControlPlaneSwiftReady - - message: OpenStackControlPlane Telemetry completed - reason: Ready - status: "True" - type: OpenStackControlPlaneTelemetryReady - - message: OpenStackControlPlane Test Operator CM is available - reason: Ready - status: "True" - type: OpenStackControlPlaneTestCMReadyCondition diff --git a/tests/kuttl/tests/ctlplane-tls-cert-rotation/03-change-cert-duration.yaml b/tests/kuttl/tests/ctlplane-tls-cert-rotation/03-change-cert-duration.yaml deleted file mode 100644 index c76a4806e..000000000 --- a/tests/kuttl/tests/ctlplane-tls-cert-rotation/03-change-cert-duration.yaml +++ /dev/null @@ -1,6 +0,0 @@ -# Deploys with custom tls service certs and CA certs duration -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: | - oc kustomize ../../../../config/samples/tls/custom_duration | oc apply -n $NAMESPACE -f - diff --git a/tests/kuttl/tests/ctlplane-tls-cert-rotation/04-assert-service-cert-rotation.yaml b/tests/kuttl/tests/ctlplane-tls-cert-rotation/04-assert-service-cert-rotation.yaml deleted file mode 100644 index 35b4c4583..000000000 --- a/tests/kuttl/tests/ctlplane-tls-cert-rotation/04-assert-service-cert-rotation.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 900 -commands: - - script: | - echo "Get fingerprints of all service certs" - oc exec -i openstackclient -n $NAMESPACE -- bash -s < ../../common/osp_endpoint_fingerprints.sh > /tmp/endpoint_fingerprints_after - - - script: | - echo "Check if all services from before are present in after and have valid fingerprints" - bash -s < ../../common/osp_check_fingerprints.sh diff --git a/tests/kuttl/tests/ctlplane-tls-cert-rotation/05-cleanup.yaml b/tests/kuttl/tests/ctlplane-tls-cert-rotation/05-cleanup.yaml deleted file mode 100644 index 6b4992512..000000000 --- a/tests/kuttl/tests/ctlplane-tls-cert-rotation/05-cleanup.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: core.openstack.org/v1beta1 - kind: OpenStackControlPlane - name: openstack -commands: -- script: | - oc delete --ignore-not-found=true -n $NAMESPACE pvc \ - srv-swift-storage-0 - oc delete secret --ignore-not-found=true combined-ca-bundle -n $NAMESPACE - oc delete secret -l service-cert -n $NAMESPACE - oc delete secret -l ca-cert -n $NAMESPACE diff --git a/tests/kuttl/tests/ctlplane-tls-cert-rotation/05-errors-cleanup.yaml b/tests/kuttl/tests/ctlplane-tls-cert-rotation/05-errors-cleanup.yaml deleted file mode 120000 index 4d7b8362e..000000000 --- a/tests/kuttl/tests/ctlplane-tls-cert-rotation/05-errors-cleanup.yaml +++ /dev/null @@ -1 +0,0 @@ -../../common/errors_cleanup_openstack.yaml \ No newline at end of file diff --git a/tests/kuttl/tests/ctlplane-tls-custom-issuers/02-assert-service-certs-issuers.yaml b/tests/kuttl/tests/ctlplane-tls-custom-issuers/02-assert-service-certs-issuers.yaml index ec986a033..4bd541bb0 100644 --- a/tests/kuttl/tests/ctlplane-tls-custom-issuers/02-assert-service-certs-issuers.yaml +++ b/tests/kuttl/tests/ctlplane-tls-custom-issuers/02-assert-service-certs-issuers.yaml @@ -9,3 +9,7 @@ commands: - script: | echo "Checking issuer of ingress certificates..." oc exec -i openstackclient -n $NAMESPACE -- bash -s < ../../common/osp_check_cert_issuer.sh "rootca-ingress-custom" "public" + + - script: | + echo "Checking rotation of non API service certificates..." + bash ../../common/osp_check_noapi_service_certs.sh diff --git a/tests/kuttl/tests/ctlplane-tls-custom-issuers/04-assert-service-certs-default-issuers.yaml b/tests/kuttl/tests/ctlplane-tls-custom-issuers/04-assert-service-certs-default-issuers.yaml index 3228171eb..7eea5ae22 100644 --- a/tests/kuttl/tests/ctlplane-tls-custom-issuers/04-assert-service-certs-default-issuers.yaml +++ b/tests/kuttl/tests/ctlplane-tls-custom-issuers/04-assert-service-certs-default-issuers.yaml @@ -13,3 +13,7 @@ commands: - script: | echo "Checking issuer of ingress certificates..." oc exec -i openstackclient -n $NAMESPACE -- bash -s < ../../common/osp_check_cert_issuer.sh "rootca-public" "public" + + - script: | + echo "Checking rotation of non API service certificates..." + bash ../../common/osp_check_noapi_service_certs.sh diff --git a/tests/kuttl/tests/ctlplane-tls-custom-issuers/07-assert-service-certs-default-issuers.yaml b/tests/kuttl/tests/ctlplane-tls-custom-issuers/07-assert-service-certs-default-issuers.yaml index c663b6e54..9d3e34256 100644 --- a/tests/kuttl/tests/ctlplane-tls-custom-issuers/07-assert-service-certs-default-issuers.yaml +++ b/tests/kuttl/tests/ctlplane-tls-custom-issuers/07-assert-service-certs-default-issuers.yaml @@ -9,3 +9,7 @@ commands: - script: | echo "Checking issuer of ingress certificates..." oc exec -i openstackclient -n $NAMESPACE -- bash -s < ../../common/osp_check_cert_issuer.sh "rootca-public" "public" + + - script: | + echo "Checking rotation of non API service certificates..." + bash ../../common/osp_check_noapi_service_certs.sh diff --git a/tests/kuttl/tests/ctlplane-tls-custom-issuers/10-assert-service-certs-issuers.yaml b/tests/kuttl/tests/ctlplane-tls-custom-issuers/10-assert-service-certs-issuers.yaml index 7327c8efa..6af2b5b0b 100644 --- a/tests/kuttl/tests/ctlplane-tls-custom-issuers/10-assert-service-certs-issuers.yaml +++ b/tests/kuttl/tests/ctlplane-tls-custom-issuers/10-assert-service-certs-issuers.yaml @@ -13,3 +13,7 @@ commands: - script: | echo "Checking issuer of ingress certificates..." oc exec -i openstackclient -n $NAMESPACE -- bash -s < ../../common/osp_check_cert_issuer.sh "rootca-ingress-custom" "public" + + - script: | + echo "Checking rotation of non API service certificates..." + bash ../../common/osp_check_noapi_service_certs.sh diff --git a/tests/kuttl/tests/ctlplane-tls-custom-route/01-assert-deploy-openstack.yaml b/tests/kuttl/tests/ctlplane-tls-custom-route/01-assert-deploy-openstack.yaml deleted file mode 120000 index 762a8cf31..000000000 --- a/tests/kuttl/tests/ctlplane-tls-custom-route/01-assert-deploy-openstack.yaml +++ /dev/null @@ -1 +0,0 @@ -../../common/assert-sample-deployment.yaml \ No newline at end of file diff --git a/tests/kuttl/tests/ctlplane-tls-custom-route/01-deploy-openstack.yaml b/tests/kuttl/tests/ctlplane-tls-custom-route/01-deploy-openstack.yaml deleted file mode 100644 index 6c9d0887d..000000000 --- a/tests/kuttl/tests/ctlplane-tls-custom-route/01-deploy-openstack.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: | - oc kustomize ../../../../config/samples/base/openstackcontrolplane | oc apply -n $NAMESPACE -f - diff --git a/tests/kuttl/tests/ctlplane-tls-custom-route/02-assert-custom-route-secret.yaml b/tests/kuttl/tests/ctlplane-tls-custom-route/02-assert-custom-route-secret.yaml deleted file mode 100644 index decb7bfaf..000000000 --- a/tests/kuttl/tests/ctlplane-tls-custom-route/02-assert-custom-route-secret.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: barbican-custom-route diff --git a/tests/kuttl/tests/ctlplane-tls-custom-route/02-deploy-custom-route-secret.yaml b/tests/kuttl/tests/ctlplane-tls-custom-route/02-deploy-custom-route-secret.yaml deleted file mode 100644 index 14981897f..000000000 --- a/tests/kuttl/tests/ctlplane-tls-custom-route/02-deploy-custom-route-secret.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: | - oc apply -n $NAMESPACE -f ../../common/custom-barbican-route.yaml diff --git a/tests/kuttl/tests/ctlplane-tls-custom-route/03-assert-deploy-openstack.yaml b/tests/kuttl/tests/ctlplane-tls-custom-route/03-assert-deploy-openstack.yaml deleted file mode 100644 index b74b1c372..000000000 --- a/tests/kuttl/tests/ctlplane-tls-custom-route/03-assert-deploy-openstack.yaml +++ /dev/null @@ -1,320 +0,0 @@ -apiVersion: core.openstack.org/v1beta1 -kind: OpenStackControlPlane -metadata: - name: openstack -spec: - secret: osp-secret - keystone: - template: - databaseInstance: openstack - secret: osp-secret - galera: - enabled: true - templates: - openstack: - storageRequest: 500M - secret: osp-secret - replicas: 1 - openstack-cell1: - storageRequest: 500M - secret: osp-secret - replicas: 1 - rabbitmq: - templates: - rabbitmq: - replicas: 1 - rabbitmq-cell1: - replicas: 1 - memcached: - templates: - memcached: - replicas: 1 - placement: - apiOverride: - route: - spec: - tls: - certificate: | - CERT123 - key: | - KEY123 - caCertificate: | - CACERT123 - termination: reencrypt - template: - databaseInstance: openstack - secret: osp-secret - glance: - template: - databaseInstance: openstack - secret: osp-secret - glanceAPIs: - default: - replicas: 1 - storage: - storageRequest: 10G - cinder: - template: - databaseInstance: openstack - secret: osp-secret - cinderAPI: - replicas: 1 - cinderScheduler: - replicas: 1 - cinderBackup: - replicas: 0 # backend needs to be configured - cinderVolumes: - volume1: - replicas: 0 # backend needs to be configured - manila: - template: - manilaAPI: - replicas: 1 - manilaScheduler: - replicas: 1 - manilaShares: - share1: - replicas: 1 - ovn: - template: - ovnDBCluster: - ovndbcluster-nb: - replicas: 1 - dbType: NB - storageRequest: 10G - ovndbcluster-sb: - replicas: 1 - dbType: SB - storageRequest: 10G - ovnNorthd: - replicas: 1 - ovnController: - external-ids: - system-id: "random" - ovn-bridge: "br-int" - ovn-encap-type: "geneve" - neutron: - template: - databaseInstance: openstack - secret: osp-secret - horizon: - template: - replicas: 1 - secret: osp-secret - nova: - template: - secret: osp-secret - heat: - enabled: false - template: - databaseInstance: openstack - heatAPI: - replicas: 1 - heatEngine: - replicas: 1 - secret: osp-secret - octavia: - enabled: false - template: - databaseInstance: openstack - octaviaAPI: - replicas: 1 - secret: osp-secret - ironic: - enabled: false - template: - databaseInstance: openstack - ironicAPI: - replicas: 1 - ironicConductors: - - replicas: 1 - storageRequest: 10G - ironicInspector: - replicas: 1 - ironicNeutronAgent: - replicas: 1 - secret: osp-secret - telemetry: - enabled: true - template: - autoscaling: - aodh: - secret: osp-secret - serviceUser: aodh - ceilometer: - passwordSelector: - ceilometerService: CeilometerPassword - secret: osp-secret - serviceUser: ceilometer - swift: - enabled: true - template: - swiftRing: - ringReplicas: 1 - swiftStorage: - replicas: 1 - swiftProxy: - replicas: 1 - designate: - enabled: false - template: - databaseInstance: openstack - secret: osp-secret - designateAPI: - replicas: 1 - designateCentral: - replicas: 0 # backend needs to be configured - designateWorker: - replicas: 0 # backend needs to be configured - designateProducer: - replicas: 0 # backend needs to be configured - designateBackendbind9: - replicas: 0 # backend needs to be configured - barbican: - enabled: true - apiOverride: - tls: - secretName: barbican-custom-route - template: - databaseInstance: openstack - secret: osp-secret - barbicanAPI: - replicas: 1 - barbicanWorker: - replicas: 1 - barbicanKeystoneListener: - replicas: 1 - tls: - ingress: - ca: - duration: 87600h0m0s - cert: - duration: 43800h0m0s - enabled: true - podLevel: - enabled: true - internal: - ca: - duration: 87600h0m0s - cert: - duration: 43800h0m0s - libvirt: - ca: - duration: 87600h0m0s - cert: - duration: 43800h0m0s - ovn: - ca: - duration: 87600h0m0s - cert: - duration: 43800h0m0s -status: - conditions: - - message: Setup complete - reason: Ready - status: "True" - type: Ready - - message: OpenStackControlPlane Barbican completed - reason: Ready - status: "True" - type: OpenStackControlPlaneBarbicanReady - - message: OpenStackControlPlane CAs completed - reason: Ready - status: "True" - type: OpenStackControlPlaneCAReadyCondition - - message: OpenStackControlPlane Cinder completed - reason: Ready - status: "True" - type: OpenStackControlPlaneCinderReady - - message: OpenStackControlPlane Client completed - reason: Ready - status: "True" - type: OpenStackControlPlaneClientReady - - message: OpenStackControlPlane custom TLS cert secret available - reason: Ready - status: "True" - type: OpenStackControlPlaneCustomTLSReadyCondition - - message: OpenStackControlPlane barbican service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeBarbicanReady - - message: OpenStackControlPlane cinder service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeCinderReady - - message: OpenStackControlPlane glance service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeGlanceReady - - message: OpenStackControlPlane keystone service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeKeystoneAPIReady - - message: OpenStackControlPlane neutron service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeNeutronReady - - message: OpenStackControlPlane nova service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeNovaReady - - message: OpenStackControlPlane placement service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposePlacementAPIReady - - message: OpenStackControlPlane swift service exposed - reason: Ready - status: "True" - type: OpenStackControlPlaneExposeSwiftReady - - message: OpenStackControlPlane Glance completed - reason: Ready - status: "True" - type: OpenStackControlPlaneGlanceReady - - message: OpenStackControlPlane InstanceHa CM is available - reason: Ready - status: "True" - type: OpenStackControlPlaneInstanceHaCMReadyCondition - - message: OpenStackControlPlane KeystoneAPI completed - reason: Ready - status: "True" - type: OpenStackControlPlaneKeystoneAPIReady - - message: OpenStackControlPlane MariaDB completed - reason: Ready - status: "True" - type: OpenStackControlPlaneMariaDBReady - - message: OpenStackControlPlane Memcached completed - reason: Ready - status: "True" - type: OpenStackControlPlaneMemcachedReady - - message: OpenStackControlPlane Neutron completed - reason: Ready - status: "True" - type: OpenStackControlPlaneNeutronReady - - message: OpenStackControlPlane Nova completed - reason: Ready - status: "True" - type: OpenStackControlPlaneNovaReady - - message: OpenStackControlPlane OVN completed - reason: Ready - status: "True" - type: OpenStackControlPlaneOVNReady - - message: OpenStackControlPlane PlacementAPI completed - reason: Ready - status: "True" - type: OpenStackControlPlanePlacementAPIReady - - message: OpenStackControlPlane RabbitMQ completed - reason: Ready - status: "True" - type: OpenStackControlPlaneRabbitMQReady - - message: OpenStackControlPlane Swift completed - reason: Ready - status: "True" - type: OpenStackControlPlaneSwiftReady - - message: OpenStackControlPlane Telemetry completed - reason: Ready - status: "True" - type: OpenStackControlPlaneTelemetryReady - - message: OpenStackControlPlane Test Operator CM is available - reason: Ready - status: "True" - type: OpenStackControlPlaneTestCMReadyCondition diff --git a/tests/kuttl/tests/ctlplane-tls-custom-route/03-deploy-openstack.yaml b/tests/kuttl/tests/ctlplane-tls-custom-route/03-deploy-openstack.yaml deleted file mode 100644 index d5ab11869..000000000 --- a/tests/kuttl/tests/ctlplane-tls-custom-route/03-deploy-openstack.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: | - oc kustomize ../../../../config/samples/tls/custom_route_cert | oc apply -n $NAMESPACE -f - diff --git a/tests/kuttl/tests/ctlplane-tls-custom-route/04-assert-custom-route-cert.yaml b/tests/kuttl/tests/ctlplane-tls-custom-route/04-assert-custom-route-cert.yaml deleted file mode 100644 index c0794fb78..000000000 --- a/tests/kuttl/tests/ctlplane-tls-custom-route/04-assert-custom-route-cert.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 -commands: - - script: | - echo "Checking barbican custom route certificate..." - bash ../../common/osp_check_route_cert.sh "barbican" - - - script: | - echo "Checking placement custom route certificate..." - bash ../../common/osp_check_route_cert.sh "placement" diff --git a/tests/kuttl/tests/ctlplane-tls-custom-route/04-errors-cleanup.yaml b/tests/kuttl/tests/ctlplane-tls-custom-route/04-errors-cleanup.yaml deleted file mode 100644 index 0916db619..000000000 --- a/tests/kuttl/tests/ctlplane-tls-custom-route/04-errors-cleanup.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - barbican-public-route ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - placement-public-route diff --git a/tests/kuttl/tests/ctlplane-tls-custom-route/05-cleanup.yaml b/tests/kuttl/tests/ctlplane-tls-custom-route/05-cleanup.yaml deleted file mode 100644 index 6fdd31ed9..000000000 --- a/tests/kuttl/tests/ctlplane-tls-custom-route/05-cleanup.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: core.openstack.org/v1beta1 - kind: OpenStackControlPlane - name: openstack -commands: -- script: | - oc delete --ignore-not-found=true -n $NAMESPACE pvc \ - srv-swift-storage-0 - oc delete --ignore-not-found=true -n $NAMESPACE issuer rootca-internal-custom rootca-ingress-custom - oc delete secret --ignore-not-found=true combined-ca-bundle -n $NAMESPACE - oc delete secret -l service-cert -n $NAMESPACE - oc delete secret -l ca-cert -n $NAMESPACE diff --git a/tests/kuttl/tests/ctlplane-tls-custom-route/05-errors-cleanup.yaml b/tests/kuttl/tests/ctlplane-tls-custom-route/05-errors-cleanup.yaml deleted file mode 120000 index 4d7b8362e..000000000 --- a/tests/kuttl/tests/ctlplane-tls-custom-route/05-errors-cleanup.yaml +++ /dev/null @@ -1 +0,0 @@ -../../common/errors_cleanup_openstack.yaml \ No newline at end of file diff --git a/tests/kuttl/tests/dataplane-create-test/00-assert.yaml b/tests/kuttl/tests/dataplane-create-test/00-assert.yaml deleted file mode 100644 index 5c3f1c00f..000000000 --- a/tests/kuttl/tests/dataplane-create-test/00-assert.yaml +++ /dev/null @@ -1,202 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 600 -collectors: -- type: command - command: oc logs -n openstack-operators -l openstack.org/operator-name=openstack - name: operator-logs ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: openstack-edpm-ipam -spec: - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - nodes: - edpm-compute-0: - hostName: edpm-compute-0 - networks: - - name: ctlplane - subnetName: subnet1 - defaultRoute: true - fixedIP: 192.168.122.100 - - name: internalapi - subnetName: subnet1 - - name: storage - subnetName: subnet1 - - name: tenant - subnetName: subnet1 - - nodeTemplate: - ansible: - ansiblePort: 22 - ansibleUser: cloud-admin - ansibleVarsFrom: - - prefix: edpm_ - configMapRef: - name: network-config-template - ansibleVars: - timesync_ntp_servers: - - hostname: clock.redhat.com - edpm_network_config_hide_sensitive_logs: false - edpm_nodes_validation_validate_controllers_icmp: false - edpm_nodes_validation_validate_gateway_icmp: false - edpm_selinux_mode: enforcing - edpm_sshd_allowed_ranges: - - 192.168.122.0/24 - edpm_sshd_configure_firewall: true - enable_debug: false - ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret - preProvisioned: true - services: - - download-cache - - bootstrap - - configure-network - - validate-network - - install-os - - configure-os - - run-os - - install-certs - - ovn - - neutron-metadata - - libvirt - - nova -status: - observedGeneration: 1 - allHostnames: - edpm-compute-0: - ctlplane: edpm-compute-0.ctlplane.example.com - internalapi: edpm-compute-0.internalapi.example.com - storage: edpm-compute-0.storage.example.com - tenant: edpm-compute-0.tenant.example.com - allIPs: - edpm-compute-0: - ctlplane: 192.168.122.100 - internalapi: 172.17.0.100 - storage: 172.18.0.100 - tenant: 172.19.0.100 - ctlplaneSearchDomain: ctlplane.example.com - conditions: - - message: Deployment not started - reason: Requested - status: "False" - type: Ready - - message: Deployment not started - reason: Requested - status: "False" - type: DeploymentReady - - message: Input data complete - reason: Ready - status: "True" - type: InputReady - - message: NodeSetDNSDataReady ready - reason: Ready - status: "True" - type: NodeSetDNSDataReady - - message: NodeSetIPReservationReady ready - reason: Ready - status: "True" - type: NodeSetIPReservationReady - - message: ServiceAccount created - reason: Ready - status: "True" - type: ServiceAccountReady - - message: Setup complete - reason: Ready - status: "True" - type: SetupReady ---- -apiVersion: network.openstack.org/v1beta1 -kind: IPSet -metadata: - name: edpm-compute-0 -spec: - immutable: false - networks: - - defaultRoute: true - name: ctlplane - subnetName: subnet1 - - name: internalapi - subnetName: subnet1 - - name: storage - subnetName: subnet1 - - name: tenant - subnetName: subnet1 -status: - conditions: - - message: Setup complete - reason: Ready - status: "True" - type: Ready - - message: Input data complete - reason: Ready - status: "True" - type: InputReady - - message: Reservation successful - reason: Ready - status: "True" - type: ReservationReady - reservations: - - address: 192.168.122.100 - cidr: 192.168.122.0/24 - dnsDomain: ctlplane.example.com - gateway: 192.168.122.1 - mtu: 1500 - network: ctlplane - routes: - - destination: 0.0.0.0/0 - nexthop: 192.168.122.1 - subnet: subnet1 - - address: 172.17.0.100 - cidr: 172.17.0.0/24 - dnsDomain: internalapi.example.com - mtu: 1500 - network: internalapi - subnet: subnet1 - vlan: 20 - - address: 172.18.0.100 - cidr: 172.18.0.0/24 - dnsDomain: storage.example.com - mtu: 1500 - network: storage - subnet: subnet1 - vlan: 21 - - address: 172.19.0.100 - cidr: 172.19.0.0/24 - dnsDomain: tenant.example.com - mtu: 1500 - network: tenant - subnet: subnet1 - vlan: 22 ---- -apiVersion: network.openstack.org/v1beta1 -kind: DNSData -metadata: - name: openstack-edpm-ipam -spec: - dnsDataLabelSelectorValue: dnsdata - hosts: - - hostnames: - - edpm-compute-0.ctlplane.example.com - ip: 192.168.122.100 - - hostnames: - - edpm-compute-0.internalapi.example.com - ip: 172.17.0.100 - - hostnames: - - edpm-compute-0.storage.example.com - ip: 172.18.0.100 - - hostnames: - - edpm-compute-0.tenant.example.com - ip: 172.19.0.100 -status: - conditions: - - message: Setup complete - reason: Ready - status: "True" - type: Ready - - message: Input data complete - reason: Ready - status: "True" - type: ServiceConfigReady diff --git a/tests/kuttl/tests/dataplane-create-test/00-dataplane-create.yaml b/tests/kuttl/tests/dataplane-create-test/00-dataplane-create.yaml deleted file mode 100644 index a7f7b889e..000000000 --- a/tests/kuttl/tests/dataplane-create-test/00-dataplane-create.yaml +++ /dev/null @@ -1,99 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: network-config-template -data: - network_config_template: | - --- - {% set mtu_list = [ctlplane_mtu] %} - {% for network in nodeset_networks %} - {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} - {%- endfor %} - {% set min_viable_mtu = mtu_list | max %} - network_config: - - type: ovs_bridge - name: {{ neutron_physical_bridge_name }} - mtu: {{ min_viable_mtu }} - use_dhcp: false - dns_servers: {{ ctlplane_dns_nameservers }} - domain: {{ dns_search_domains }} - addresses: - - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }} - routes: {{ ctlplane_host_routes }} - members: - - type: interface - name: nic1 - mtu: {{ min_viable_mtu }} - # force the MAC address of the bridge to this interface - primary: true - {% for network in nodeset_networks %} - - type: vlan - mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }} - vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }} - addresses: - - ip_netmask: - {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }} - routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }} - {% endfor %} ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: openstack-edpm-ipam -spec: - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - services: - - download-cache - - bootstrap - - configure-network - - validate-network - - install-os - - configure-os - - run-os - - install-certs - - ovn - - neutron-metadata - - libvirt - - nova - preProvisioned: true - nodes: - edpm-compute-0: - hostName: edpm-compute-0 - networks: - - name: ctlplane - subnetName: subnet1 - defaultRoute: true - fixedIP: 192.168.122.100 - - name: internalapi - subnetName: subnet1 - - name: storage - subnetName: subnet1 - - name: tenant - subnetName: subnet1 - nodeTemplate: - ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret - ansible: - ansibleUser: cloud-admin - ansiblePort: 22 - ansibleVarsFrom: - - prefix: edpm_ - configMapRef: - name: network-config-template - ansibleVars: - timesync_ntp_servers: - - hostname: clock.redhat.com - # edpm_network_config - # Default nic config template for a EDPM compute node - # These vars are edpm_network_config role vars - edpm_network_config_hide_sensitive_logs: false - edpm_nodes_validation_validate_controllers_icmp: false - edpm_nodes_validation_validate_gateway_icmp: false - gather_facts: false - enable_debug: false - # edpm firewall, change the allowed CIDR if needed - edpm_sshd_configure_firewall: true - edpm_sshd_allowed_ranges: ['192.168.122.0/24'] - # SELinux module - edpm_selinux_mode: enforcing diff --git a/tests/kuttl/tests/dataplane-deploy-global-service-test/00-assert.yaml b/tests/kuttl/tests/dataplane-deploy-global-service-test/00-assert.yaml deleted file mode 100644 index 34ef6ee43..000000000 --- a/tests/kuttl/tests/dataplane-deploy-global-service-test/00-assert.yaml +++ /dev/null @@ -1,138 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 600 -collectors: -- type: command - command: oc get OpenStackDataPlaneDeployment -n openstack-kuttl-tests edpm-compute-global -o yaml - name: edpm-compute-global-deployment -- type: command - command: oc logs -n openstack-operators -l openstack.org/operator-name=openstack - name: operator-logs ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: edpm-compute-global - namespace: openstack-kuttl-tests -spec: - preProvisioned: true - services: - - download-cache - - bootstrap - - configure-network - - validate-network - - install-os - - configure-os - - run-os - - install-certs - - ovn - - neutron-metadata - - neutron-ovn - - neutron-sriov - - neutron-dhcp - - libvirt - - nova - - custom-global-service - tlsEnabled: false - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - nodes: {} - nodeTemplate: - ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret - managementNetwork: ctlplane - ansible: - ansibleUser: cloud-admin - ansiblePort: 22 - ansibleVarsFrom: - - prefix: edpm_ - configMapRef: - name: network-config-template - ansibleVars: - timesync_ntp_servers: - - hostname: clock.redhat.com - # edpm_network_config - # Default nic config template for a EDPM compute node - # These vars are edpm_network_config role vars - edpm_network_config_hide_sensitive_logs: false - # These vars are for the network config templates themselves and are - # considered EDPM network defaults. - neutron_physical_bridge_name: br-ex - neutron_public_interface_name: eth0 - ctlplane_mtu: 1500 - ctlplane_cidr: 24 - ctlplane_gateway_ip: 192.168.122.1 - ctlplane_host_routes: - - ip_netmask: 0.0.0.0/0 - next_hop: 192.168.122.1 - external_mtu: 1500 - external_vlan_id: 44 - external_cidr: '24' - external_host_routes: [] - internalapi_mtu: 1500 - internalapi_vlan_id: 20 - internalapi_cidr: '24' - internalapi_host_routes: [] - storage_mtu: 1500 - storage_vlan_id: 21 - storage_cidr: '24' - storage_host_routes: [] - tenant_mtu: 1500 - tenant_vlan_id: 22 - tenant_cidr: '24' - tenant_host_routes: [] - nodeset_networks: - - InternalApi - - Storage - - Tenant - networks_lower: - External: external - InternalApi: internalapi - Storage: storage - Tenant: tenant - # edpm_nodes_validation - edpm_nodes_validation_validate_controllers_icmp: false - edpm_nodes_validation_validate_gateway_icmp: false - ctlplane_dns_nameservers: - - 192.168.122.1 - dns_search_domains: [] - gather_facts: false - enable_debug: false - # edpm firewall, change the allowed CIDR if needed - edpm_sshd_configure_firewall: true - edpm_sshd_allowed_ranges: ['192.168.122.0/24'] - # SELinux module - edpm_selinux_mode: enforcing -status: - observedGeneration: 1 - conditions: - - message: Deployment not started - reason: Requested - severity: Info - status: "False" - type: Ready - - message: Deployment not started - reason: Requested - severity: Info - status: "False" - type: DeploymentReady - - message: Input data complete - reason: Ready - status: "True" - type: InputReady - - message: NodeSetDNSDataReady ready - reason: Ready - status: "True" - type: NodeSetDNSDataReady - - message: NodeSetIPReservationReady ready - reason: Ready - status: "True" - type: NodeSetIPReservationReady - - message: ServiceAccount created - reason: Ready - status: "True" - type: ServiceAccountReady - - message: Setup complete - reason: Ready - status: "True" - type: SetupReady diff --git a/tests/kuttl/tests/dataplane-deploy-global-service-test/00-dataplane-create.yaml b/tests/kuttl/tests/dataplane-deploy-global-service-test/00-dataplane-create.yaml deleted file mode 100644 index c998299e4..000000000 --- a/tests/kuttl/tests/dataplane-deploy-global-service-test/00-dataplane-create.yaml +++ /dev/null @@ -1,240 +0,0 @@ -apiVersion: v1 -kind: Secret -type: Opaque -metadata: - name: combined-ca-bundle - labels: - combined-ca-bundle: "" -data: - tls-ca-bundle.pem: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJnVENDQVNlZ0F3SUJBZ0lSQU5TYWxJeHdEclZ5TVBLS3RHK0lLbzB3Q2dZSUtvWkl6ajBFQXdJd0lERWUKTUJ3R0ExVUVBeE1WY205dmRHTmhMV3QxZEhSc0xXbHVkR1Z5Ym1Gc01CNFhEVEkwTURJeU1qRTBNRGcwTTFvWApEVE0wTURJeE9URTBNRGcwTTFvd0lERWVNQndHQTFVRUF4TVZjbTl2ZEdOaExXdDFkSFJzTFdsdWRHVnlibUZzCk1Ga3dFd1lIS29aSXpqMENBUVlJS29aSXpqMERBUWNEUWdBRTQzd2xOK05BQzhYZnkzSk43S1VaSVMvMjE2OTIKNXpWdHVyYnlpNllmZ3hXbFFONGV4ZU5IcVpGT3ZRcUVoZUVVSFR5K2lpWEVpWDVGcytCeit1eUZWYU5DTUVBdwpEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0hRWURWUjBPQkJZRUZDRHJnYkhICjh4WmlKbnBKY2gzaEZyZEJLL3lKTUFvR0NDcUdTTTQ5QkFNQ0EwZ0FNRVVDSUNTY3A2QlE3eldQdnlobW9uK00KcTlvbk1PNlRYSVArczdtZjJGaXkvWkVsQWlFQXRxbkF3VE40UXRKQzIrMUZGVUNNd3dpSTZJTmM5blBDVHc1dgo5M1ZWR2ZNPQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0t ---- -apiVersion: v1 -kind: Secret -metadata: - name: nova-cell1-compute-config -data: - nova-blank.conf: Zm9vCg== - 01-nova.conf: Zm9vCg== ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: ovncontroller-config -data: - ovsdb-config: test-ovn-config ---- -apiVersion: v1 -kind: Secret -metadata: - name: neutron-ovn-metadata-agent-neutron-config -data: - 10-neutron-metadata.conf: dGVzdC1uZXV0cm9uLW92bi1tZXRhZGF0YS1hZ2VudC1jb25maWc= ---- -apiVersion: v1 -kind: Secret -metadata: - name: nova-metadata-neutron-config -data: - 05-nova-metadata.conf: dGVzdC1ub3ZhLW1ldGFkYXRhLWNvbXB1dGUtY29uZmln - httpd.conf: dGVzdC1ub3ZhLW1ldGFkYXRhLWNvbXB1dGUtY29uZmln - nova-metadata-config.json: dGVzdC1ub3ZhLW1ldGFkYXRhLWNvbXB1dGUtY29uZmln ---- -apiVersion: v1 -kind: Secret -metadata: - name: neutron-ovn-agent-neutron-config -data: - 10-neutron-ovn.conf: dGVzdC1uZXV0cm9uLW92bi1hZ2VudC1jb25maWc= ---- -apiVersion: v1 -kind: Secret -metadata: - name: neutron-sriov-agent-neutron-config -data: - 10-neutron-sriov.conf: dGVzdC1uZXV0cm9uLXNyaW92LWFnZW50LXNlY3JldC1jb25maWcK ---- -apiVersion: v1 -kind: Secret -metadata: - name: neutron-dhcp-agent-neutron-config -data: - 10-neutron-dhcp.conf: dGVzdC1uZXV0cm9uLWRoY3AtYWdlbnQtc2VjcmV0LWNvbmZpZwo= ---- -apiVersion: v1 -kind: Secret -metadata: - name: nova-migration-ssh-key -data: - ssh-privatekey: ZmFrZQo= - ssh-publickey: ZmFrZQo= ---- -apiVersion: v1 -kind: Secret -metadata: - name: libvirt-secret -data: - LibvirtPassword: ZmFrZQo= ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneService -metadata: - name: custom-global-service -spec: - label: custom-global-service - playbookContents: | - - hosts: localhost - gather_facts: no - name: global kuttl play - tasks: - - name: Sleep - command: sleep 1 - delegate_to: localhost - deployOnAllNodeSets: true ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: network-config-template -data: - network_config_template: | - --- - {% set mtu_list = [ctlplane_mtu] %} - {% for network in nodeset_networks %} - {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} - {%- endfor %} - {% set min_viable_mtu = mtu_list | max %} - network_config: - - type: ovs_bridge - name: {{ neutron_physical_bridge_name }} - mtu: {{ min_viable_mtu }} - use_dhcp: false - dns_servers: {{ ctlplane_dns_nameservers }} - domain: {{ dns_search_domains }} - addresses: - - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }} - routes: {{ ctlplane_host_routes }} - members: - - type: interface - name: nic1 - mtu: {{ min_viable_mtu }} - # force the MAC address of the bridge to this interface - primary: true - {% for network in nodeset_networks %} - - type: vlan - mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }} - vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }} - addresses: - - ip_netmask: - {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }} - routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }} - {% endfor %} ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: edpm-compute-global -spec: - baremetalSetTemplate: - automatedCleaningMode: metadata - bmhNamespace: openshift-machine-api - cloudUserName: "" - ctlplaneInterface: "" - ctlplaneNetmask: 255.255.255.0 - deploymentSSHSecret: "" - hardwareReqs: - cpuReqs: - countReq: {} - mhzReq: {} - diskReqs: - gbReq: {} - ssdReq: {} - memReqs: - gbReq: {} - preProvisioned: true - tlsEnabled: false - services: - - download-cache - - bootstrap - - configure-network - - validate-network - - install-os - - configure-os - - run-os - - install-certs - - ovn - - neutron-metadata - - neutron-ovn - - neutron-sriov - - neutron-dhcp - - libvirt - - nova - - custom-global-service - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - nodes: {} - nodeTemplate: - ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret - managementNetwork: ctlplane - ansible: - ansibleUser: cloud-admin - ansiblePort: 22 - ansibleVarsFrom: - - prefix: edpm_ - configMapRef: - name: network-config-template - ansibleVars: - timesync_ntp_servers: - - hostname: clock.redhat.com - # edpm_network_config - # Default nic config template for a EDPM compute node - # These vars are edpm_network_config role vars - edpm_network_config_hide_sensitive_logs: false - # These vars are for the network config templates themselves and are - # considered EDPM network defaults. - neutron_physical_bridge_name: br-ex - neutron_public_interface_name: eth0 - ctlplane_mtu: 1500 - ctlplane_cidr: 24 - ctlplane_gateway_ip: 192.168.122.1 - ctlplane_host_routes: - - ip_netmask: 0.0.0.0/0 - next_hop: 192.168.122.1 - external_mtu: 1500 - external_vlan_id: 44 - external_cidr: '24' - external_host_routes: [] - internalapi_mtu: 1500 - internalapi_vlan_id: 20 - internalapi_cidr: '24' - internalapi_host_routes: [] - storage_mtu: 1500 - storage_vlan_id: 21 - storage_cidr: '24' - storage_host_routes: [] - tenant_mtu: 1500 - tenant_vlan_id: 22 - tenant_cidr: '24' - tenant_host_routes: [] - nodeset_networks: - - InternalApi - - Storage - - Tenant - networks_lower: - External: external - InternalApi: internalapi - Storage: storage - Tenant: tenant - # edpm_nodes_validation - edpm_nodes_validation_validate_controllers_icmp: false - edpm_nodes_validation_validate_gateway_icmp: false - ctlplane_dns_nameservers: - - 192.168.122.1 - dns_search_domains: [] - gather_facts: false - enable_debug: false - # edpm firewall, change the allowed CIDR if needed - edpm_sshd_configure_firewall: true - edpm_sshd_allowed_ranges: ['192.168.122.0/24'] - # SELinux module - edpm_selinux_mode: enforcing diff --git a/tests/kuttl/tests/dataplane-deploy-global-service-test/01-assert.yaml b/tests/kuttl/tests/dataplane-deploy-global-service-test/01-assert.yaml deleted file mode 100644 index 5c9a258fc..000000000 --- a/tests/kuttl/tests/dataplane-deploy-global-service-test/01-assert.yaml +++ /dev/null @@ -1,1685 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 600 -collectors: -- type: command - command: oc get OpenStackDataPlaneDeployment -n openstack-kuttl-tests edpm-compute-global -o yaml - name: edpm-compute-global-deployment -- type: command - command: oc logs -n openstack-operators -l openstack.org/operator-name=openstack - name: operator-logs ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: edpm-compute-global - namespace: openstack-kuttl-tests -spec: - services: - - download-cache - - bootstrap - - configure-network - - validate-network - - install-os - - configure-os - - run-os - - install-certs - - ovn - - neutron-metadata - - neutron-ovn - - neutron-sriov - - neutron-dhcp - - libvirt - - nova - - custom-global-service - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - nodes: {} - nodeTemplate: - ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret -status: - observedGeneration: 1 - conditions: - - message: NodeSet Ready - reason: Ready - status: "True" - type: Ready - - message: Deployment completed - reason: Ready - status: "True" - type: DeploymentReady - - message: Input data complete - reason: Ready - status: "True" - type: InputReady - - message: NodeSetDNSDataReady ready - reason: Ready - status: "True" - type: NodeSetDNSDataReady - - message: NodeSetIPReservationReady ready - reason: Ready - status: "True" - type: NodeSetIPReservationReady - - message: ServiceAccount created - reason: Ready - status: "True" - type: ServiceAccountReady - - message: Setup complete - reason: Ready - status: "True" - type: SetupReady ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: custom-global-service-edpm-compute-global - openstackansibleee_cr: custom-global-service-edpm-compute-global - openstackdataplanedeployment: edpm-compute-global - openstackdataplanenodeset: edpm-compute-global - openstackdataplaneservice: custom-global-service - osaee: "true" - name: custom-global-service-edpm-compute-global - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-global -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: custom-global-service-edpm-compute-global - job-name: custom-global-service-edpm-compute-global - openstackansibleee_cr: custom-global-service-edpm-compute-global - openstackdataplanedeployment: edpm-compute-global - openstackdataplanenodeset: edpm-compute-global - openstackdataplaneservice: custom-global-service - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - playbook.yaml - - -i - - custom-global-service-edpm-compute-global - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - - hosts: localhost - gather_facts: no - name: global kuttl play - tasks: - - name: Sleep - command: sleep 1 - delegate_to: localhost - - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: all - edpm_service_type: custom-global-service - - - imagePullPolicy: Always - name: custom-global-service-edpm-compute-global - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /runner/env/ssh_key/ssh_key_edpm-compute-global - name: ssh-key-edpm-compute-global - subPath: ssh_key_edpm-compute-global - - mountPath: /runner/inventory/inventory-0 - name: inventory-0 - subPath: inventory-0 - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-global - serviceAccountName: edpm-compute-global - terminationGracePeriodSeconds: 30 - volumes: - - name: ssh-key-edpm-compute-global - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key_edpm-compute-global - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory-0 - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory-0 - secretName: dataplanenodeset-edpm-compute-global -status: - conditions: - - status: "True" - type: Complete - succeeded: 1 - uncountedTerminatedPods: {} ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: download-cache-edpm-compute-global-edpm-compute-global - openstackansibleee_cr: download-cache-edpm-compute-global-edpm-compute-global - openstackdataplanedeployment: edpm-compute-global - openstackdataplanenodeset: edpm-compute-global - openstackdataplaneservice: download-cache - osaee: "true" - name: download-cache-edpm-compute-global-edpm-compute-global - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-global -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: download-cache-edpm-compute-global-edpm-compute-global - job-name: download-cache-edpm-compute-global-edpm-compute-global - openstackansibleee_cr: download-cache-edpm-compute-global-edpm-compute-global - openstackdataplanedeployment: edpm-compute-global - openstackdataplanenodeset: edpm-compute-global - openstackdataplaneservice: download-cache - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.download_cache - - -i - - download-cache-edpm-compute-global-edpm-compute-global - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.download_cache - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-global - edpm_service_type: download-cache - - - imagePullPolicy: Always - name: download-cache-edpm-compute-global-edpm-compute-global - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-global - serviceAccountName: edpm-compute-global - terminationGracePeriodSeconds: 30 - volumes: - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-global -status: - conditions: - - status: "True" - type: Complete - ready: 0 - succeeded: 1 - terminating: 0 - uncountedTerminatedPods: {} ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: bootstrap-edpm-compute-global-edpm-compute-global - openstackansibleee_cr: bootstrap-edpm-compute-global-edpm-compute-global - openstackdataplanedeployment: edpm-compute-global - openstackdataplanenodeset: edpm-compute-global - openstackdataplaneservice: bootstrap - osaee: "true" - name: bootstrap-edpm-compute-global-edpm-compute-global - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-global -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: bootstrap-edpm-compute-global-edpm-compute-global - job-name: bootstrap-edpm-compute-global-edpm-compute-global - openstackansibleee_cr: bootstrap-edpm-compute-global-edpm-compute-global - openstackdataplanedeployment: edpm-compute-global - openstackdataplanenodeset: edpm-compute-global - openstackdataplaneservice: bootstrap - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.bootstrap - - -i - - bootstrap-edpm-compute-global-edpm-compute-global - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.bootstrap - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-global - edpm_service_type: bootstrap - - - imagePullPolicy: Always - name: bootstrap-edpm-compute-global-edpm-compute-global - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-global - serviceAccountName: edpm-compute-global - terminationGracePeriodSeconds: 30 - volumes: - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-global -status: - conditions: - - status: "True" - type: Complete - ready: 0 - succeeded: 1 - terminating: 0 - uncountedTerminatedPods: {} - ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: configure-network-edpm-compute-global-edpm-compute-global - openstackansibleee_cr: configure-network-edpm-compute-global-edpm-compute-global - openstackdataplanedeployment: edpm-compute-global - openstackdataplanenodeset: edpm-compute-global - openstackdataplaneservice: configure-network - osaee: "true" - name: configure-network-edpm-compute-global-edpm-compute-global - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-global -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: configure-network-edpm-compute-global-edpm-compute-global - job-name: configure-network-edpm-compute-global-edpm-compute-global - openstackansibleee_cr: configure-network-edpm-compute-global-edpm-compute-global - openstackdataplanedeployment: edpm-compute-global - openstackdataplanenodeset: edpm-compute-global - openstackdataplaneservice: configure-network - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.configure_network - - -i - - configure-network-edpm-compute-global-edpm-compute-global - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.configure_network - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-global - edpm_service_type: configure-network - - - imagePullPolicy: Always - name: configure-network-edpm-compute-global-edpm-compute-global - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-global - serviceAccountName: edpm-compute-global - terminationGracePeriodSeconds: 30 - volumes: - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-global -status: - conditions: - - status: "True" - type: Complete - ready: 0 - succeeded: 1 - terminating: 0 - uncountedTerminatedPods: {} - ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: validate-network-edpm-compute-global-edpm-compute-global - openstackansibleee_cr: validate-network-edpm-compute-global-edpm-compute-global - openstackdataplanedeployment: edpm-compute-global - openstackdataplanenodeset: edpm-compute-global - openstackdataplaneservice: validate-network - osaee: "true" - name: validate-network-edpm-compute-global-edpm-compute-global - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-global -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: validate-network-edpm-compute-global-edpm-compute-global - job-name: validate-network-edpm-compute-global-edpm-compute-global - openstackansibleee_cr: validate-network-edpm-compute-global-edpm-compute-global - openstackdataplanedeployment: edpm-compute-global - openstackdataplanenodeset: edpm-compute-global - openstackdataplaneservice: validate-network - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.validate_network - - -i - - validate-network-edpm-compute-global-edpm-compute-global - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.validate_network - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-global - edpm_service_type: validate-network - - - imagePullPolicy: Always - name: validate-network-edpm-compute-global-edpm-compute-global - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-global - serviceAccountName: edpm-compute-global - terminationGracePeriodSeconds: 30 - volumes: - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-global -status: - conditions: - - status: "True" - type: Complete - ready: 0 - succeeded: 1 - terminating: 0 - uncountedTerminatedPods: {} - ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: configure-os-edpm-compute-global-edpm-compute-global - openstackansibleee_cr: configure-os-edpm-compute-global-edpm-compute-global - openstackdataplanedeployment: edpm-compute-global - openstackdataplanenodeset: edpm-compute-global - openstackdataplaneservice: configure-os - osaee: "true" - name: configure-os-edpm-compute-global-edpm-compute-global - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-global -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: configure-os-edpm-compute-global-edpm-compute-global - job-name: configure-os-edpm-compute-global-edpm-compute-global - openstackansibleee_cr: configure-os-edpm-compute-global-edpm-compute-global - openstackdataplanedeployment: edpm-compute-global - openstackdataplanenodeset: edpm-compute-global - openstackdataplaneservice: configure-os - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.configure_os - - -i - - configure-os-edpm-compute-global-edpm-compute-global - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.configure_os - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-global - edpm_service_type: configure-os - - - imagePullPolicy: Always - name: configure-os-edpm-compute-global-edpm-compute-global - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-global - serviceAccountName: edpm-compute-global - terminationGracePeriodSeconds: 30 - volumes: - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-global -status: - conditions: - - status: "True" - type: Complete - ready: 0 - succeeded: 1 - terminating: 0 - uncountedTerminatedPods: {} - ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: install-certs-edpm-compute-global-edpm-compute-global - openstackansibleee_cr: install-certs-edpm-compute-global-edpm-compute-global - openstackdataplanedeployment: edpm-compute-global - openstackdataplanenodeset: edpm-compute-global - openstackdataplaneservice: install-certs - osaee: "true" - name: install-certs-edpm-compute-global-edpm-compute-global - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-global -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: install-certs-edpm-compute-global-edpm-compute-global - job-name: install-certs-edpm-compute-global-edpm-compute-global - openstackansibleee_cr: install-certs-edpm-compute-global-edpm-compute-global - openstackdataplanedeployment: edpm-compute-global - openstackdataplanenodeset: edpm-compute-global - openstackdataplaneservice: install-certs - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.install_certs - - -i - - install-certs-edpm-compute-global-edpm-compute-global - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.install_certs - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-global - edpm_service_type: install-certs - - - imagePullPolicy: Always - name: install-certs-edpm-compute-global-edpm-compute-global - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/openstack/cacerts/ovn - name: ovn-combined-ca-bundle - - mountPath: /var/lib/openstack/cacerts/neutron-metadata - name: neutron-metadata-combined-ca-bundle - - mountPath: /var/lib/openstack/cacerts/neutron-ovn - name: neutron-ovn-combined-ca-bundle - - mountPath: /var/lib/openstack/cacerts/neutron-sriov - name: neutron-sriov-combined-ca-bundle - - mountPath: /var/lib/openstack/cacerts/neutron-dhcp - name: neutron-dhcp-combined-ca-bundle - - mountPath: /var/lib/openstack/cacerts/libvirt - name: libvirt-combined-ca-bundle - - mountPath: /var/lib/openstack/cacerts/nova - name: nova-combined-ca-bundle - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-global - serviceAccountName: edpm-compute-global - terminationGracePeriodSeconds: 30 - volumes: - - name: ovn-combined-ca-bundle - secret: - defaultMode: 420 - secretName: combined-ca-bundle - - name: neutron-metadata-combined-ca-bundle - secret: - defaultMode: 420 - secretName: combined-ca-bundle - - name: neutron-ovn-combined-ca-bundle - secret: - defaultMode: 420 - secretName: combined-ca-bundle - - name: neutron-sriov-combined-ca-bundle - secret: - defaultMode: 420 - secretName: combined-ca-bundle - - name: neutron-dhcp-combined-ca-bundle - secret: - defaultMode: 420 - secretName: combined-ca-bundle - - name: libvirt-combined-ca-bundle - secret: - defaultMode: 420 - secretName: combined-ca-bundle - - name: nova-combined-ca-bundle - secret: - defaultMode: 420 - secretName: combined-ca-bundle - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-global ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: ovn-edpm-compute-global-edpm-compute-global - openstackansibleee_cr: ovn-edpm-compute-global-edpm-compute-global - openstackdataplanedeployment: edpm-compute-global - openstackdataplanenodeset: edpm-compute-global - openstackdataplaneservice: ovn - osaee: "true" - name: ovn-edpm-compute-global-edpm-compute-global - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-global -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: ovn-edpm-compute-global-edpm-compute-global - job-name: ovn-edpm-compute-global-edpm-compute-global - openstackansibleee_cr: ovn-edpm-compute-global-edpm-compute-global - openstackdataplanedeployment: edpm-compute-global - openstackdataplanenodeset: edpm-compute-global - openstackdataplaneservice: ovn - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.ovn - - -i - - ovn-edpm-compute-global-edpm-compute-global - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.ovn - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-global - edpm_service_type: ovn - - - imagePullPolicy: Always - name: ovn-edpm-compute-global-edpm-compute-global - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/openstack/configs/ovn/ovsdb-config - name: ovncontroller-config-0 - subPath: ovsdb-config - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-global - serviceAccountName: edpm-compute-global - terminationGracePeriodSeconds: 30 - volumes: - - configMap: - defaultMode: 420 - items: - - key: ovsdb-config - path: ovsdb-config - name: ovncontroller-config - name: ovncontroller-config-0 - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-global ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: neutron-metadata-edpm-compute-global-edpm-compute-global - openstackansibleee_cr: neutron-metadata-edpm-compute-global-edpm-compute-global - openstackdataplanedeployment: edpm-compute-global - openstackdataplanenodeset: edpm-compute-global - openstackdataplaneservice: neutron-metadata - osaee: "true" - name: neutron-metadata-edpm-compute-global-edpm-compute-global - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-global -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: neutron-metadata-edpm-compute-global-edpm-compute-global - job-name: neutron-metadata-edpm-compute-global-edpm-compute-global - openstackansibleee_cr: neutron-metadata-edpm-compute-global-edpm-compute-global - openstackdataplanedeployment: edpm-compute-global - openstackdataplanenodeset: edpm-compute-global - openstackdataplaneservice: neutron-metadata - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.neutron_metadata - - -i - - neutron-metadata-edpm-compute-global-edpm-compute-global - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.neutron_metadata - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-global - edpm_service_type: neutron-metadata - - - imagePullPolicy: Always - name: neutron-metadata-edpm-compute-global-edpm-compute-global - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/openstack/configs/neutron-metadata/10-neutron-metadata.conf - name: neutron-ovn-metadata-agent-neutron-config-0 - subPath: 10-neutron-metadata.conf - - mountPath: /var/lib/openstack/configs/neutron-metadata/05-nova-metadata.conf - name: nova-metadata-neutron-config-0 - subPath: 05-nova-metadata.conf - - mountPath: /var/lib/openstack/configs/neutron-metadata/httpd.conf - name: nova-metadata-neutron-config-1 - subPath: httpd.conf - - mountPath: /var/lib/openstack/configs/neutron-metadata/nova-metadata-config.json - name: nova-metadata-neutron-config-2 - subPath: nova-metadata-config.json - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-global - serviceAccountName: edpm-compute-global - terminationGracePeriodSeconds: 30 - volumes: - - name: neutron-ovn-metadata-agent-neutron-config-0 - secret: - defaultMode: 420 - items: - - key: 10-neutron-metadata.conf - path: 10-neutron-metadata.conf - secretName: neutron-ovn-metadata-agent-neutron-config - - name: nova-metadata-neutron-config-0 - secret: - defaultMode: 420 - items: - - key: 05-nova-metadata.conf - path: 05-nova-metadata.conf - secretName: nova-metadata-neutron-config - - name: nova-metadata-neutron-config-1 - secret: - defaultMode: 420 - items: - - key: httpd.conf - path: httpd.conf - secretName: nova-metadata-neutron-config - - name: nova-metadata-neutron-config-2 - secret: - defaultMode: 420 - items: - - key: nova-metadata-config.json - path: nova-metadata-config.json - secretName: nova-metadata-neutron-config - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-global ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: neutron-ovn-edpm-compute-global-edpm-compute-global - openstackansibleee_cr: neutron-ovn-edpm-compute-global-edpm-compute-global - openstackdataplanedeployment: edpm-compute-global - openstackdataplanenodeset: edpm-compute-global - openstackdataplaneservice: neutron-ovn - osaee: "true" - name: neutron-ovn-edpm-compute-global-edpm-compute-global - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-global -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: neutron-ovn-edpm-compute-global-edpm-compute-global - job-name: neutron-ovn-edpm-compute-global-edpm-compute-global - openstackansibleee_cr: neutron-ovn-edpm-compute-global-edpm-compute-global - openstackdataplanedeployment: edpm-compute-global - openstackdataplanenodeset: edpm-compute-global - openstackdataplaneservice: neutron-ovn - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.neutron_ovn - - -i - - neutron-ovn-edpm-compute-global-edpm-compute-global - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.neutron_ovn - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-global - edpm_service_type: neutron-ovn - - - imagePullPolicy: Always - name: neutron-ovn-edpm-compute-global-edpm-compute-global - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/openstack/configs/neutron-ovn/10-neutron-ovn.conf - name: neutron-ovn-agent-neutron-config-0 - subPath: 10-neutron-ovn.conf - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-global - serviceAccountName: edpm-compute-global - terminationGracePeriodSeconds: 30 - volumes: - - name: neutron-ovn-agent-neutron-config-0 - secret: - defaultMode: 420 - items: - - key: 10-neutron-ovn.conf - path: 10-neutron-ovn.conf - secretName: neutron-ovn-agent-neutron-config - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-global ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: neutron-sriov-edpm-compute-global-edpm-compute-global - openstackansibleee_cr: neutron-sriov-edpm-compute-global-edpm-compute-global - openstackdataplanedeployment: edpm-compute-global - openstackdataplanenodeset: edpm-compute-global - openstackdataplaneservice: neutron-sriov - osaee: "true" - name: neutron-sriov-edpm-compute-global-edpm-compute-global - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-global -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: neutron-sriov-edpm-compute-global-edpm-compute-global - job-name: neutron-sriov-edpm-compute-global-edpm-compute-global - openstackansibleee_cr: neutron-sriov-edpm-compute-global-edpm-compute-global - openstackdataplanedeployment: edpm-compute-global - openstackdataplanenodeset: edpm-compute-global - openstackdataplaneservice: neutron-sriov - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.neutron_sriov - - -i - - neutron-sriov-edpm-compute-global-edpm-compute-global - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.neutron_sriov - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-global - edpm_service_type: neutron-sriov - - - imagePullPolicy: Always - name: neutron-sriov-edpm-compute-global-edpm-compute-global - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/openstack/configs/neutron-sriov/10-neutron-sriov.conf - name: neutron-sriov-agent-neutron-config-0 - subPath: 10-neutron-sriov.conf - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-global - serviceAccountName: edpm-compute-global - terminationGracePeriodSeconds: 30 - volumes: - - name: neutron-sriov-agent-neutron-config-0 - secret: - defaultMode: 420 - items: - - key: 10-neutron-sriov.conf - path: 10-neutron-sriov.conf - secretName: neutron-sriov-agent-neutron-config - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-global ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: neutron-dhcp-edpm-compute-global-edpm-compute-global - openstackansibleee_cr: neutron-dhcp-edpm-compute-global-edpm-compute-global - openstackdataplanedeployment: edpm-compute-global - openstackdataplanenodeset: edpm-compute-global - openstackdataplaneservice: neutron-dhcp - osaee: "true" - name: neutron-dhcp-edpm-compute-global-edpm-compute-global - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-global -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: neutron-dhcp-edpm-compute-global-edpm-compute-global - job-name: neutron-dhcp-edpm-compute-global-edpm-compute-global - openstackansibleee_cr: neutron-dhcp-edpm-compute-global-edpm-compute-global - openstackdataplanedeployment: edpm-compute-global - openstackdataplanenodeset: edpm-compute-global - openstackdataplaneservice: neutron-dhcp - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.neutron_dhcp - - -i - - neutron-dhcp-edpm-compute-global-edpm-compute-global - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.neutron_dhcp - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-global - edpm_service_type: neutron-dhcp - - - imagePullPolicy: Always - name: neutron-dhcp-edpm-compute-global-edpm-compute-global - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/openstack/configs/neutron-dhcp/10-neutron-dhcp.conf - name: neutron-dhcp-agent-neutron-config-0 - subPath: 10-neutron-dhcp.conf - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-global - serviceAccountName: edpm-compute-global - terminationGracePeriodSeconds: 30 - volumes: - - name: neutron-dhcp-agent-neutron-config-0 - secret: - defaultMode: 420 - items: - - key: 10-neutron-dhcp.conf - path: 10-neutron-dhcp.conf - secretName: neutron-dhcp-agent-neutron-config - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-global ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: libvirt-edpm-compute-global-edpm-compute-global - openstackansibleee_cr: libvirt-edpm-compute-global-edpm-compute-global - openstackdataplanedeployment: edpm-compute-global - openstackdataplanenodeset: edpm-compute-global - openstackdataplaneservice: libvirt - osaee: "true" - name: libvirt-edpm-compute-global-edpm-compute-global - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-global -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: libvirt-edpm-compute-global-edpm-compute-global - job-name: libvirt-edpm-compute-global-edpm-compute-global - openstackansibleee_cr: libvirt-edpm-compute-global-edpm-compute-global - openstackdataplanedeployment: edpm-compute-global - openstackdataplanenodeset: edpm-compute-global - openstackdataplaneservice: libvirt - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.libvirt - - -i - - libvirt-edpm-compute-global-edpm-compute-global - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.libvirt - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-global - edpm_service_type: libvirt - - - imagePullPolicy: Always - name: libvirt-edpm-compute-global-edpm-compute-global - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/openstack/configs/libvirt/LibvirtPassword - name: libvirt-secret-0 - subPath: LibvirtPassword - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-global - serviceAccountName: edpm-compute-global - terminationGracePeriodSeconds: 30 - volumes: - - name: libvirt-secret-0 - secret: - defaultMode: 420 - items: - - key: LibvirtPassword - path: LibvirtPassword - secretName: libvirt-secret - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-global ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: nova-edpm-compute-global-edpm-compute-global - openstackansibleee_cr: nova-edpm-compute-global-edpm-compute-global - openstackdataplanedeployment: edpm-compute-global - openstackdataplanenodeset: edpm-compute-global - openstackdataplaneservice: nova - osaee: "true" - name: nova-edpm-compute-global-edpm-compute-global - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-global -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: nova-edpm-compute-global-edpm-compute-global - job-name: nova-edpm-compute-global-edpm-compute-global - openstackansibleee_cr: nova-edpm-compute-global-edpm-compute-global - openstackdataplanedeployment: edpm-compute-global - openstackdataplanenodeset: edpm-compute-global - openstackdataplaneservice: nova - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.nova - - -i - - nova-edpm-compute-global-edpm-compute-global - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.nova - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-global - edpm_service_type: nova - - - imagePullPolicy: Always - name: nova-edpm-compute-global-edpm-compute-global - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/openstack/configs/nova/01-nova.conf - name: nova-cell1-compute-config-0 - subPath: 01-nova.conf - - mountPath: /var/lib/openstack/configs/nova/nova-blank.conf - name: nova-cell1-compute-config-1 - subPath: nova-blank.conf - - mountPath: /var/lib/openstack/configs/nova/ssh-privatekey - name: nova-migration-ssh-key-0 - subPath: ssh-privatekey - - mountPath: /var/lib/openstack/configs/nova/ssh-publickey - name: nova-migration-ssh-key-1 - subPath: ssh-publickey - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-global - serviceAccountName: edpm-compute-global - terminationGracePeriodSeconds: 30 - volumes: - - name: nova-cell1-compute-config-0 - secret: - defaultMode: 420 - items: - - key: 01-nova.conf - path: 01-nova.conf - secretName: nova-cell1-compute-config - - name: nova-cell1-compute-config-1 - secret: - defaultMode: 420 - items: - - key: nova-blank.conf - path: nova-blank.conf - secretName: nova-cell1-compute-config - - name: nova-migration-ssh-key-0 - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh-privatekey - secretName: nova-migration-ssh-key - - name: nova-migration-ssh-key-1 - secret: - defaultMode: 420 - items: - - key: ssh-publickey - path: ssh-publickey - secretName: nova-migration-ssh-key - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-global diff --git a/tests/kuttl/tests/dataplane-deploy-global-service-test/01-dataplane-deploy.yaml b/tests/kuttl/tests/dataplane-deploy-global-service-test/01-dataplane-deploy.yaml deleted file mode 100644 index 62f2006c3..000000000 --- a/tests/kuttl/tests/dataplane-deploy-global-service-test/01-dataplane-deploy.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneDeployment -metadata: - name: edpm-compute-global -spec: - nodeSets: - - edpm-compute-global diff --git a/tests/kuttl/tests/dataplane-deploy-global-service-test/02-add-nodeset.yaml b/tests/kuttl/tests/dataplane-deploy-global-service-test/02-add-nodeset.yaml deleted file mode 100644 index d9ae4555e..000000000 --- a/tests/kuttl/tests/dataplane-deploy-global-service-test/02-add-nodeset.yaml +++ /dev/null @@ -1,42 +0,0 @@ -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: edpm-compute-beta-nodeset -spec: - baremetalSetTemplate: - automatedCleaningMode: metadata - bmhNamespace: openshift-machine-api - cloudUserName: "" - ctlplaneInterface: "" - ctlplaneNetmask: 255.255.255.0 - deploymentSSHSecret: "" - hardwareReqs: - cpuReqs: - countReq: {} - mhzReq: {} - diskReqs: - gbReq: {} - ssdReq: {} - memReqs: - gbReq: {} - preProvisioned: true - services: - - download-cache - - bootstrap - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - nodes: {} - nodeTemplate: - ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret - ansible: - ansibleUser: cloud-admin ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneDeployment -metadata: - name: edpm-multinodeset -spec: - nodeSets: - - edpm-compute-global - - edpm-compute-beta-nodeset diff --git a/tests/kuttl/tests/dataplane-deploy-global-service-test/02-assert.yaml b/tests/kuttl/tests/dataplane-deploy-global-service-test/02-assert.yaml deleted file mode 100644 index 809c04983..000000000 --- a/tests/kuttl/tests/dataplane-deploy-global-service-test/02-assert.yaml +++ /dev/null @@ -1,286 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 600 -collectors: -- type: command - command: oc logs -n openstack-operators -l openstack.org/operator-name=openstack - name: operator-logs ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: edpm-compute-beta-nodeset - namespace: openstack-kuttl-tests -spec: - services: - - download-cache - - bootstrap - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - nodes: {} - nodeTemplate: - ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret -status: - conditions: - - message: NodeSet Ready - reason: Ready - status: "True" - type: Ready - - message: Deployment completed - reason: Ready - status: "True" - type: DeploymentReady - - message: Input data complete - reason: Ready - status: "True" - type: InputReady - - message: NodeSetDNSDataReady ready - reason: Ready - status: "True" - type: NodeSetDNSDataReady - - message: NodeSetIPReservationReady ready - reason: Ready - status: "True" - type: NodeSetIPReservationReady - - message: ServiceAccount created - reason: Ready - status: "True" - type: ServiceAccountReady - - message: Setup complete - reason: Ready - status: "True" - type: SetupReady - configMapHashes: - ovncontroller-config: n647h6fh674h55fh56ch5bh68bh5fdh8dh59ch58dhdch59ch646h568h675h99h66bh59bhcch5b4h589h674h568hbch84h554h95h6dhc4hbh699q - deploymentStatuses: {} - secretHashes: - neutron-dhcp-agent-neutron-config: n68h676h98h689hd4h575h5dbh694h6fh688h57h665h5c5h56dh5ddh65bh5d7h5cdh644hb8h8fh5d9h5b9h555h9ch56dh5fh6chd4h5c5h5c5h68q - neutron-ovn-agent-neutron-config: n5f4h89hb8h645h55bh657h9fh5d9h5c6h595h9dh667h5f4hfhffh7fh685h56ch57fh679h5ddh5ddh95h696hbch5c7h669h84h54dh685hfh85q - neutron-ovn-metadata-agent-neutron-config: n68dh585h666h5c4h568hf7h65fh695h649hb9h657h5f6h548h679h77h5b4h664h8h5b8h654h5hf5h674h664h545h74h58ch57ch8ch56h54fh5ddq - neutron-sriov-agent-neutron-config: n685h567h697h5bch8ch5cfh87h698h658h684h8h99h5dch5c5h699h79hb5h87h66dh664h546h586h7bh56fh5d6h5d4h566h56bh87h678h696h56cq - nova-cell1-compute-config: n89hd6h5h545h644h58h556hd9h5c5h598hd4h7bh5f9h5bdh649hb5h99h686h677h8ch575h665h574h587h5b6h5ddh8fh687h9bh657h675h97q - nova-metadata-neutron-config: n7fh696h674h5b9h68dh77h677h5c5hd9h5dbh89h646h696h65ch64bh86hd8h56h78h558h5h5c7h87h86h5bh5bch78h6ch5cbh54fh56fhfdq - nova-migration-ssh-key: n64dh97h54dhffh65fh577h59bh664hbch54dhcbh547hdbhdch655hd9h675h5d4h67dh5ch67bh64h5fdh5c8h5cdh66bh5f5h58dhcbh9bh66bhd4q ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneDeployment -metadata: - name: edpm-multinodeset - namespace: openstack-kuttl-tests -spec: - nodeSets: - - edpm-compute-global - - edpm-compute-beta-nodeset ---- -apiVersion: batch/v1 -kind: Job -metadata: - labels: - app: openstackansibleee - job-name: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset - openstackansibleee_cr: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset - openstackdataplanedeployment: edpm-multinodeset - openstackdataplanenodeset: edpm-compute-beta-nodeset - openstackdataplaneservice: download-cache - osaee: "true" - name: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-multinodeset -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset - job-name: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset - openstackansibleee_cr: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset - openstackdataplanedeployment: edpm-multinodeset - openstackdataplanenodeset: edpm-compute-beta-nodeset - openstackdataplaneservice: download-cache - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.download_cache - - -i - - download-cache-edpm-multinodeset-edpm-compute-beta-nodeset - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.download_cache - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-beta-nodeset - edpm_service_type: download-cache - - - imagePullPolicy: Always - name: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-beta-nodeset - serviceAccountName: edpm-compute-beta-nodeset - terminationGracePeriodSeconds: 30 - volumes: - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-beta-nodeset -status: - conditions: - - status: "True" - type: Complete - ready: 0 - succeeded: 1 - terminating: 0 - uncountedTerminatedPods: {} ---- -apiVersion: batch/v1 -kind: Job -metadata: - labels: - app: openstackansibleee - job-name: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset - openstackansibleee_cr: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset - openstackdataplanedeployment: edpm-multinodeset - openstackdataplanenodeset: edpm-compute-beta-nodeset - openstackdataplaneservice: bootstrap - osaee: "true" - name: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-multinodeset -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset - job-name: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset - openstackansibleee_cr: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset - openstackdataplanedeployment: edpm-multinodeset - openstackdataplanenodeset: edpm-compute-beta-nodeset - openstackdataplaneservice: bootstrap - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.bootstrap - - -i - - bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.bootstrap - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-beta-nodeset - edpm_service_type: bootstrap - - - imagePullPolicy: Always - name: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-beta-nodeset - serviceAccountName: edpm-compute-beta-nodeset - terminationGracePeriodSeconds: 30 - volumes: - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-beta-nodeset -status: - conditions: - - status: "True" - type: Complete - ready: 0 - succeeded: 1 - terminating: 0 - uncountedTerminatedPods: {} diff --git a/tests/kuttl/tests/dataplane-deploy-multiple-secrets/00-assert.yaml b/tests/kuttl/tests/dataplane-deploy-multiple-secrets/00-assert.yaml deleted file mode 100644 index 4c0aee626..000000000 --- a/tests/kuttl/tests/dataplane-deploy-multiple-secrets/00-assert.yaml +++ /dev/null @@ -1,359 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 600 -collectors: -- type: command - command: oc logs -n openstack-operators -l openstack.org/operator-name=openstack - name: operator-logs ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneService -metadata: - name: generic-service1 -spec: - caCerts: combined-ca-bundle - tlsCerts: - default: - contents: - - dnsnames - playbookContents: | - - hosts: localhost - gather_facts: no - name: kuttl play - tasks: - - name: Sleep - command: sleep 1 - delegate_to: localhost ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneService -metadata: - name: install-certs-ovr -spec: - addCertMounts: True - playbookContents: | - - hosts: localhost - gather_facts: no - name: kuttl play - tasks: - - name: Sleep - command: sleep 1 - delegate_to: localhost ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: openstack-edpm-tls -spec: - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - nodes: - edpm-compute-0: - hostName: edpm-compute-0 - networks: - - name: ctlplane - subnetName: subnet1 - defaultRoute: true - fixedIP: 192.168.122.100 - - name: internalapi - subnetName: subnet1 - fixedIP: 172.17.0.100 - - name: storage - subnetName: subnet1 - fixedIP: 172.18.0.100 - - name: tenant - subnetName: subnet1 - fixedIP: 172.19.0.100 - edpm-compute-1: - hostName: edpm-compute-1 - networks: - - name: ctlplane - subnetName: subnet1 - defaultRoute: true - fixedIP: 192.168.122.101 - - name: internalapi - subnetName: subnet1 - fixedIP: 172.17.0.101 - - name: storage - subnetName: subnet1 - fixedIP: 172.18.0.101 - - name: tenant - subnetName: subnet1 - fixedIP: 172.19.0.101 - edpm-compute-2: - hostName: edpm-compute-2 - networks: - - name: ctlplane - subnetName: subnet1 - defaultRoute: true - fixedIP: 192.168.122.102 - - name: internalapi - subnetName: subnet1 - fixedIP: 172.17.0.102 - - name: storage - subnetName: subnet1 - fixedIP: 172.18.0.102 - - name: tenant - subnetName: subnet1 - fixedIP: 172.19.0.102 - nodeTemplate: - ansible: - ansiblePort: 22 - ansibleUser: cloud-admin - ansibleVars: - timesync_ntp_servers: - - hostname: clock.redhat.com - edpm_network_config_hide_sensitive_logs: false - edpm_network_config_template: templates/single_nic_vlans/single_nic_vlans.j2 - edpm_nodes_validation_validate_controllers_icmp: false - edpm_nodes_validation_validate_gateway_icmp: false - edpm_selinux_mode: enforcing - edpm_sshd_allowed_ranges: - - 192.168.122.0/24 - edpm_sshd_configure_firewall: true - enable_debug: false - ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret - preProvisioned: true - tlsEnabled: true - secretMaxSize: 2880 - services: - - install-certs-ovr - - generic-service1 -status: - observedGeneration: 1 - conditions: - - message: Deployment not started - reason: Requested - status: "False" - type: Ready - - message: Deployment not started - reason: Requested - status: "False" - type: DeploymentReady - - message: Input data complete - reason: Ready - status: "True" - type: InputReady - - message: NodeSetDNSDataReady ready - reason: Ready - status: "True" - type: NodeSetDNSDataReady - - message: NodeSetIPReservationReady ready - reason: Ready - status: "True" - type: NodeSetIPReservationReady - - message: ServiceAccount created - reason: Ready - status: "True" - type: ServiceAccountReady - - message: Setup complete - reason: Ready - status: "True" - type: SetupReady ---- -apiVersion: network.openstack.org/v1beta1 -kind: IPSet -metadata: - name: edpm-compute-0 -spec: - immutable: false - networks: - - defaultRoute: true - name: ctlplane - subnetName: subnet1 - - name: internalapi - subnetName: subnet1 - - name: storage - subnetName: subnet1 - - name: tenant - subnetName: subnet1 -status: - conditions: - - message: Setup complete - reason: Ready - status: "True" - type: Ready - - message: Input data complete - reason: Ready - status: "True" - type: InputReady - - message: Reservation successful - reason: Ready - status: "True" - type: ReservationReady - reservations: - - address: 192.168.122.100 - cidr: 192.168.122.0/24 - dnsDomain: ctlplane.example.com - gateway: 192.168.122.1 - mtu: 1500 - network: ctlplane - routes: - - destination: 0.0.0.0/0 - nexthop: 192.168.122.1 - subnet: subnet1 - - address: 172.17.0.100 - cidr: 172.17.0.0/24 - dnsDomain: internalapi.example.com - mtu: 1500 - network: internalapi - subnet: subnet1 - vlan: 20 - - address: 172.18.0.100 - cidr: 172.18.0.0/24 - dnsDomain: storage.example.com - mtu: 1500 - network: storage - subnet: subnet1 - vlan: 21 - - address: 172.19.0.100 - cidr: 172.19.0.0/24 - dnsDomain: tenant.example.com - mtu: 1500 - network: tenant - subnet: subnet1 - vlan: 22 ---- -apiVersion: network.openstack.org/v1beta1 -kind: IPSet -metadata: - name: edpm-compute-1 -spec: - immutable: false - networks: - - defaultRoute: true - name: ctlplane - subnetName: subnet1 - - name: internalapi - subnetName: subnet1 - - name: storage - subnetName: subnet1 - - name: tenant - subnetName: subnet1 -status: - conditions: - - message: Setup complete - reason: Ready - status: "True" - type: Ready - - message: Input data complete - reason: Ready - status: "True" - type: InputReady - - message: Reservation successful - reason: Ready - status: "True" - type: ReservationReady - reservations: - - address: 192.168.122.101 - cidr: 192.168.122.0/24 - dnsDomain: ctlplane.example.com - gateway: 192.168.122.1 - mtu: 1500 - network: ctlplane - routes: - - destination: 0.0.0.0/0 - nexthop: 192.168.122.1 - subnet: subnet1 - - address: 172.17.0.101 - cidr: 172.17.0.0/24 - dnsDomain: internalapi.example.com - mtu: 1500 - network: internalapi - subnet: subnet1 - vlan: 20 - - address: 172.18.0.101 - cidr: 172.18.0.0/24 - dnsDomain: storage.example.com - mtu: 1500 - network: storage - subnet: subnet1 - vlan: 21 - - address: 172.19.0.101 - cidr: 172.19.0.0/24 - dnsDomain: tenant.example.com - mtu: 1500 - network: tenant - subnet: subnet1 - vlan: 22 ---- -apiVersion: network.openstack.org/v1beta1 -kind: IPSet -metadata: - name: edpm-compute-2 -spec: - immutable: false - networks: - - defaultRoute: true - name: ctlplane - subnetName: subnet1 - - name: internalapi - subnetName: subnet1 - - name: storage - subnetName: subnet1 - - name: tenant - subnetName: subnet1 -status: - conditions: - - message: Setup complete - reason: Ready - status: "True" - type: Ready - - message: Input data complete - reason: Ready - status: "True" - type: InputReady - - message: Reservation successful - reason: Ready - status: "True" - type: ReservationReady - reservations: - - address: 192.168.122.102 - cidr: 192.168.122.0/24 - dnsDomain: ctlplane.example.com - gateway: 192.168.122.1 - mtu: 1500 - network: ctlplane - routes: - - destination: 0.0.0.0/0 - nexthop: 192.168.122.1 - subnet: subnet1 - - address: 172.17.0.102 - cidr: 172.17.0.0/24 - dnsDomain: internalapi.example.com - mtu: 1500 - network: internalapi - subnet: subnet1 - vlan: 20 - - address: 172.18.0.102 - cidr: 172.18.0.0/24 - dnsDomain: storage.example.com - mtu: 1500 - network: storage - subnet: subnet1 - vlan: 21 - - address: 172.19.0.102 - cidr: 172.19.0.0/24 - dnsDomain: tenant.example.com - mtu: 1500 - network: tenant - subnet: subnet1 - vlan: 22 ---- -apiVersion: network.openstack.org/v1beta1 -kind: DNSData -metadata: - name: openstack-edpm-tls -spec: - dnsDataLabelSelectorValue: dnsdata -status: - conditions: - - message: Setup complete - reason: Ready - status: "True" - type: Ready - - message: Input data complete - reason: Ready - status: "True" - type: ServiceConfigReady diff --git a/tests/kuttl/tests/dataplane-deploy-multiple-secrets/00-dataplane-create.yaml b/tests/kuttl/tests/dataplane-deploy-multiple-secrets/00-dataplane-create.yaml deleted file mode 100644 index bbafdeeee..000000000 --- a/tests/kuttl/tests/dataplane-deploy-multiple-secrets/00-dataplane-create.yaml +++ /dev/null @@ -1,119 +0,0 @@ -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneService -metadata: - name: generic-service1 -spec: - caCerts: combined-ca-bundle - tlsCerts: - default: - contents: - - dnsnames - playbookContents: | - - hosts: localhost - gather_facts: no - name: kuttl play - tasks: - - name: Sleep - command: sleep 1 - delegate_to: localhost ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneService -metadata: - name: install-certs-ovr -spec: - addCertMounts: True - playbookContents: | - - hosts: localhost - gather_facts: no - name: kuttl play - tasks: - - name: Sleep - command: sleep 1 - delegate_to: localhost ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: openstack-edpm-tls -spec: - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - services: - - install-certs-ovr - - generic-service1 - preProvisioned: true - tlsEnabled: true - secretMaxSize: 2880 - nodes: - edpm-compute-0: - hostName: edpm-compute-0 - networks: - - name: ctlplane - subnetName: subnet1 - defaultRoute: true - fixedIP: 192.168.122.100 - - name: internalapi - subnetName: subnet1 - fixedIP: 172.17.0.100 - - name: storage - subnetName: subnet1 - fixedIP: 172.18.0.100 - - name: tenant - subnetName: subnet1 - fixedIP: 172.19.0.100 - edpm-compute-1: - hostName: edpm-compute-1 - networks: - - name: ctlplane - subnetName: subnet1 - defaultRoute: true - fixedIP: 192.168.122.101 - - name: internalapi - subnetName: subnet1 - fixedIP: 172.17.0.101 - - name: storage - subnetName: subnet1 - fixedIP: 172.18.0.101 - - name: tenant - subnetName: subnet1 - fixedIP: 172.19.0.101 - edpm-compute-2: - hostName: edpm-compute-2 - networks: - - name: ctlplane - subnetName: subnet1 - defaultRoute: true - fixedIP: 192.168.122.102 - - name: internalapi - subnetName: subnet1 - fixedIP: 172.17.0.102 - - name: storage - subnetName: subnet1 - fixedIP: 172.18.0.102 - - name: tenant - subnetName: subnet1 - fixedIP: 172.19.0.102 - nodeTemplate: - ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret - ansible: - ansibleUser: cloud-admin - ansiblePort: 22 - ansibleVars: - timesync_ntp_servers: - - hostname: clock.redhat.com - # edpm_network_config - # Default nic config template for a EDPM compute node - # These vars are edpm_network_config role vars - edpm_network_config_hide_sensitive_logs: false - edpm_network_config_template: templates/single_nic_vlans/single_nic_vlans.j2 - edpm_nodes_validation_validate_controllers_icmp: false - edpm_nodes_validation_validate_gateway_icmp: false - gather_facts: false - enable_debug: false - # edpm firewall, change the allowed CIDR if needed - edpm_sshd_configure_firewall: true - edpm_sshd_allowed_ranges: ['192.168.122.0/24'] - # SELinux module - edpm_selinux_mode: enforcing diff --git a/tests/kuttl/tests/dataplane-deploy-multiple-secrets/01-create-cert-issuers.yaml b/tests/kuttl/tests/dataplane-deploy-multiple-secrets/01-create-cert-issuers.yaml deleted file mode 100644 index 5a4d601f1..000000000 --- a/tests/kuttl/tests/dataplane-deploy-multiple-secrets/01-create-cert-issuers.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: | - function wait_for() { - timeout=$1 - shift 1 - until [ $timeout -le 0 ] || ("$@" &> /dev/null); do - echo waiting for "$@" - sleep 1 - timeout=$(( timeout - 1 )) - done - if [ $timeout -le 0 ]; then - return 1 - fi - } - - if oc get secret combined-ca-bundle -n openstack-kuttl-tests; then oc delete secret combined-ca-bundle -n openstack-kuttl-tests; fi - oc apply -f ./certs.yaml - wait_for 100 oc get secret osp-rootca-secret -n openstack-kuttl-tests - CA_CRT=$(oc get secret osp-rootca-secret -n openstack-kuttl-tests -o json|jq -r '.data."ca.crt"') - oc create secret generic combined-ca-bundle -n openstack-kuttl-tests --from-literal=TLSCABundleFile=$CA_CRT diff --git a/tests/kuttl/tests/dataplane-deploy-multiple-secrets/02-assert.yaml b/tests/kuttl/tests/dataplane-deploy-multiple-secrets/02-assert.yaml deleted file mode 100644 index 96105317f..000000000 --- a/tests/kuttl/tests/dataplane-deploy-multiple-secrets/02-assert.yaml +++ /dev/null @@ -1,342 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: cert-generic-service1-default-edpm-compute-0 - annotations: - cert-manager.io/certificate-name: generic-service1-default-edpm-compute-0 - cert-manager.io/issuer-group: cert-manager.io - cert-manager.io/issuer-kind: Issuer - cert-manager.io/issuer-name: rootca-internal - labels: - hostname: edpm-compute-0 - osdp-service: generic-service1 - osdp-service-cert-key: default - osdpns: openstack-edpm-tls -type: kubernetes.io/tls ---- -apiVersion: v1 -kind: Secret -metadata: - name: cert-generic-service1-default-edpm-compute-1 - annotations: - cert-manager.io/certificate-name: generic-service1-default-edpm-compute-1 - cert-manager.io/issuer-group: cert-manager.io - cert-manager.io/issuer-kind: Issuer - cert-manager.io/issuer-name: rootca-internal - labels: - hostname: edpm-compute-1 - osdp-service: generic-service1 - osdp-service-cert-key: default - osdpns: openstack-edpm-tls -type: kubernetes.io/tls ---- -apiVersion: v1 -kind: Secret -metadata: - name: cert-generic-service1-default-edpm-compute-2 - annotations: - cert-manager.io/certificate-name: generic-service1-default-edpm-compute-2 - cert-manager.io/issuer-group: cert-manager.io - cert-manager.io/issuer-kind: Issuer - cert-manager.io/issuer-name: rootca-internal - labels: - hostname: edpm-compute-2 - osdp-service: generic-service1 - osdp-service-cert-key: default - osdpns: openstack-edpm-tls -type: kubernetes.io/tls ---- -# validate the alt-names - which is a list with elements that can be in any order -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -commands: - - script: | - template='{{index .metadata.annotations "cert-manager.io/alt-names" }}' - names=$(oc get secret cert-generic-service1-default-edpm-compute-0 -n openstack-kuttl-tests -o go-template="$template") - echo $names > test123.data - regex="(?=.*(edpm-compute-0\.internalapi\.example\.com))(?=.*(edpm-compute-0\.storage\.example\.com))(?=.*(edpm-compute-0\.tenant\.example\.com))(?=.*(edpm-compute-0\.ctlplane\.example\.com))" - matches=$(grep -P "$regex" test123.data) - rm test123.data - if [ -z "$matches" ]; then - echo "bad match: $names" - exit 1 - else - exit 0 - fi ---- -apiVersion: v1 -kind: Secret -metadata: - name: openstack-edpm-tls-generic-service1-default-certs-0 - labels: - numberOfSecrets: "3" - secretNumber: "0" - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - kind: OpenStackDataPlaneNodeSet - name: openstack-edpm-tls -type: Opaque ---- -apiVersion: v1 -kind: Secret -metadata: - name: openstack-edpm-tls-generic-service1-default-certs-1 - labels: - numberOfSecrets: "3" - secretNumber: "1" - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - kind: OpenStackDataPlaneNodeSet - name: openstack-edpm-tls -type: Opaque ---- -apiVersion: v1 -kind: Secret -metadata: - name: openstack-edpm-tls-generic-service1-default-certs-2 - labels: - numberOfSecrets: "3" - secretNumber: "2" - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - kind: OpenStackDataPlaneNodeSet - name: openstack-edpm-tls -type: Opaque ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: install-certs-ovr-openstack-edpm-tls-openstack-edpm-tls - openstackansibleee_cr: install-certs-ovr-openstack-edpm-tls-openstack-edpm-tls - openstackdataplanedeployment: openstack-edpm-tls - openstackdataplanenodeset: openstack-edpm-tls - openstackdataplaneservice: install-certs-ovr - osaee: "true" - name: install-certs-ovr-openstack-edpm-tls-openstack-edpm-tls - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: openstack-edpm-tls -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - labels: - app: openstackansibleee - job-name: install-certs-ovr-openstack-edpm-tls-openstack-edpm-tls - openstackansibleee_cr: install-certs-ovr-openstack-edpm-tls-openstack-edpm-tls - openstackdataplanedeployment: openstack-edpm-tls - openstackdataplanenodeset: openstack-edpm-tls - openstackdataplaneservice: install-certs-ovr - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - playbook.yaml - - -i - - install-certs-ovr-openstack-edpm-tls-openstack-edpm-tls - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - - hosts: localhost - gather_facts: no - name: kuttl play - tasks: - - name: Sleep - command: sleep 1 - delegate_to: localhost - - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: openstack-edpm-tls - edpm_service_type: install-certs-ovr - - - imagePullPolicy: Always - name: install-certs-ovr-openstack-edpm-tls-openstack-edpm-tls - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/openstack/certs/generic-service1/default - name: openstack-edpm-tls-generic-service1-default-certs-0 - - mountPath: /var/lib/openstack/cacerts/generic-service1 - name: generic-service1-combined-ca-bundle - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: openstack-edpm-tls - serviceAccountName: openstack-edpm-tls - terminationGracePeriodSeconds: 30 - volumes: - - name: openstack-edpm-tls-generic-service1-default-certs-0 - projected: - defaultMode: 420 - sources: - - secret: - name: openstack-edpm-tls-generic-service1-default-certs-0 - - secret: - name: openstack-edpm-tls-generic-service1-default-certs-1 - - secret: - name: openstack-edpm-tls-generic-service1-default-certs-2 - - name: generic-service1-combined-ca-bundle - secret: - defaultMode: 420 - secretName: combined-ca-bundle - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-openstack-edpm-tls -status: - conditions: - - status: "True" - type: Complete - succeeded: 1 - uncountedTerminatedPods: {} ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: generic-service1-openstack-edpm-tls-openstack-edpm-tls - openstackansibleee_cr: generic-service1-openstack-edpm-tls-openstack-edpm-tls - openstackdataplanedeployment: openstack-edpm-tls - openstackdataplanenodeset: openstack-edpm-tls - openstackdataplaneservice: generic-service1 - osaee: "true" - name: generic-service1-openstack-edpm-tls-openstack-edpm-tls - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: openstack-edpm-tls -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - labels: - app: openstackansibleee - job-name: generic-service1-openstack-edpm-tls-openstack-edpm-tls - openstackansibleee_cr: generic-service1-openstack-edpm-tls-openstack-edpm-tls - openstackdataplanedeployment: openstack-edpm-tls - openstackdataplanenodeset: openstack-edpm-tls - openstackdataplaneservice: generic-service1 - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - playbook.yaml - - -i - - generic-service1-openstack-edpm-tls-openstack-edpm-tls - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - - hosts: localhost - gather_facts: no - name: kuttl play - tasks: - - name: Sleep - command: sleep 1 - delegate_to: localhost - - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: openstack-edpm-tls - edpm_service_type: generic-service1 - - - imagePullPolicy: Always - name: generic-service1-openstack-edpm-tls-openstack-edpm-tls - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: openstack-edpm-tls - serviceAccountName: openstack-edpm-tls - terminationGracePeriodSeconds: 30 - volumes: - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-openstack-edpm-tls -status: - conditions: - - status: "True" - type: Complete - succeeded: 1 - uncountedTerminatedPods: {} diff --git a/tests/kuttl/tests/dataplane-deploy-multiple-secrets/02-dataplane-deploy.yaml b/tests/kuttl/tests/dataplane-deploy-multiple-secrets/02-dataplane-deploy.yaml deleted file mode 100644 index 61aa719ef..000000000 --- a/tests/kuttl/tests/dataplane-deploy-multiple-secrets/02-dataplane-deploy.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneDeployment -metadata: - name: openstack-edpm-tls -spec: - nodeSets: - - openstack-edpm-tls - services: - - generic-service1 diff --git a/tests/kuttl/tests/dataplane-deploy-multiple-secrets/certs.yaml b/tests/kuttl/tests/dataplane-deploy-multiple-secrets/certs.yaml deleted file mode 100644 index 7cffc290c..000000000 --- a/tests/kuttl/tests/dataplane-deploy-multiple-secrets/certs.yaml +++ /dev/null @@ -1,38 +0,0 @@ -apiVersion: cert-manager.io/v1 -kind: Issuer -metadata: - name: selfsigned-issuer - namespace: openstack-kuttl-tests -spec: - selfSigned: {} ---- -# RootCA Certificate used to sign certificates -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: osp-rootca - namespace: openstack-kuttl-tests -spec: - isCA: true - commonName: osp-rootca - secretName: osp-rootca-secret - privateKey: - algorithm: ECDSA - size: 256 - issuerRef: - name: selfsigned-issuer - kind: Issuer - group: cert-manager.io ---- -# Issuer that uses the generated CA certificate to issue certs -apiVersion: cert-manager.io/v1 -kind: Issuer -metadata: - name: rootca-internal - namespace: openstack-kuttl-tests - labels: - osp-rootca-issuer-internal: "" -spec: - ca: - secretName: osp-rootca-secret ---- diff --git a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/00-assert.yaml b/tests/kuttl/tests/dataplane-deploy-no-nodes-test/00-assert.yaml deleted file mode 100644 index 260b74a7c..000000000 --- a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/00-assert.yaml +++ /dev/null @@ -1,68 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 600 -collectors: -- type: command - command: oc logs -n openstack-operators -l openstack.org/operator-name=openstack - name: operator-logs ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: edpm-compute-no-nodes - namespace: openstack-kuttl-tests -spec: - preProvisioned: true - services: - - download-cache - - bootstrap - - configure-network - - validate-network - - install-os - - configure-os - - run-os - - install-certs - - ovn - - neutron-metadata - - neutron-ovn - - neutron-sriov - - neutron-dhcp - - libvirt - - nova - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - nodes: {} - nodeTemplate: - ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret -status: - observedGeneration: 1 - conditions: - - message: Deployment not started - reason: Requested - status: "False" - type: Ready - - message: Deployment not started - reason: Requested - status: "False" - type: DeploymentReady - - message: Input data complete - reason: Ready - status: "True" - type: InputReady - - message: NodeSetDNSDataReady ready - reason: Ready - status: "True" - type: NodeSetDNSDataReady - - message: NodeSetIPReservationReady ready - reason: Ready - status: "True" - type: NodeSetIPReservationReady - - message: ServiceAccount created - reason: Ready - status: "True" - type: ServiceAccountReady - - message: Setup complete - reason: Ready - status: "True" - type: SetupReady diff --git a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/00-dataplane-create.yaml b/tests/kuttl/tests/dataplane-deploy-no-nodes-test/00-dataplane-create.yaml deleted file mode 100644 index 23e5d5cf1..000000000 --- a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/00-dataplane-create.yaml +++ /dev/null @@ -1,97 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: nova-cell1-compute-config -data: - nova-blank.conf: Zm9vCg== - 01-nova.conf: Zm9vCg== ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: ovncontroller-config -data: - ovsdb-config: test-ovn-config ---- -apiVersion: v1 -kind: Secret -metadata: - name: neutron-ovn-metadata-agent-neutron-config -data: - 10-neutron-metadata.conf: dGVzdC1uZXV0cm9uLW92bi1tZXRhZGF0YS1hZ2VudC1jb25maWc= ---- -apiVersion: v1 -kind: Secret -metadata: - name: nova-metadata-neutron-config -data: - 05-nova-metadata.conf: dGVzdC1ub3ZhLW1ldGFkYXRhLWNvbXB1dGUtY29uZmln - httpd.conf: dGVzdC1ub3ZhLW1ldGFkYXRhLWNvbXB1dGUtY29uZmln - nova-metadata-config.json: dGVzdC1ub3ZhLW1ldGFkYXRhLWNvbXB1dGUtY29uZmln ---- -apiVersion: v1 -kind: Secret -metadata: - name: neutron-ovn-agent-neutron-config -data: - 10-neutron-ovn.conf: dGVzdC1uZXV0cm9uLW92bi1hZ2VudC1jb25maWc= ---- ---- -apiVersion: v1 -kind: Secret -metadata: - name: neutron-sriov-agent-neutron-config -data: - 10-neutron-sriov.conf: dGVzdC1uZXV0cm9uLXNyaW92LWFnZW50LXNlY3JldC1jb25maWcK ---- -apiVersion: v1 -kind: Secret -metadata: - name: neutron-dhcp-agent-neutron-config -data: - 10-neutron-dhcp.conf: dGVzdC1uZXV0cm9uLWRoY3AtYWdlbnQtc2VjcmV0LWNvbmZpZwo= ---- -apiVersion: v1 -kind: Secret -metadata: - name: nova-migration-ssh-key -data: - ssh-privatekey: ZmFrZQo= - ssh-publickey: ZmFrZQo= ---- -apiVersion: v1 -kind: Secret -metadata: - name: libvirt-secret -data: - LibvirtPassword: ZmFrZQo= ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: edpm-compute-no-nodes -spec: - preProvisioned: true - tlsEnabled: false - services: - - download-cache - - bootstrap - - configure-network - - validate-network - - install-os - - configure-os - - run-os - - install-certs - - ovn - - neutron-metadata - - neutron-ovn - - neutron-sriov - - neutron-dhcp - - libvirt - - nova - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - nodes: {} - nodeTemplate: - ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret diff --git a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/01-assert.yaml b/tests/kuttl/tests/dataplane-deploy-no-nodes-test/01-assert.yaml deleted file mode 100644 index 169df3fd4..000000000 --- a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/01-assert.yaml +++ /dev/null @@ -1,1583 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 600 -collectors: -- type: command - command: oc logs -n openstack-operators -l openstack.org/operator-name=openstack - name: operator-logs ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: edpm-compute-no-nodes - namespace: openstack-kuttl-tests -spec: - services: - - download-cache - - bootstrap - - configure-network - - validate-network - - install-os - - configure-os - - run-os - - install-certs - - ovn - - neutron-metadata - - neutron-ovn - - neutron-sriov - - neutron-dhcp - - libvirt - - nova - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - nodes: {} - nodeTemplate: - ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret -status: - observedGeneration: 1 - conditions: - - message: NodeSet Ready - reason: Ready - status: "True" - type: Ready - - message: Deployment completed - reason: Ready - status: "True" - type: DeploymentReady - - message: Input data complete - reason: Ready - status: "True" - type: InputReady - - message: NodeSetDNSDataReady ready - reason: Ready - status: "True" - type: NodeSetDNSDataReady - - message: NodeSetIPReservationReady ready - reason: Ready - status: "True" - type: NodeSetIPReservationReady - - message: ServiceAccount created - reason: Ready - status: "True" - type: ServiceAccountReady - - message: Setup complete - reason: Ready - status: "True" - type: SetupReady ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: download-cache-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: download-cache-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: download-cache - osaee: "true" - name: download-cache-edpm-compute-no-nodes-edpm-compute-no-nodes - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-no-nodes -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: download-cache-edpm-compute-no-nodes-edpm-compute-no-nodes - job-name: download-cache-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: download-cache-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: download-cache - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.download_cache - - -i - - download-cache-edpm-compute-no-nodes-edpm-compute-no-nodes - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.download_cache - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-no-nodes - edpm_service_type: download-cache - foo: bar - - - imagePullPolicy: Always - name: download-cache-edpm-compute-no-nodes-edpm-compute-no-nodes - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-no-nodes - serviceAccountName: edpm-compute-no-nodes - terminationGracePeriodSeconds: 30 - volumes: - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes -status: - conditions: - - status: "True" - type: Complete - ready: 0 - succeeded: 1 - terminating: 0 - uncountedTerminatedPods: {} ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: bootstrap-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: bootstrap-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: bootstrap - osaee: "true" - name: bootstrap-edpm-compute-no-nodes-edpm-compute-no-nodes - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-no-nodes -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: bootstrap-edpm-compute-no-nodes-edpm-compute-no-nodes - job-name: bootstrap-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: bootstrap-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: bootstrap - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.bootstrap - - -i - - bootstrap-edpm-compute-no-nodes-edpm-compute-no-nodes - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.bootstrap - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-no-nodes - edpm_service_type: bootstrap - foo: bar - - - imagePullPolicy: Always - name: bootstrap-edpm-compute-no-nodes-edpm-compute-no-nodes - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-no-nodes - serviceAccountName: edpm-compute-no-nodes - terminationGracePeriodSeconds: 30 - volumes: - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes -status: - conditions: - - status: "True" - type: Complete - ready: 0 - succeeded: 1 - terminating: 0 - uncountedTerminatedPods: {} - ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: configure-network-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: configure-network-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: configure-network - osaee: "true" - name: configure-network-edpm-compute-no-nodes-edpm-compute-no-nodes - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-no-nodes -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: configure-network-edpm-compute-no-nodes-edpm-compute-no-nodes - job-name: configure-network-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: configure-network-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: configure-network - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.configure_network - - -i - - configure-network-edpm-compute-no-nodes-edpm-compute-no-nodes - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.configure_network - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-no-nodes - edpm_service_type: configure-network - foo: bar - - - imagePullPolicy: Always - name: configure-network-edpm-compute-no-nodes-edpm-compute-no-nodes - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-no-nodes - serviceAccountName: edpm-compute-no-nodes - terminationGracePeriodSeconds: 30 - volumes: - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes -status: - conditions: - - status: "True" - type: Complete - ready: 0 - succeeded: 1 - terminating: 0 - uncountedTerminatedPods: {} - ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: validate-network-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: validate-network-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: validate-network - osaee: "true" - name: validate-network-edpm-compute-no-nodes-edpm-compute-no-nodes - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-no-nodes -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: validate-network-edpm-compute-no-nodes-edpm-compute-no-nodes - job-name: validate-network-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: validate-network-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: validate-network - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.validate_network - - -i - - validate-network-edpm-compute-no-nodes-edpm-compute-no-nodes - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.validate_network - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-no-nodes - edpm_service_type: validate-network - foo: bar - - - imagePullPolicy: Always - name: validate-network-edpm-compute-no-nodes-edpm-compute-no-nodes - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-no-nodes - serviceAccountName: edpm-compute-no-nodes - terminationGracePeriodSeconds: 30 - volumes: - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes -status: - conditions: - - status: "True" - type: Complete - ready: 0 - succeeded: 1 - terminating: 0 - uncountedTerminatedPods: {} - ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: configure-os - osaee: "true" - name: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-no-nodes -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes - job-name: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: configure-os - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.configure_os - - -i - - configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.configure_os - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-no-nodes - edpm_service_type: configure-os - foo: bar - - - imagePullPolicy: Always - name: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-no-nodes - serviceAccountName: edpm-compute-no-nodes - terminationGracePeriodSeconds: 30 - volumes: - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes -status: - conditions: - - status: "True" - type: Complete - ready: 0 - succeeded: 1 - terminating: 0 - uncountedTerminatedPods: {} - ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: install-certs-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: install-certs-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: install-certs - osaee: "true" - name: install-certs-edpm-compute-no-nodes-edpm-compute-no-nodes - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-no-nodes -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: install-certs-edpm-compute-no-nodes-edpm-compute-no-nodes - job-name: install-certs-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: install-certs-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: install-certs - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.install_certs - - -i - - install-certs-edpm-compute-no-nodes-edpm-compute-no-nodes - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.install_certs - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-no-nodes - edpm_service_type: install-certs - foo: bar - - - imagePullPolicy: Always - name: install-certs-edpm-compute-no-nodes-edpm-compute-no-nodes - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/openstack/cacerts/ovn - name: ovn-combined-ca-bundle - - mountPath: /var/lib/openstack/cacerts/neutron-metadata - name: neutron-metadata-combined-ca-bundle - - mountPath: /var/lib/openstack/cacerts/neutron-ovn - name: neutron-ovn-combined-ca-bundle - - mountPath: /var/lib/openstack/cacerts/neutron-sriov - name: neutron-sriov-combined-ca-bundle - - mountPath: /var/lib/openstack/cacerts/neutron-dhcp - name: neutron-dhcp-combined-ca-bundle - - mountPath: /var/lib/openstack/cacerts/libvirt - name: libvirt-combined-ca-bundle - - mountPath: /var/lib/openstack/cacerts/nova - name: nova-combined-ca-bundle - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-no-nodes - serviceAccountName: edpm-compute-no-nodes - terminationGracePeriodSeconds: 30 - volumes: - - name: ovn-combined-ca-bundle - secret: - defaultMode: 420 - secretName: combined-ca-bundle - - name: neutron-metadata-combined-ca-bundle - secret: - defaultMode: 420 - secretName: combined-ca-bundle - - name: neutron-ovn-combined-ca-bundle - secret: - defaultMode: 420 - secretName: combined-ca-bundle - - name: neutron-sriov-combined-ca-bundle - secret: - defaultMode: 420 - secretName: combined-ca-bundle - - name: neutron-dhcp-combined-ca-bundle - secret: - defaultMode: 420 - secretName: combined-ca-bundle - - name: libvirt-combined-ca-bundle - secret: - defaultMode: 420 - secretName: combined-ca-bundle - - name: nova-combined-ca-bundle - secret: - defaultMode: 420 - secretName: combined-ca-bundle - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: ovn-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: ovn-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: ovn - osaee: "true" - name: ovn-edpm-compute-no-nodes-edpm-compute-no-nodes - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-no-nodes -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: ovn-edpm-compute-no-nodes-edpm-compute-no-nodes - job-name: ovn-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: ovn-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: ovn - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.ovn - - -i - - ovn-edpm-compute-no-nodes-edpm-compute-no-nodes - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.ovn - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-no-nodes - edpm_service_type: ovn - foo: bar - - - imagePullPolicy: Always - name: ovn-edpm-compute-no-nodes-edpm-compute-no-nodes - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/openstack/configs/ovn/ovsdb-config - name: ovncontroller-config-0 - subPath: ovsdb-config - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-no-nodes - serviceAccountName: edpm-compute-no-nodes - terminationGracePeriodSeconds: 30 - volumes: - - configMap: - defaultMode: 420 - items: - - key: ovsdb-config - path: ovsdb-config - name: ovncontroller-config - name: ovncontroller-config-0 - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: neutron-metadata-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: neutron-metadata-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: neutron-metadata - osaee: "true" - name: neutron-metadata-edpm-compute-no-nodes-edpm-compute-no-nodes - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-no-nodes -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: neutron-metadata-edpm-compute-no-nodes-edpm-compute-no-nodes - job-name: neutron-metadata-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: neutron-metadata-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: neutron-metadata - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.neutron_metadata - - -i - - neutron-metadata-edpm-compute-no-nodes-edpm-compute-no-nodes - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.neutron_metadata - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-no-nodes - edpm_service_type: neutron-metadata - foo: bar - - - imagePullPolicy: Always - name: neutron-metadata-edpm-compute-no-nodes-edpm-compute-no-nodes - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/openstack/configs/neutron-metadata/10-neutron-metadata.conf - name: neutron-ovn-metadata-agent-neutron-config-0 - subPath: 10-neutron-metadata.conf - - mountPath: /var/lib/openstack/configs/neutron-metadata/05-nova-metadata.conf - name: nova-metadata-neutron-config-0 - subPath: 05-nova-metadata.conf - - mountPath: /var/lib/openstack/configs/neutron-metadata/httpd.conf - name: nova-metadata-neutron-config-1 - subPath: httpd.conf - - mountPath: /var/lib/openstack/configs/neutron-metadata/nova-metadata-config.json - name: nova-metadata-neutron-config-2 - subPath: nova-metadata-config.json - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-no-nodes - serviceAccountName: edpm-compute-no-nodes - terminationGracePeriodSeconds: 30 - volumes: - - name: neutron-ovn-metadata-agent-neutron-config-0 - secret: - defaultMode: 420 - items: - - key: 10-neutron-metadata.conf - path: 10-neutron-metadata.conf - secretName: neutron-ovn-metadata-agent-neutron-config - - name: nova-metadata-neutron-config-0 - secret: - defaultMode: 420 - items: - - key: 05-nova-metadata.conf - path: 05-nova-metadata.conf - secretName: nova-metadata-neutron-config - - name: nova-metadata-neutron-config-1 - secret: - defaultMode: 420 - items: - - key: httpd.conf - path: httpd.conf - secretName: nova-metadata-neutron-config - - name: nova-metadata-neutron-config-2 - secret: - defaultMode: 420 - items: - - key: nova-metadata-config.json - path: nova-metadata-config.json - secretName: nova-metadata-neutron-config - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: neutron-ovn-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: neutron-ovn-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: neutron-ovn - osaee: "true" - name: neutron-ovn-edpm-compute-no-nodes-edpm-compute-no-nodes - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-no-nodes -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: neutron-ovn-edpm-compute-no-nodes-edpm-compute-no-nodes - job-name: neutron-ovn-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: neutron-ovn-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: neutron-ovn - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.neutron_ovn - - -i - - neutron-ovn-edpm-compute-no-nodes-edpm-compute-no-nodes - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.neutron_ovn - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-no-nodes - edpm_service_type: neutron-ovn - foo: bar - - - imagePullPolicy: Always - name: neutron-ovn-edpm-compute-no-nodes-edpm-compute-no-nodes - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/openstack/configs/neutron-ovn/10-neutron-ovn.conf - name: neutron-ovn-agent-neutron-config-0 - subPath: 10-neutron-ovn.conf - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-no-nodes - serviceAccountName: edpm-compute-no-nodes - terminationGracePeriodSeconds: 30 - volumes: - - name: neutron-ovn-agent-neutron-config-0 - secret: - defaultMode: 420 - items: - - key: 10-neutron-ovn.conf - path: 10-neutron-ovn.conf - secretName: neutron-ovn-agent-neutron-config - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: neutron-sriov-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: neutron-sriov-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: neutron-sriov - osaee: "true" - name: neutron-sriov-edpm-compute-no-nodes-edpm-compute-no-nodes - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-no-nodes -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: neutron-sriov-edpm-compute-no-nodes-edpm-compute-no-nodes - job-name: neutron-sriov-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: neutron-sriov-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: neutron-sriov - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.neutron_sriov - - -i - - neutron-sriov-edpm-compute-no-nodes-edpm-compute-no-nodes - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.neutron_sriov - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-no-nodes - edpm_service_type: neutron-sriov - foo: bar - - - imagePullPolicy: Always - name: neutron-sriov-edpm-compute-no-nodes-edpm-compute-no-nodes - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/openstack/configs/neutron-sriov/10-neutron-sriov.conf - name: neutron-sriov-agent-neutron-config-0 - subPath: 10-neutron-sriov.conf - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-no-nodes - serviceAccountName: edpm-compute-no-nodes - terminationGracePeriodSeconds: 30 - volumes: - - name: neutron-sriov-agent-neutron-config-0 - secret: - defaultMode: 420 - items: - - key: 10-neutron-sriov.conf - path: 10-neutron-sriov.conf - secretName: neutron-sriov-agent-neutron-config - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: neutron-dhcp-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: neutron-dhcp-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: neutron-dhcp - osaee: "true" - name: neutron-dhcp-edpm-compute-no-nodes-edpm-compute-no-nodes - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-no-nodes -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: neutron-dhcp-edpm-compute-no-nodes-edpm-compute-no-nodes - job-name: neutron-dhcp-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: neutron-dhcp-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: neutron-dhcp - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.neutron_dhcp - - -i - - neutron-dhcp-edpm-compute-no-nodes-edpm-compute-no-nodes - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.neutron_dhcp - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-no-nodes - edpm_service_type: neutron-dhcp - foo: bar - - - imagePullPolicy: Always - name: neutron-dhcp-edpm-compute-no-nodes-edpm-compute-no-nodes - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/openstack/configs/neutron-dhcp/10-neutron-dhcp.conf - name: neutron-dhcp-agent-neutron-config-0 - subPath: 10-neutron-dhcp.conf - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-no-nodes - serviceAccountName: edpm-compute-no-nodes - terminationGracePeriodSeconds: 30 - volumes: - - name: neutron-dhcp-agent-neutron-config-0 - secret: - defaultMode: 420 - items: - - key: 10-neutron-dhcp.conf - path: 10-neutron-dhcp.conf - secretName: neutron-dhcp-agent-neutron-config - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: libvirt-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: libvirt-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: libvirt - osaee: "true" - name: libvirt-edpm-compute-no-nodes-edpm-compute-no-nodes - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-no-nodes -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: libvirt-edpm-compute-no-nodes-edpm-compute-no-nodes - job-name: libvirt-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: libvirt-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: libvirt - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.libvirt - - -i - - libvirt-edpm-compute-no-nodes-edpm-compute-no-nodes - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.libvirt - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-no-nodes - edpm_service_type: libvirt - foo: bar - - - imagePullPolicy: Always - name: libvirt-edpm-compute-no-nodes-edpm-compute-no-nodes - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/openstack/configs/libvirt/LibvirtPassword - name: libvirt-secret-0 - subPath: LibvirtPassword - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-no-nodes - serviceAccountName: edpm-compute-no-nodes - terminationGracePeriodSeconds: 30 - volumes: - - name: libvirt-secret-0 - secret: - defaultMode: 420 - items: - - key: LibvirtPassword - path: LibvirtPassword - secretName: libvirt-secret - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: nova-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: nova-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: nova - osaee: "true" - name: nova-edpm-compute-no-nodes-edpm-compute-no-nodes - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-no-nodes -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: nova-edpm-compute-no-nodes-edpm-compute-no-nodes - job-name: nova-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: nova-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: nova - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.nova - - -i - - nova-edpm-compute-no-nodes-edpm-compute-no-nodes - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.nova - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-no-nodes - edpm_service_type: nova - foo: bar - - - imagePullPolicy: Always - name: nova-edpm-compute-no-nodes-edpm-compute-no-nodes - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/openstack/configs/nova/01-nova.conf - name: nova-cell1-compute-config-0 - subPath: 01-nova.conf - - mountPath: /var/lib/openstack/configs/nova/nova-blank.conf - name: nova-cell1-compute-config-1 - subPath: nova-blank.conf - - mountPath: /var/lib/openstack/configs/nova/ssh-privatekey - name: nova-migration-ssh-key-0 - subPath: ssh-privatekey - - mountPath: /var/lib/openstack/configs/nova/ssh-publickey - name: nova-migration-ssh-key-1 - subPath: ssh-publickey - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-no-nodes - serviceAccountName: edpm-compute-no-nodes - terminationGracePeriodSeconds: 30 - volumes: - - name: nova-cell1-compute-config-0 - secret: - defaultMode: 420 - items: - - key: 01-nova.conf - path: 01-nova.conf - secretName: nova-cell1-compute-config - - name: nova-cell1-compute-config-1 - secret: - defaultMode: 420 - items: - - key: nova-blank.conf - path: nova-blank.conf - secretName: nova-cell1-compute-config - - name: nova-migration-ssh-key-0 - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh-privatekey - secretName: nova-migration-ssh-key - - name: nova-migration-ssh-key-1 - secret: - defaultMode: 420 - items: - - key: ssh-publickey - path: ssh-publickey - secretName: nova-migration-ssh-key - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes diff --git a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/01-dataplane-deploy.yaml b/tests/kuttl/tests/dataplane-deploy-no-nodes-test/01-dataplane-deploy.yaml deleted file mode 100644 index 2f68ffbfe..000000000 --- a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/01-dataplane-deploy.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneDeployment -metadata: - name: edpm-compute-no-nodes -spec: - nodeSets: - - edpm-compute-no-nodes - ansibleExtraVars: - foo: bar diff --git a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/02-assert.yaml b/tests/kuttl/tests/dataplane-deploy-no-nodes-test/02-assert.yaml deleted file mode 100644 index 24acc7e4c..000000000 --- a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/02-assert.yaml +++ /dev/null @@ -1,118 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 600 -collectors: -- type: command - command: oc logs -n openstack-operators -l openstack.org/operator-name=openstack - name: operator-logs ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: configure-os - osaee: "true" - name: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-no-nodes -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - annotations: - k8s.v1.cni.cncf.io/networks: '[]' - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes - job-name: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: configure-os - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.configure_os - - -i - - configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.configure_os - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-no-nodes - edpm_service_type: configure-os - foo: bar - - - imagePullPolicy: Always - name: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - dnsPolicy: ClusterFirst - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-no-nodes - serviceAccountName: edpm-compute-no-nodes - terminationGracePeriodSeconds: 30 - volumes: - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes -status: - conditions: - - status: "True" - type: Complete - ready: 0 - succeeded: 1 - terminating: 0 - uncountedTerminatedPods: {} diff --git a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/02-dataplane-deploy-services-override.yaml b/tests/kuttl/tests/dataplane-deploy-no-nodes-test/02-dataplane-deploy-services-override.yaml deleted file mode 100644 index 5786dd903..000000000 --- a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/02-dataplane-deploy-services-override.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneService -metadata: - name: custom-svc -spec: - label: custom-svc - playbookContents: | - - hosts: localhost - gather_facts: no - name: kuttl play - tasks: - - name: Sleep - command: sleep 1 - delegate_to: localhost ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneDeployment -metadata: - name: edpm-compute-no-nodes-ovrd -spec: - nodeSets: - - edpm-compute-no-nodes - servicesOverride: - - custom-svc diff --git a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/03-assert.yaml b/tests/kuttl/tests/dataplane-deploy-no-nodes-test/03-assert.yaml deleted file mode 100644 index bde378cf0..000000000 --- a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/03-assert.yaml +++ /dev/null @@ -1,67 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 600 -collectors: -- type: command - command: oc logs -n openstack-operators -l openstack.org/operator-name=openstack - name: operator-logs ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: edpm-compute-no-nodes - namespace: openstack-kuttl-tests -spec: - services: - - download-cache - - bootstrap - - configure-network - - validate-network - - install-os - - configure-os - - run-os - - install-certs - - ovn - - neutron-metadata - - neutron-ovn - - neutron-sriov - - neutron-dhcp - - libvirt - - nova - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - nodes: {} - nodeTemplate: - ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret -status: - observedGeneration: 1 - conditions: - - message: NodeSet Ready - reason: Ready - status: "True" - type: Ready - - message: Deployment completed - reason: Ready - status: "True" - type: DeploymentReady - - message: Input data complete - reason: Ready - status: "True" - type: InputReady - - message: NodeSetDNSDataReady ready - reason: Ready - status: "True" - type: NodeSetDNSDataReady - - message: NodeSetIPReservationReady ready - reason: Ready - status: "True" - type: NodeSetIPReservationReady - - message: ServiceAccount created - reason: Ready - status: "True" - type: ServiceAccountReady - - message: Setup complete - reason: Ready - status: "True" - type: SetupReady diff --git a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/03-update-ovn-cm.yaml b/tests/kuttl/tests/dataplane-deploy-no-nodes-test/03-update-ovn-cm.yaml deleted file mode 100644 index 98df55230..000000000 --- a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/03-update-ovn-cm.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: ovncontroller-config -data: - ovsdb-config: test-ovn-config-updated ---- -# Sleep for 30s, b/c this test is meant to assert that even though we've -# changed the above CM, the hash on the NodeSet does not change. -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: sleep 30 diff --git a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/04-assert.yaml b/tests/kuttl/tests/dataplane-deploy-no-nodes-test/04-assert.yaml deleted file mode 100644 index 471e3c211..000000000 --- a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/04-assert.yaml +++ /dev/null @@ -1,186 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 600 -collectors: -- type: command - command: oc logs -n openstack-operators -l openstack.org/operator-name=openstack - name: operator-logs ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: edpm-compute-no-nodes - namespace: openstack-kuttl-tests -spec: - services: - - download-cache - - bootstrap - - configure-network - - validate-network - - install-os - - configure-os - - run-os - - install-certs - - ovn - - neutron-metadata - - neutron-ovn - - neutron-sriov - - neutron-dhcp - - libvirt - - nova - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - nodes: {} - nodeTemplate: - ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret -status: - observedGeneration: 1 - conditions: - - message: NodeSet Ready - reason: Ready - status: "True" - type: Ready - - message: Deployment completed - reason: Ready - status: "True" - type: DeploymentReady - - message: Input data complete - reason: Ready - status: "True" - type: InputReady - - message: NodeSetDNSDataReady ready - reason: Ready - status: "True" - type: NodeSetDNSDataReady - - message: NodeSetIPReservationReady ready - reason: Ready - status: "True" - type: NodeSetIPReservationReady - - message: ServiceAccount created - reason: Ready - status: "True" - type: ServiceAccountReady - - message: Setup complete - reason: Ready - status: "True" - type: SetupReady ---- -apiVersion: batch/v1 -kind: Job -metadata: - labels: - app: openstackansibleee - job-name: ovn-edpm-compute-no-nodes-updated-ovn-cm-edpm-compute-no-nodes - openstackansibleee_cr: ovn-edpm-compute-no-nodes-updated-ovn-cm-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes-updated-ovn-cm - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: ovn - osaee: "true" - name: ovn-edpm-compute-no-nodes-updated-ovn-cm-edpm-compute-no-nodes - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-no-nodes-updated-ovn-cm -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - annotations: - k8s.v1.cni.cncf.io/networks: '[]' - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: ovn-edpm-compute-no-nodes-updated-ovn-cm-edpm-compute-no-nodes - openstackansibleee_cr: ovn-edpm-compute-no-nodes-updated-ovn-cm-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes-updated-ovn-cm - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: ovn - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.ovn - - -i - - ovn-edpm-compute-no-nodes-updated-ovn-cm-edpm-compute-no-nodes - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.ovn - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-no-nodes - edpm_service_type: ovn - edpm_services_override: [ovn] - - - imagePullPolicy: Always - name: ovn-edpm-compute-no-nodes-updated-ovn-cm-edpm-compute-no-nodes - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/openstack/configs/ovn/ovsdb-config - name: ovncontroller-config-0 - subPath: ovsdb-config - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - dnsPolicy: ClusterFirst - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-no-nodes - serviceAccountName: edpm-compute-no-nodes - terminationGracePeriodSeconds: 30 - volumes: - - configMap: - defaultMode: 420 - items: - - key: ovsdb-config - path: ovsdb-config - name: ovncontroller-config - name: ovncontroller-config-0 - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes -status: - conditions: - - status: "True" - type: Complete - ready: 0 - succeeded: 1 - terminating: 0 - uncountedTerminatedPods: {} diff --git a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/04-dataplane-deploy.yaml b/tests/kuttl/tests/dataplane-deploy-no-nodes-test/04-dataplane-deploy.yaml deleted file mode 100644 index 5295f1181..000000000 --- a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/04-dataplane-deploy.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneDeployment -metadata: - name: edpm-compute-no-nodes-updated-ovn-cm -spec: - nodeSets: - - edpm-compute-no-nodes - servicesOverride: - - ovn diff --git a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/05-assert.yaml b/tests/kuttl/tests/dataplane-deploy-no-nodes-test/05-assert.yaml deleted file mode 100644 index 4bb03489f..000000000 --- a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/05-assert.yaml +++ /dev/null @@ -1,218 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 600 -collectors: -- type: command - command: oc logs -n openstack-operators -l openstack.org/operator-name=openstack - name: operator-logs ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: edpm-compute-no-nodes - namespace: openstack-kuttl-tests -spec: - services: - - download-cache - - bootstrap - - configure-network - - validate-network - - install-os - - configure-os - - run-os - - install-certs - - ovn - - neutron-metadata - - neutron-ovn - - neutron-sriov - - neutron-dhcp - - libvirt - - nova - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - nodes: {} - nodeTemplate: - ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret -status: - observedGeneration: 1 - conditions: - - message: Deployment error occurred in this-service-does-not-exist service error - OpenStackDataPlaneService.dataplane.openstack.org "this-service-does-not-exist" - not found - reason: Error - severity: Error - status: "False" - type: Ready - - message: Deployment error occurred in this-service-does-not-exist service error - OpenStackDataPlaneService.dataplane.openstack.org "this-service-does-not-exist" - not found - reason: Error - severity: Error - status: "False" - type: DeploymentReady - - message: Input data complete - reason: Ready - status: "True" - type: InputReady - - message: NodeSetDNSDataReady ready - reason: Ready - status: "True" - type: NodeSetDNSDataReady - - message: NodeSetIPReservationReady ready - reason: Ready - status: "True" - type: NodeSetIPReservationReady - - message: ServiceAccount created - reason: Ready - status: "True" - type: ServiceAccountReady - - message: Setup complete - reason: Ready - status: "True" - type: SetupReady - deploymentStatuses: - edpm-compute-no-nodes: - - message: Deployment completed - reason: Ready - status: "True" - type: NodeSetDeploymentReady - - message: Deployment ready for bootstrap service - reason: Ready - status: "True" - type: ServiceBootstrapDeploymentReady - - message: Deployment ready for configure-network service - reason: Ready - status: "True" - type: ServiceConfigureNetworkDeploymentReady - - message: Deployment ready for configure-os service - reason: Ready - status: "True" - type: ServiceConfigureOsDeploymentReady - - message: Deployment ready for download-cache service - reason: Ready - status: "True" - type: ServiceDownloadCacheDeploymentReady - - message: Deployment ready for install-certs service - reason: Ready - status: "True" - type: ServiceInstallCertsDeploymentReady - - message: Deployment ready for install-os service - reason: Ready - status: "True" - type: ServiceInstallOsDeploymentReady - - message: Deployment ready for libvirt service - reason: Ready - status: "True" - type: ServiceLibvirtDeploymentReady - - message: Deployment ready for neutron-dhcp service - reason: Ready - status: "True" - type: ServiceNeutronDhcpDeploymentReady - - message: Deployment ready for neutron-metadata service - reason: Ready - status: "True" - type: ServiceNeutronMetadataDeploymentReady - - message: Deployment ready for neutron-ovn service - reason: Ready - status: "True" - type: ServiceNeutronOvnDeploymentReady - - message: Deployment ready for neutron-sriov service - reason: Ready - status: "True" - type: ServiceNeutronSriovDeploymentReady - - message: Deployment ready for nova service - reason: Ready - status: "True" - type: ServiceNovaDeploymentReady - - message: Deployment ready for ovn service - reason: Ready - status: "True" - type: ServiceOvnDeploymentReady - - message: Deployment ready for run-os service - reason: Ready - status: "True" - type: ServiceRunOsDeploymentReady - - message: Deployment ready for validate-network service - reason: Ready - status: "True" - type: ServiceValidateNetworkDeploymentReady - edpm-compute-no-nodes-non-existent-service: - - message: Deployment error occurred in this-service-does-not-exist service error - OpenStackDataPlaneService.dataplane.openstack.org "this-service-does-not-exist" - not found - reason: Error - severity: Error - status: "False" - type: NodeSetDeploymentReady - - message: Deployment error occurred in this-service-does-not-exist service error - OpenStackDataPlaneService.dataplane.openstack.org "this-service-does-not-exist" - not found - reason: Error - severity: Error - status: "False" - type: ServiceThisServiceDoesNotExistDeploymentReady - edpm-compute-no-nodes-ovrd: - - message: Deployment completed - reason: Ready - status: "True" - type: NodeSetDeploymentReady - - message: Deployment ready for custom-svc service - reason: Ready - status: "True" - type: ServiceCustomSvcDeploymentReady - edpm-compute-no-nodes-updated-ovn-cm: - - message: Deployment completed - reason: Ready - status: "True" - type: NodeSetDeploymentReady - - message: Deployment ready for ovn service - reason: Ready - status: "True" - type: ServiceOvnDeploymentReady ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneDeployment -metadata: - name: edpm-compute-no-nodes-non-existent-service - namespace: openstack-kuttl-tests -spec: - nodeSets: - - edpm-compute-no-nodes - servicesOverride: - - this-service-does-not-exist -status: - observedGeneration: 1 - conditions: - - message: 'Deployment error occurred nodeSet: edpm-compute-no-nodes error: OpenStackDataPlaneService.dataplane.openstack.org - "this-service-does-not-exist" not found' - reason: Error - severity: Warning - status: "False" - type: Ready - - message: 'Deployment error occurred nodeSet: edpm-compute-no-nodes error: OpenStackDataPlaneService.dataplane.openstack.org - "this-service-does-not-exist" not found' - reason: Error - severity: Warning - status: "False" - type: DeploymentReady - - message: Input data complete - reason: Ready - status: "True" - type: InputReady - nodeSetConditions: - edpm-compute-no-nodes: - - message: Deployment error occurred in this-service-does-not-exist service error - OpenStackDataPlaneService.dataplane.openstack.org "this-service-does-not-exist" - not found - reason: Error - severity: Error - status: "False" - type: NodeSetDeploymentReady - - message: Deployment error occurred in this-service-does-not-exist service error - OpenStackDataPlaneService.dataplane.openstack.org "this-service-does-not-exist" - not found - reason: Error - severity: Error - status: "False" - type: ServiceThisServiceDoesNotExistDeploymentReady diff --git a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/05-dataplane-deploy-service-not-found.yaml b/tests/kuttl/tests/dataplane-deploy-no-nodes-test/05-dataplane-deploy-service-not-found.yaml deleted file mode 100644 index 76b2f46eb..000000000 --- a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/05-dataplane-deploy-service-not-found.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneDeployment -metadata: - name: edpm-compute-no-nodes-non-existent-service -spec: - nodeSets: - - edpm-compute-no-nodes - servicesOverride: - - this-service-does-not-exist diff --git a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/06-add-nodeset.yaml b/tests/kuttl/tests/dataplane-deploy-no-nodes-test/06-add-nodeset.yaml deleted file mode 100644 index e24b42809..000000000 --- a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/06-add-nodeset.yaml +++ /dev/null @@ -1,44 +0,0 @@ -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: edpm-compute-beta-nodeset -spec: - baremetalSetTemplate: - automatedCleaningMode: metadata - bmhNamespace: openshift-machine-api - cloudUserName: "" - ctlplaneInterface: "" - ctlplaneNetmask: 255.255.255.0 - deploymentSSHSecret: "" - hardwareReqs: - cpuReqs: - countReq: {} - mhzReq: {} - diskReqs: - gbReq: {} - ssdReq: {} - memReqs: - gbReq: {} - preProvisioned: true - services: - - download-cache - - bootstrap - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - nodes: {} - nodeTemplate: - ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret - ansible: - ansibleUser: cloud-admin ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneDeployment -metadata: - name: edpm-multinodeset -spec: - nodeSets: - - edpm-compute-no-nodes - - edpm-compute-beta-nodeset - ansibleExtraVars: - foo: bar diff --git a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/06-assert.yaml b/tests/kuttl/tests/dataplane-deploy-no-nodes-test/06-assert.yaml deleted file mode 100644 index 4dad8c094..000000000 --- a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/06-assert.yaml +++ /dev/null @@ -1,287 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 600 -collectors: -- type: command - command: oc logs -n openstack-operators -l openstack.org/operator-name=openstack - name: operator-logs ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: edpm-compute-beta-nodeset - namespace: openstack-kuttl-tests -spec: - services: - - download-cache - - bootstrap - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - nodes: {} - nodeTemplate: - ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret -status: - conditions: - - message: NodeSet Ready - reason: Ready - status: "True" - type: Ready - - message: Deployment completed - reason: Ready - status: "True" - type: DeploymentReady - - message: Input data complete - reason: Ready - status: "True" - type: InputReady - - message: NodeSetDNSDataReady ready - reason: Ready - status: "True" - type: NodeSetDNSDataReady - - message: NodeSetIPReservationReady ready - reason: Ready - status: "True" - type: NodeSetIPReservationReady - - message: ServiceAccount created - reason: Ready - status: "True" - type: ServiceAccountReady - - message: Setup complete - reason: Ready - status: "True" - type: SetupReady - configMapHashes: - ovncontroller-config: n56h54bh9bhcbh65ch9fhdh66dh95h5dch569h678h7fh599h7ch84h597h59h54dh58dhf6h66bh565h4hc4h587h645hd7hcch5d8h5f4h55cq - secretHashes: - neutron-dhcp-agent-neutron-config: n68h676h98h689hd4h575h5dbh694h6fh688h57h665h5c5h56dh5ddh65bh5d7h5cdh644hb8h8fh5d9h5b9h555h9ch56dh5fh6chd4h5c5h5c5h68q - neutron-ovn-agent-neutron-config: n5f4h89hb8h645h55bh657h9fh5d9h5c6h595h9dh667h5f4hfhffh7fh685h56ch57fh679h5ddh5ddh95h696hbch5c7h669h84h54dh685hfh85q - neutron-ovn-metadata-agent-neutron-config: n68dh585h666h5c4h568hf7h65fh695h649hb9h657h5f6h548h679h77h5b4h664h8h5b8h654h5hf5h674h664h545h74h58ch57ch8ch56h54fh5ddq - neutron-sriov-agent-neutron-config: n685h567h697h5bch8ch5cfh87h698h658h684h8h99h5dch5c5h699h79hb5h87h66dh664h546h586h7bh56fh5d6h5d4h566h56bh87h678h696h56cq - nova-cell1-compute-config: n89hd6h5h545h644h58h556hd9h5c5h598hd4h7bh5f9h5bdh649hb5h99h686h677h8ch575h665h574h587h5b6h5ddh8fh687h9bh657h675h97q - nova-metadata-neutron-config: n7fh696h674h5b9h68dh77h677h5c5hd9h5dbh89h646h696h65ch64bh86hd8h56h78h558h5h5c7h87h86h5bh5bch78h6ch5cbh54fh56fhfdq ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneDeployment -metadata: - name: edpm-multinodeset - namespace: openstack-kuttl-tests -spec: - nodeSets: - - edpm-compute-no-nodes - - edpm-compute-beta-nodeset ---- -apiVersion: batch/v1 -kind: Job -metadata: - labels: - app: openstackansibleee - job-name: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset - openstackansibleee_cr: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset - openstackdataplanedeployment: edpm-multinodeset - openstackdataplanenodeset: edpm-compute-beta-nodeset - openstackdataplaneservice: bootstrap - osaee: "true" - name: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-multinodeset -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset - job-name: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset - openstackansibleee_cr: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset - openstackdataplanedeployment: edpm-multinodeset - openstackdataplanenodeset: edpm-compute-beta-nodeset - openstackdataplaneservice: bootstrap - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.bootstrap - - -i - - bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.bootstrap - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-beta-nodeset - edpm_service_type: bootstrap - foo: bar - - - imagePullPolicy: Always - name: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - dnsPolicy: ClusterFirst - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-beta-nodeset - serviceAccountName: edpm-compute-beta-nodeset - terminationGracePeriodSeconds: 30 - volumes: - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-beta-nodeset -status: - conditions: - - status: "True" - type: Complete - ready: 0 - succeeded: 1 - terminating: 0 - uncountedTerminatedPods: {} ---- -apiVersion: batch/v1 -kind: Job -metadata: - labels: - app: openstackansibleee - job-name: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset - openstackansibleee_cr: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset - openstackdataplanedeployment: edpm-multinodeset - openstackdataplanenodeset: edpm-compute-beta-nodeset - openstackdataplaneservice: download-cache - osaee: "true" - name: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-multinodeset -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - annotations: - k8s.v1.cni.cncf.io/networks: '[]' - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset - job-name: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset - openstackansibleee_cr: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset - openstackdataplanedeployment: edpm-multinodeset - openstackdataplanenodeset: edpm-compute-beta-nodeset - openstackdataplaneservice: download-cache - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - osp.edpm.download_cache - - -i - - download-cache-edpm-multinodeset-edpm-compute-beta-nodeset - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - osp.edpm.download_cache - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-beta-nodeset - edpm_service_type: download-cache - foo: bar - - - imagePullPolicy: Always - name: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - dnsPolicy: ClusterFirst - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-beta-nodeset - serviceAccountName: edpm-compute-beta-nodeset - terminationGracePeriodSeconds: 30 - volumes: - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-beta-nodeset -status: - conditions: - - status: "True" - type: Complete - ready: 0 - succeeded: 1 - terminating: 0 - uncountedTerminatedPods: {} diff --git a/tests/kuttl/tests/dataplane-deploy-tls-test/00-assert.yaml b/tests/kuttl/tests/dataplane-deploy-tls-test/00-assert.yaml deleted file mode 100644 index f7c4bd0e5..000000000 --- a/tests/kuttl/tests/dataplane-deploy-tls-test/00-assert.yaml +++ /dev/null @@ -1,217 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 600 -collectors: -- type: command - command: oc logs -n openstack-operators -l openstack.org/operator-name=openstack - name: operator-logs ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneService -metadata: - name: tls-dnsnames -spec: - caCerts: combined-ca-bundle - tlsCerts: - default: - contents: - - dnsnames - second: - contents: - - ips - playbookContents: | - - hosts: localhost - gather_facts: no - name: kuttl play - tasks: - - name: Sleep - command: sleep 1 - delegate_to: localhost ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneService -metadata: - name: install-certs-ovrd -spec: - addCertMounts: True - playbookContents: | - - hosts: localhost - gather_facts: no - name: kuttl play - tasks: - - name: Sleep - command: sleep 1 - delegate_to: localhost ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: openstack-edpm-tls -spec: - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - nodes: - edpm-compute-0: - hostName: edpm-compute-0 - networks: - - name: ctlplane - subnetName: subnet1 - defaultRoute: true - fixedIP: 192.168.122.100 - - name: internalapi - subnetName: subnet1 - - name: storage - subnetName: subnet1 - - name: tenant - subnetName: subnet1 - - nodeTemplate: - ansible: - ansiblePort: 22 - ansibleUser: cloud-admin - ansibleVarsFrom: - - prefix: edpm_ - configMapRef: - name: network-config-template - ansibleVars: - timesync_ntp_servers: - - hostname: clock.redhat.com - edpm_network_config_hide_sensitive_logs: false - edpm_nodes_validation_validate_controllers_icmp: false - edpm_nodes_validation_validate_gateway_icmp: false - edpm_selinux_mode: enforcing - edpm_sshd_allowed_ranges: - - 192.168.122.0/24 - edpm_sshd_configure_firewall: true - enable_debug: false - ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret - preProvisioned: true - tlsEnabled: true - services: - - install-certs-ovrd - - tls-dnsnames -status: - observedGeneration: 1 - conditions: - - message: Deployment not started - reason: Requested - status: "False" - type: Ready - - message: Deployment not started - reason: Requested - status: "False" - type: DeploymentReady - - message: Input data complete - reason: Ready - status: "True" - type: InputReady - - message: NodeSetDNSDataReady ready - reason: Ready - status: "True" - type: NodeSetDNSDataReady - - message: NodeSetIPReservationReady ready - reason: Ready - status: "True" - type: NodeSetIPReservationReady - - message: ServiceAccount created - reason: Ready - status: "True" - type: ServiceAccountReady - - message: Setup complete - reason: Ready - status: "True" - type: SetupReady ---- -apiVersion: network.openstack.org/v1beta1 -kind: IPSet -metadata: - name: edpm-compute-0 -spec: - immutable: false - networks: - - defaultRoute: true - name: ctlplane - subnetName: subnet1 - - name: internalapi - subnetName: subnet1 - - name: storage - subnetName: subnet1 - - name: tenant - subnetName: subnet1 -status: - conditions: - - message: Setup complete - reason: Ready - status: "True" - type: Ready - - message: Input data complete - reason: Ready - status: "True" - type: InputReady - - message: Reservation successful - reason: Ready - status: "True" - type: ReservationReady - reservations: - - address: 192.168.122.100 - cidr: 192.168.122.0/24 - dnsDomain: ctlplane.example.com - gateway: 192.168.122.1 - mtu: 1500 - network: ctlplane - routes: - - destination: 0.0.0.0/0 - nexthop: 192.168.122.1 - subnet: subnet1 - - address: 172.17.0.100 - cidr: 172.17.0.0/24 - dnsDomain: internalapi.example.com - mtu: 1500 - network: internalapi - subnet: subnet1 - vlan: 20 - - address: 172.18.0.100 - cidr: 172.18.0.0/24 - dnsDomain: storage.example.com - mtu: 1500 - network: storage - subnet: subnet1 - vlan: 21 - - address: 172.19.0.100 - cidr: 172.19.0.0/24 - dnsDomain: tenant.example.com - mtu: 1500 - network: tenant - subnet: subnet1 - vlan: 22 ---- -apiVersion: network.openstack.org/v1beta1 -kind: DNSData -metadata: - name: openstack-edpm-tls -spec: - dnsDataLabelSelectorValue: dnsdata - hosts: - - hostnames: - - edpm-compute-0.ctlplane.example.com - ip: 192.168.122.100 - - hostnames: - - edpm-compute-0.internalapi.example.com - ip: 172.17.0.100 - - hostnames: - - edpm-compute-0.storage.example.com - ip: 172.18.0.100 - - hostnames: - - edpm-compute-0.tenant.example.com - ip: 172.19.0.100 -status: - conditions: - - message: Setup complete - reason: Ready - status: "True" - type: Ready - - message: Input data complete - reason: Ready - status: "True" - type: ServiceConfigReady diff --git a/tests/kuttl/tests/dataplane-deploy-tls-test/00-dataplane-create.yaml b/tests/kuttl/tests/dataplane-deploy-tls-test/00-dataplane-create.yaml deleted file mode 100644 index c84c2fd34..000000000 --- a/tests/kuttl/tests/dataplane-deploy-tls-test/00-dataplane-create.yaml +++ /dev/null @@ -1,127 +0,0 @@ -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneService -metadata: - name: tls-dnsnames -spec: - caCerts: combined-ca-bundle - tlsCerts: - default: - contents: - - dnsnames - second: - contents: - - ips - playbookContents: | - - hosts: localhost - gather_facts: no - name: kuttl play - tasks: - - name: Sleep - command: sleep 1 - delegate_to: localhost ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneService -metadata: - name: install-certs-ovrd -spec: - addCertMounts: True - playbookContents: | - - hosts: localhost - gather_facts: no - name: kuttl play - tasks: - - name: Sleep - command: sleep 1 - delegate_to: localhost ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: network-config-template -data: - network_config_template: | - --- - {% set mtu_list = [ctlplane_mtu] %} - {% for network in nodeset_networks %} - {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} - {%- endfor %} - {% set min_viable_mtu = mtu_list | max %} - network_config: - - type: ovs_bridge - name: {{ neutron_physical_bridge_name }} - mtu: {{ min_viable_mtu }} - use_dhcp: false - dns_servers: {{ ctlplane_dns_nameservers }} - domain: {{ dns_search_domains }} - addresses: - - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }} - routes: {{ ctlplane_host_routes }} - members: - - type: interface - name: nic1 - mtu: {{ min_viable_mtu }} - # force the MAC address of the bridge to this interface - primary: true - {% for network in nodeset_networks %} - - type: vlan - mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }} - vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }} - addresses: - - ip_netmask: - {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }} - routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }} - {% endfor %} ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: openstack-edpm-tls -spec: - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - services: - - install-certs-ovrd - - tls-dnsnames - preProvisioned: true - tlsEnabled: true - nodes: - edpm-compute-0: - hostName: edpm-compute-0 - networks: - - name: ctlplane - subnetName: subnet1 - defaultRoute: true - fixedIP: 192.168.122.100 - - name: internalapi - subnetName: subnet1 - - name: storage - subnetName: subnet1 - - name: tenant - subnetName: subnet1 - nodeTemplate: - ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret - ansible: - ansibleUser: cloud-admin - ansiblePort: 22 - ansibleVarsFrom: - - prefix: edpm_ - configMapRef: - name: network-config-template - ansibleVars: - timesync_ntp_servers: - - hostname: clock.redhat.com - # edpm_network_config - # Default nic config template for a EDPM compute node - # These vars are edpm_network_config role vars - edpm_network_config_hide_sensitive_logs: false - edpm_nodes_validation_validate_controllers_icmp: false - edpm_nodes_validation_validate_gateway_icmp: false - gather_facts: false - enable_debug: false - # edpm firewall, change the allowed CIDR if needed - edpm_sshd_configure_firewall: true - edpm_sshd_allowed_ranges: ['192.168.122.0/24'] - # SELinux module - edpm_selinux_mode: enforcing diff --git a/tests/kuttl/tests/dataplane-deploy-tls-test/01-create-cert-issuers.yaml b/tests/kuttl/tests/dataplane-deploy-tls-test/01-create-cert-issuers.yaml deleted file mode 100644 index 19b614ec4..000000000 --- a/tests/kuttl/tests/dataplane-deploy-tls-test/01-create-cert-issuers.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: | - function wait_for() { - timeout=$1 - shift 1 - until [ $timeout -le 0 ] || ("$@" &> /dev/null); do - echo waiting for "$@" - sleep 1 - timeout=$(( timeout - 1 )) - done - if [ $timeout -le 0 ]; then - return 1 - fi - } - - if oc get secret combined-ca-bundle -n openstack-kuttl-tests; then oc delete secret combined-ca-bundle -n openstack-kuttl-tests; fi - oc apply -f ./certs.yaml - wait_for 100 oc get secret osp-rootca-secret -n openstack-kuttl-tests - CA_CRT=$(oc get secret osp-rootca-secret -n openstack-kuttl-tests -o json|jq -r '.data."ca.crt"') - oc create secret generic combined-ca-bundle -n openstack-kuttl-tests --from-literal=tls-ca-bundle.pem=$CA_CRT diff --git a/tests/kuttl/tests/dataplane-deploy-tls-test/02-assert.yaml b/tests/kuttl/tests/dataplane-deploy-tls-test/02-assert.yaml deleted file mode 100644 index 6784278a5..000000000 --- a/tests/kuttl/tests/dataplane-deploy-tls-test/02-assert.yaml +++ /dev/null @@ -1,386 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: cert-tls-dnsnames-default-edpm-compute-0 - annotations: - cert-manager.io/certificate-name: tls-dnsnames-default-edpm-compute-0 - cert-manager.io/issuer-group: cert-manager.io - cert-manager.io/issuer-kind: Issuer - cert-manager.io/issuer-name: rootca-internal - labels: - hostname: edpm-compute-0 - osdp-service: tls-dnsnames - osdp-service-cert-key: default - osdpns: openstack-edpm-tls -type: kubernetes.io/tls ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - labels: - hostname: edpm-compute-0 - osdp-service: tls-dnsnames - osdp-service-cert-key: default - osdpns: openstack-edpm-tls - name: tls-dnsnames-default-edpm-compute-0 - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - kind: OpenStackDataPlaneNodeSet - name: openstack-edpm-tls -spec: - issuerRef: - group: cert-manager.io - kind: Issuer - name: rootca-internal - secretName: cert-tls-dnsnames-default-edpm-compute-0 - secretTemplate: - labels: - hostname: edpm-compute-0 - osdp-service: tls-dnsnames - osdpns: openstack-edpm-tls ---- -# validate the alt-names and usages - which is a list with elements that can be in any order -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -commands: - - script: | - template='{{index .spec.dnsNames }}' - names=$(oc get certificate tls-dnsnames-default-edpm-compute-0 -n openstack-kuttl-tests -o go-template="$template") - echo $names > test123.data - regex="(?=.*(edpm-compute-0\.internalapi\.example\.com))(?=.*(edpm-compute-0\.storage\.example\.com))(?=.*(edpm-compute-0\.tenant\.example\.com))(?=.*(edpm-compute-0\.ctlplane\.example\.com))" - matches=$(grep -P "$regex" test123.data) - rm test123.data - if [ -z "$matches" ]; then - echo "bad dnsnames match: $names" - exit 1 - else - exit 0 - fi - - script: | - template='{{index .spec.usages }}' - usages=$(oc get certificate tls-dnsnames-default-edpm-compute-0 -n openstack-kuttl-tests -o go-template="$template") - echo $usages > test123.data - regex="(?=.*(key encipherment))(?=.*(digital signature))(?=.*(server auth))" - matches=$(grep -P "$regex" test123.data) - rm test123.data - if [ -z "$matches" ]; then - echo "bad usages match: $usages" - exit 1 - else - exit 0 - fi ---- -apiVersion: v1 -kind: Secret -metadata: - name: cert-tls-dnsnames-second-edpm-compute-0 - annotations: - cert-manager.io/certificate-name: tls-dnsnames-second-edpm-compute-0 - cert-manager.io/issuer-group: cert-manager.io - cert-manager.io/issuer-kind: Issuer - cert-manager.io/issuer-name: rootca-internal - labels: - hostname: edpm-compute-0 - osdp-service: tls-dnsnames - osdp-service-cert-key: second - osdpns: openstack-edpm-tls -type: kubernetes.io/tls ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - labels: - hostname: edpm-compute-0 - osdp-service: tls-dnsnames - osdp-service-cert-key: second - osdpns: openstack-edpm-tls - name: tls-dnsnames-second-edpm-compute-0 - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - kind: OpenStackDataPlaneNodeSet - name: openstack-edpm-tls -spec: - issuerRef: - group: cert-manager.io - kind: Issuer - name: rootca-internal - secretName: cert-tls-dnsnames-second-edpm-compute-0 - secretTemplate: - labels: - hostname: edpm-compute-0 - osdp-service: tls-dnsnames - osdpns: openstack-edpm-tls ---- -apiVersion: v1 -kind: Secret -metadata: - name: openstack-edpm-tls-tls-dnsnames-default-certs-0 - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - kind: OpenStackDataPlaneNodeSet - name: openstack-edpm-tls -type: Opaque ---- -apiVersion: v1 -kind: Secret -metadata: - name: openstack-edpm-tls-tls-dnsnames-second-certs-0 - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - kind: OpenStackDataPlaneNodeSet - name: openstack-edpm-tls -type: Opaque ---- -apiVersion: batch/v1 -kind: Job -metadata: - labels: - app: openstackansibleee - job-name: install-certs-ovrd-openstack-edpm-tls-openstack-edpm-tls - openstackansibleee_cr: install-certs-ovrd-openstack-edpm-tls-openstack-edpm-tls - openstackdataplanedeployment: openstack-edpm-tls - openstackdataplanenodeset: openstack-edpm-tls - openstackdataplaneservice: install-certs-ovrd - osaee: "true" - name: install-certs-ovrd-openstack-edpm-tls-openstack-edpm-tls - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: openstack-edpm-tls -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - annotations: - k8s.v1.cni.cncf.io/networks: '[]' - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: install-certs-ovrd-openstack-edpm-tls-openstack-edpm-tls - job-name: install-certs-ovrd-openstack-edpm-tls-openstack-edpm-tls - openstackansibleee_cr: install-certs-ovrd-openstack-edpm-tls-openstack-edpm-tls - openstackdataplanedeployment: openstack-edpm-tls - openstackdataplanenodeset: openstack-edpm-tls - openstackdataplaneservice: install-certs-ovrd - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - playbook.yaml - - -i - - install-certs-ovrd-openstack-edpm-tls-openstack-edpm-tls - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - - hosts: localhost - gather_facts: no - name: kuttl play - tasks: - - name: Sleep - command: sleep 1 - delegate_to: localhost - - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: openstack-edpm-tls - edpm_service_type: install-certs-ovrd - - - imagePullPolicy: Always - name: install-certs-ovrd-openstack-edpm-tls-openstack-edpm-tls - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/openstack/certs/tls-dnsnames/default - name: openstack-edpm-tls-tls-dnsnames-default-certs-0 - - mountPath: /var/lib/openstack/certs/tls-dnsnames/second - name: openstack-edpm-tls-tls-dnsnames-second-certs-0 - - mountPath: /var/lib/openstack/cacerts/tls-dnsnames - name: tls-dnsnames-combined-ca-bundle - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: openstack-edpm-tls - serviceAccountName: openstack-edpm-tls - terminationGracePeriodSeconds: 30 - volumes: - - name: openstack-edpm-tls-tls-dnsnames-default-certs-0 - projected: - defaultMode: 420 - sources: - - secret: - name: openstack-edpm-tls-tls-dnsnames-default-certs-0 - - name: openstack-edpm-tls-tls-dnsnames-second-certs-0 - projected: - defaultMode: 420 - sources: - - secret: - name: openstack-edpm-tls-tls-dnsnames-second-certs-0 - - name: tls-dnsnames-combined-ca-bundle - secret: - defaultMode: 420 - secretName: combined-ca-bundle - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-openstack-edpm-tls -status: - conditions: - - status: "True" - type: Complete - ready: 0 - succeeded: 1 - terminating: 0 - uncountedTerminatedPods: {} ---- -apiVersion: batch/v1 -kind: Job -metadata: - labels: - app: openstackansibleee - job-name: tls-dnsnames-openstack-edpm-tls-openstack-edpm-tls - openstackansibleee_cr: tls-dnsnames-openstack-edpm-tls-openstack-edpm-tls - openstackdataplanedeployment: openstack-edpm-tls - openstackdataplanenodeset: openstack-edpm-tls - openstackdataplaneservice: tls-dnsnames - osaee: "true" - name: tls-dnsnames-openstack-edpm-tls-openstack-edpm-tls - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: openstack-edpm-tls -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - annotations: - k8s.v1.cni.cncf.io/networks: '[]' - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: tls-dnsnames-openstack-edpm-tls-openstack-edpm-tls - job-name: tls-dnsnames-openstack-edpm-tls-openstack-edpm-tls - openstackansibleee_cr: tls-dnsnames-openstack-edpm-tls-openstack-edpm-tls - openstackdataplanedeployment: openstack-edpm-tls - openstackdataplanenodeset: openstack-edpm-tls - openstackdataplaneservice: tls-dnsnames - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - playbook.yaml - - -i - - tls-dnsnames-openstack-edpm-tls-openstack-edpm-tls - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - - hosts: localhost - gather_facts: no - name: kuttl play - tasks: - - name: Sleep - command: sleep 1 - delegate_to: localhost - - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: openstack-edpm-tls - edpm_service_type: tls-dnsnames - - - imagePullPolicy: Always - name: tls-dnsnames-openstack-edpm-tls-openstack-edpm-tls - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: openstack-edpm-tls - serviceAccountName: openstack-edpm-tls - terminationGracePeriodSeconds: 30 - volumes: - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-openstack-edpm-tls -status: - conditions: - - status: "True" - type: Complete - ready: 0 - succeeded: 1 - terminating: 0 - uncountedTerminatedPods: {} diff --git a/tests/kuttl/tests/dataplane-deploy-tls-test/02-dataplane-deploy.yaml b/tests/kuttl/tests/dataplane-deploy-tls-test/02-dataplane-deploy.yaml deleted file mode 100644 index 17c50468f..000000000 --- a/tests/kuttl/tests/dataplane-deploy-tls-test/02-dataplane-deploy.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneDeployment -metadata: - name: openstack-edpm-tls -spec: - nodeSets: - - openstack-edpm-tls diff --git a/tests/kuttl/tests/dataplane-deploy-tls-test/03-assert.yaml b/tests/kuttl/tests/dataplane-deploy-tls-test/03-assert.yaml deleted file mode 100644 index 8083b53d5..000000000 --- a/tests/kuttl/tests/dataplane-deploy-tls-test/03-assert.yaml +++ /dev/null @@ -1,370 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: cert-tls-dns-ips-default-edpm-compute-0 - annotations: - cert-manager.io/alt-names: edpm-compute-0.ctlplane.example.com - cert-manager.io/certificate-name: tls-dns-ips-default-edpm-compute-0 - cert-manager.io/ip-sans: 192.168.122.100 - cert-manager.io/issuer-group: cert-manager.io - cert-manager.io/issuer-kind: Issuer - cert-manager.io/issuer-name: rootca-internal - labels: - hostname: edpm-compute-0 - osdp-service: tls-dns-ips - osdp-service-cert-key: default - osdpns: openstack-edpm-tls -type: kubernetes.io/tls ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - labels: - hostname: edpm-compute-0 - osdp-service: tls-dns-ips - osdp-service-cert-key: default - osdpns: openstack-edpm-tls - name: tls-dns-ips-default-edpm-compute-0 - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - kind: OpenStackDataPlaneNodeSet - name: openstack-edpm-tls -spec: - dnsNames: - - edpm-compute-0.ctlplane.example.com - issuerRef: - group: cert-manager.io - kind: Issuer - name: rootca-internal - secretName: cert-tls-dns-ips-default-edpm-compute-0 - secretTemplate: - labels: - hostname: edpm-compute-0 - osdp-service: tls-dns-ips - osdp-service-cert-key: default - osdpns: openstack-edpm-tls ---- -apiVersion: v1 -kind: Secret -metadata: - name: cert-custom-tls-dns-default-edpm-compute-0 - annotations: - cert-manager.io/certificate-name: custom-tls-dns-default-edpm-compute-0 - cert-manager.io/issuer-group: cert-manager.io - cert-manager.io/issuer-kind: Issuer - cert-manager.io/issuer-name: rootca-internal - labels: - hostname: edpm-compute-0 - osdp-service: custom-tls-dns - osdp-service-cert-key: default - osdpns: openstack-edpm-tls -type: kubernetes.io/tls ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - labels: - hostname: edpm-compute-0 - osdp-service: custom-tls-dns - osdp-service-cert-key: default - osdpns: openstack-edpm-tls - name: custom-tls-dns-default-edpm-compute-0 - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - kind: OpenStackDataPlaneNodeSet - name: openstack-edpm-tls -spec: - issuerRef: - group: cert-manager.io - kind: Issuer - name: rootca-internal - secretName: cert-custom-tls-dns-default-edpm-compute-0 - secretTemplate: - labels: - hostname: edpm-compute-0 - osdp-service: custom-tls-dns - osdp-service-cert-key: default - osdpns: openstack-edpm-tls ---- -# validate the alt-names and usages - which is a list with elements that can be in any order -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -commands: - - script: | - template='{{index .spec.dnsNames }}' - names=$(oc get certificate custom-tls-dns-default-edpm-compute-0 -n openstack-kuttl-tests -o go-template="$template") - echo $names > test123.data - regex="(?=.*(edpm-compute-0\.internalapi\.example\.com))(?=.*(edpm-compute-0\.storage\.example\.com))(?=.*(edpm-compute-0\.tenant\.example\.com))(?=.*(edpm-compute-0\.ctlplane\.example\.com))" - matches=$(grep -P "$regex" test123.data) - rm test123.data - if [ -z "$matches" ]; then - echo "bad dnsnames match: $names" - exit 1 - else - exit 0 - fi - - script: | - template='{{index .spec.usages }}' - usages=$(oc get certificate custom-tls-dns-default-edpm-compute-0 -n openstack-kuttl-tests -o go-template="$template") - echo $usages > test123.data - regex="(?=.*(key encipherment))(?=.*(digital signature))(?=.*(server auth))(?=.*(client auth))" - matches=$(grep -P "$regex" test123.data) - rm test123.data - if [ -z "$matches" ]; then - echo "bad usages match: $usages" - exit 1 - else - exit 0 - fi ---- -apiVersion: v1 -kind: Secret -metadata: - name: openstack-edpm-tls-tls-dns-ips-default-certs-0 - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - kind: OpenStackDataPlaneNodeSet - name: openstack-edpm-tls -type: Opaque ---- -apiVersion: v1 -kind: Secret -metadata: - name: openstack-edpm-tls-custom-tls-dns-default-certs-0 - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - kind: OpenStackDataPlaneNodeSet - name: openstack-edpm-tls -type: Opaque ---- -apiVersion: batch/v1 -kind: Job -metadata: - labels: - app: openstackansibleee - job-name: tls-dns-ips-openstack-edpm-tls-ovrd-openstack-edpm-tls - openstackansibleee_cr: tls-dns-ips-openstack-edpm-tls-ovrd-openstack-edpm-tls - openstackdataplanedeployment: openstack-edpm-tls-ovrd - openstackdataplanenodeset: openstack-edpm-tls - openstackdataplaneservice: tls-dns-ips - osaee: "true" - name: tls-dns-ips-openstack-edpm-tls-ovrd-openstack-edpm-tls - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: openstack-edpm-tls-ovrd -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - annotations: - k8s.v1.cni.cncf.io/networks: '[]' - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: tls-dns-ips-openstack-edpm-tls-ovrd-openstack-edpm-tls - job-name: tls-dns-ips-openstack-edpm-tls-ovrd-openstack-edpm-tls - openstackansibleee_cr: tls-dns-ips-openstack-edpm-tls-ovrd-openstack-edpm-tls - openstackdataplanedeployment: openstack-edpm-tls-ovrd - openstackdataplanenodeset: openstack-edpm-tls - openstackdataplaneservice: tls-dns-ips - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - playbook.yaml - - -i - - tls-dns-ips-openstack-edpm-tls-ovrd-openstack-edpm-tls - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - - hosts: localhost - gather_facts: no - name: kuttl play - tasks: - - name: Sleep - command: sleep 1 - delegate_to: localhost - - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: openstack-edpm-tls - edpm_service_type: tls-dns-ips - edpm_services_override: [install-certs-ovrd tls-dns-ips custom-tls-dns] - - - imagePullPolicy: Always - name: tls-dns-ips-openstack-edpm-tls-ovrd-openstack-edpm-tls - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: openstack-edpm-tls - serviceAccountName: openstack-edpm-tls - terminationGracePeriodSeconds: 30 - volumes: - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-openstack-edpm-tls -status: - conditions: - - status: "True" - type: Complete - ready: 0 - succeeded: 1 - terminating: 0 - uncountedTerminatedPods: {} ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: custom-tls-dns-openstack-edpm-tls-ovrd-openstack-edpm-tls - openstackansibleee_cr: custom-tls-dns-openstack-edpm-tls-ovrd-openstack-edpm-tls - openstackdataplanedeployment: openstack-edpm-tls-ovrd - openstackdataplanenodeset: openstack-edpm-tls - openstackdataplaneservice: custom-tls-dns - osaee: "true" - name: custom-tls-dns-openstack-edpm-tls-ovrd-openstack-edpm-tls - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: openstack-edpm-tls-ovrd -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: custom-tls-dns-openstack-edpm-tls-ovrd-openstack-edpm-tls - job-name: custom-tls-dns-openstack-edpm-tls-ovrd-openstack-edpm-tls - openstackansibleee_cr: custom-tls-dns-openstack-edpm-tls-ovrd-openstack-edpm-tls - openstackdataplanedeployment: openstack-edpm-tls-ovrd - openstackdataplanenodeset: openstack-edpm-tls - openstackdataplaneservice: custom-tls-dns - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - playbook.yaml - - -i - - custom-tls-dns-openstack-edpm-tls-ovrd-openstack-edpm-tls - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - - hosts: localhost - gather_facts: no - name: kuttl play - tasks: - - name: Sleep - command: sleep 1 - delegate_to: localhost - - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: openstack-edpm-tls - edpm_service_type: custom-tls-dns - edpm_services_override: [install-certs-ovrd tls-dns-ips custom-tls-dns] - - - imagePullPolicy: Always - name: custom-tls-dns-openstack-edpm-tls-ovrd-openstack-edpm-tls - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: openstack-edpm-tls - serviceAccountName: openstack-edpm-tls - terminationGracePeriodSeconds: 30 - volumes: - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-openstack-edpm-tls -status: - conditions: - - status: "True" - type: Complete - ready: 0 - succeeded: 1 - terminating: 0 - uncountedTerminatedPods: {} diff --git a/tests/kuttl/tests/dataplane-deploy-tls-test/03-dataplane-deploy-services-override.yaml b/tests/kuttl/tests/dataplane-deploy-tls-test/03-dataplane-deploy-services-override.yaml deleted file mode 100644 index 921a1adb3..000000000 --- a/tests/kuttl/tests/dataplane-deploy-tls-test/03-dataplane-deploy-services-override.yaml +++ /dev/null @@ -1,74 +0,0 @@ ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneService -metadata: - name: tls-dns-ips -spec: - caCerts: combined-ca-bundle - tlsCerts: - default: - contents: - - dnsnames - - ips - issuer: osp-rootca-issuer-internal - networks: - - ctlplane - playbookContents: | - - hosts: localhost - gather_facts: no - name: kuttl play - tasks: - - name: Sleep - command: sleep 1 - delegate_to: localhost ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneService -metadata: - name: custom-tls-dns -spec: - caCerts: combined-ca-bundle - tlsCerts: - default: - contents: - - dnsnames - keyUsages: - - key encipherment - - digital signature - - server auth - - client auth - playbookContents: | - - hosts: localhost - gather_facts: no - name: kuttl play - tasks: - - name: Sleep - command: sleep 1 - delegate_to: localhost ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneService -metadata: - name: install-certs-ovrd -spec: - addCertMounts: True - playbookContents: | - - hosts: localhost - gather_facts: no - name: kuttl play - tasks: - - name: Sleep - command: sleep 1 - delegate_to: localhost ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneDeployment -metadata: - name: openstack-edpm-tls-ovrd -spec: - nodeSets: - - openstack-edpm-tls - servicesOverride: - - install-certs-ovrd - - tls-dns-ips - - custom-tls-dns diff --git a/tests/kuttl/tests/dataplane-deploy-tls-test/04-rotate-certs.yaml b/tests/kuttl/tests/dataplane-deploy-tls-test/04-rotate-certs.yaml deleted file mode 100644 index 8eab94f54..000000000 --- a/tests/kuttl/tests/dataplane-deploy-tls-test/04-rotate-certs.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - command: oc delete -n openstack-kuttl-tests secrets cert-custom-tls-dns-default-edpm-compute-0 cert-tls-dns-ips-default-edpm-compute-0 diff --git a/tests/kuttl/tests/dataplane-deploy-tls-test/05-assert.yaml b/tests/kuttl/tests/dataplane-deploy-tls-test/05-assert.yaml deleted file mode 100644 index 937239713..000000000 --- a/tests/kuttl/tests/dataplane-deploy-tls-test/05-assert.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 600 -commands: - - script: | - PNAME=`oc get pod -l job-name=install-certs-ovrd-certs-refresh-openstack-edpm-tls --field-selector status.phase=Succeeded -n openstack-kuttl-tests -o name` - echo $PNAME - if [ -z "$PNAME" ]; then - echo "Waiting for successful ansibleee pod" - exit 1 - fi - - serial1=`oc get secret cert-custom-tls-dns-default-edpm-compute-0 -n openstack-kuttl-tests -o json|jq -r '.data."tls.crt"'|base64 -d |openssl x509 -noout -serial` - echo "serial1:" $serial1 - serial2=`oc debug $PNAME -n openstack-kuttl-tests -- cat /var/lib/openstack/certs/custom-tls-dns/default/edpm-compute-0.ctlplane.example.com-tls.crt |openssl x509 -noout -serial` - echo "serial2:" $serial2 - if [ $serial1 != $serial2 ]; then - echo "serials for cert-custom-tls-dns-default-edpm-compute-0 not equal" - exit 1 - fi - - serial1=`oc get secret cert-tls-dns-ips-default-edpm-compute-0 -n openstack-kuttl-tests -o json|jq -r '.data."tls.crt"'|base64 -d |openssl x509 -noout -serial` - echo "serial1:" $serial1 - serial2=`oc debug $PNAME -n openstack-kuttl-tests -- cat /var/lib/openstack/certs/tls-dns-ips/default/edpm-compute-0.ctlplane.example.com-tls.crt |openssl x509 -noout -serial` - echo "serial2:" $serial2 - if [ $serial1 != $serial2 ]; then - echo "serials for cert-tls-dns-ips-default-edpm-compute-0 not equal" - exit 1 - fi - - exit 0 diff --git a/tests/kuttl/tests/dataplane-deploy-tls-test/05-dataplane-redeploy.yaml b/tests/kuttl/tests/dataplane-deploy-tls-test/05-dataplane-redeploy.yaml deleted file mode 100644 index 942fe5c1b..000000000 --- a/tests/kuttl/tests/dataplane-deploy-tls-test/05-dataplane-redeploy.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneDeployment -metadata: - name: certs-refresh -spec: - nodeSets: - - openstack-edpm-tls - servicesOverride: - - install-certs-ovrd - - tls-dns-ips - - custom-tls-dns diff --git a/tests/kuttl/tests/dataplane-deploy-tls-test/certs.yaml b/tests/kuttl/tests/dataplane-deploy-tls-test/certs.yaml deleted file mode 100644 index 7cffc290c..000000000 --- a/tests/kuttl/tests/dataplane-deploy-tls-test/certs.yaml +++ /dev/null @@ -1,38 +0,0 @@ -apiVersion: cert-manager.io/v1 -kind: Issuer -metadata: - name: selfsigned-issuer - namespace: openstack-kuttl-tests -spec: - selfSigned: {} ---- -# RootCA Certificate used to sign certificates -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: osp-rootca - namespace: openstack-kuttl-tests -spec: - isCA: true - commonName: osp-rootca - secretName: osp-rootca-secret - privateKey: - algorithm: ECDSA - size: 256 - issuerRef: - name: selfsigned-issuer - kind: Issuer - group: cert-manager.io ---- -# Issuer that uses the generated CA certificate to issue certs -apiVersion: cert-manager.io/v1 -kind: Issuer -metadata: - name: rootca-internal - namespace: openstack-kuttl-tests - labels: - osp-rootca-issuer-internal: "" -spec: - ca: - secretName: osp-rootca-secret ---- diff --git a/tests/kuttl/tests/dataplane-extramounts/00-assert.yaml b/tests/kuttl/tests/dataplane-extramounts/00-assert.yaml deleted file mode 100644 index 515feeec3..000000000 --- a/tests/kuttl/tests/dataplane-extramounts/00-assert.yaml +++ /dev/null @@ -1,138 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 600 -collectors: -- type: command - command: oc logs -n openstack-operators -l openstack.org/operator-name=openstack - name: operator-logs ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: edpm-extramounts -spec: - preProvisioned: true - services: - - test-service - nodes: {} - nodeTemplate: - extraMounts: - - extraVolType: edpm-ansible - mounts: - - mountPath: /usr/share/ansible/collections/ansible_collections/osp/edpm - name: edpm-ansible - volumes: - - name: edpm-ansible - persistentVolumeClaim: - claimName: edpm-ansible - readOnly: true ---- -apiVersion: batch/v1 -kind: Job -metadata: - labels: - app: openstackansibleee - job-name: test-service-edpm-extramounts-edpm-extramounts - openstackansibleee_cr: test-service-edpm-extramounts-edpm-extramounts - openstackdataplanedeployment: edpm-extramounts - openstackdataplanenodeset: edpm-extramounts - openstackdataplaneservice: test-service - osaee: "true" - name: test-service-edpm-extramounts-edpm-extramounts - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-extramounts -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - annotations: - k8s.v1.cni.cncf.io/networks: '[]' - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: test-service-edpm-extramounts-edpm-extramounts - job-name: test-service-edpm-extramounts-edpm-extramounts - openstackansibleee_cr: test-service-edpm-extramounts-edpm-extramounts - openstackdataplanedeployment: edpm-extramounts - openstackdataplanenodeset: edpm-extramounts - openstackdataplaneservice: test-service - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - test.yml - - -i - - test-service-edpm-extramounts-edpm-extramounts - env: - - name: RUNNER_PLAYBOOK - value: |2+ - - test.yml - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-extramounts - edpm_service_type: test-service - - - imagePullPolicy: Always - name: test-service-edpm-extramounts-edpm-extramounts - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /usr/share/ansible/collections/ansible_collections/osp/edpm - name: edpm-ansible - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - dnsPolicy: ClusterFirst - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-extramounts - serviceAccountName: edpm-extramounts - terminationGracePeriodSeconds: 30 - volumes: - - name: edpm-ansible - persistentVolumeClaim: - claimName: edpm-ansible - readOnly: true - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-extramounts -status: - active: 1 - ready: 0 - terminating: 0 - uncountedTerminatedPods: {} diff --git a/tests/kuttl/tests/dataplane-extramounts/00-dataplane-create.yaml b/tests/kuttl/tests/dataplane-extramounts/00-dataplane-create.yaml deleted file mode 100644 index 9069dea31..000000000 --- a/tests/kuttl/tests/dataplane-extramounts/00-dataplane-create.yaml +++ /dev/null @@ -1,37 +0,0 @@ -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneService -metadata: - name: test-service -spec: - label: test-service - playbook: test.yml ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: edpm-extramounts -spec: - preProvisioned: true - services: - - test-service - nodes: {} - nodeTemplate: - ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret - extraMounts: - - extraVolType: edpm-ansible - mounts: - - mountPath: /usr/share/ansible/collections/ansible_collections/osp/edpm - name: edpm-ansible - volumes: - - name: edpm-ansible - persistentVolumeClaim: - claimName: edpm-ansible - readOnly: true ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneDeployment -metadata: - name: edpm-extramounts -spec: - nodeSets: - - edpm-extramounts diff --git a/tests/kuttl/tests/dataplane-multinode-nodeset-create-test/00-assert.yaml b/tests/kuttl/tests/dataplane-multinode-nodeset-create-test/00-assert.yaml deleted file mode 100644 index 8070a10d0..000000000 --- a/tests/kuttl/tests/dataplane-multinode-nodeset-create-test/00-assert.yaml +++ /dev/null @@ -1,202 +0,0 @@ -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: openstack-edpm-multinode -status: - allHostnames: - edpm-compute-0: - ctlplane: edpm-compute-0.ctlplane.example.com - internalapi: edpm-compute-0.internalapi.example.com - storage: edpm-compute-0.storage.example.com - tenant: edpm-compute-0.tenant.example.com - edpm-compute-1: - ctlplane: edpm-compute-1.ctlplane.example.com - internalapi: edpm-compute-1.internalapi.example.com - storage: edpm-compute-1.storage.example.com - tenant: edpm-compute-1.tenant.example.com - allIPs: - edpm-compute-0: - ctlplane: 192.168.122.150 - internalapi: 172.17.0.150 - storage: 172.18.0.150 - tenant: 172.19.0.150 - edpm-compute-1: - ctlplane: 192.168.122.151 - internalapi: 172.17.0.151 - storage: 172.18.0.151 - tenant: 172.19.0.151 - observedGeneration: 1 - ctlplaneSearchDomain: ctlplane.example.com - conditions: - - message: Deployment not started - reason: Requested - status: "False" - type: Ready - - message: Deployment not started - reason: Requested - status: "False" - type: DeploymentReady - - message: Input data complete - reason: Ready - status: "True" - type: InputReady - - message: NodeSetDNSDataReady ready - reason: Ready - status: "True" - type: NodeSetDNSDataReady - - message: NodeSetIPReservationReady ready - reason: Ready - status: "True" - type: NodeSetIPReservationReady - - message: ServiceAccount created - reason: Ready - status: "True" - type: ServiceAccountReady - - message: Setup complete - reason: Ready - status: "True" - type: SetupReady ---- -apiVersion: network.openstack.org/v1beta1 -kind: IPSet -metadata: - name: edpm-compute-0 -status: - conditions: - - message: Setup complete - reason: Ready - status: "True" - type: Ready - - message: Input data complete - reason: Ready - status: "True" - type: InputReady - - message: Reservation successful - reason: Ready - status: "True" - type: ReservationReady - reservations: - - address: 192.168.122.150 - cidr: 192.168.122.0/24 - dnsDomain: ctlplane.example.com - gateway: 192.168.122.1 - mtu: 1500 - network: ctlplane - routes: - - destination: 0.0.0.0/0 - nexthop: 192.168.122.1 - subnet: subnet1 - - address: 172.17.0.150 - cidr: 172.17.0.0/24 - dnsDomain: internalapi.example.com - mtu: 1500 - network: internalapi - subnet: subnet1 - vlan: 20 - - address: 172.18.0.150 - cidr: 172.18.0.0/24 - dnsDomain: storage.example.com - mtu: 1500 - network: storage - subnet: subnet1 - vlan: 21 - - address: 172.19.0.150 - cidr: 172.19.0.0/24 - dnsDomain: tenant.example.com - mtu: 1500 - network: tenant - subnet: subnet1 - vlan: 22 ---- -apiVersion: network.openstack.org/v1beta1 -kind: IPSet -metadata: - name: edpm-compute-1 -status: - conditions: - - message: Setup complete - reason: Ready - status: "True" - type: Ready - - message: Input data complete - reason: Ready - status: "True" - type: InputReady - - message: Reservation successful - reason: Ready - status: "True" - type: ReservationReady - reservations: - - address: 192.168.122.151 - cidr: 192.168.122.0/24 - dnsDomain: ctlplane.example.com - gateway: 192.168.122.1 - mtu: 1500 - network: ctlplane - routes: - - destination: 0.0.0.0/0 - nexthop: 192.168.122.1 - subnet: subnet1 - - address: 172.17.0.151 - cidr: 172.17.0.0/24 - dnsDomain: internalapi.example.com - mtu: 1500 - network: internalapi - subnet: subnet1 - vlan: 20 - - address: 172.18.0.151 - cidr: 172.18.0.0/24 - dnsDomain: storage.example.com - mtu: 1500 - network: storage - subnet: subnet1 - vlan: 21 - - address: 172.19.0.151 - cidr: 172.19.0.0/24 - dnsDomain: tenant.example.com - mtu: 1500 - network: tenant - subnet: subnet1 - vlan: 22 ---- -apiVersion: network.openstack.org/v1beta1 -kind: DNSData -metadata: - name: openstack-edpm-multinode -spec: - dnsDataLabelSelectorValue: dnsdata - hosts: - - hostnames: - - edpm-compute-0.ctlplane.example.com - ip: 192.168.122.150 - - hostnames: - - edpm-compute-0.internalapi.example.com - ip: 172.17.0.150 - - hostnames: - - edpm-compute-0.storage.example.com - ip: 172.18.0.150 - - hostnames: - - edpm-compute-0.tenant.example.com - ip: 172.19.0.150 - - hostnames: - - edpm-compute-1.ctlplane.example.com - ip: 192.168.122.151 - - hostnames: - - edpm-compute-1.internalapi.example.com - ip: 172.17.0.151 - - hostnames: - - edpm-compute-1.storage.example.com - ip: 172.18.0.151 - - hostnames: - - edpm-compute-1.tenant.example.com - ip: 172.19.0.151 -status: - conditions: - - message: Setup complete - reason: Ready - status: "True" - type: Ready - - message: Input data complete - reason: Ready - status: "True" - type: ServiceConfigReady diff --git a/tests/kuttl/tests/dataplane-multinode-nodeset-create-test/00-dataplane-create.yaml b/tests/kuttl/tests/dataplane-multinode-nodeset-create-test/00-dataplane-create.yaml deleted file mode 100644 index 247cd9ecc..000000000 --- a/tests/kuttl/tests/dataplane-multinode-nodeset-create-test/00-dataplane-create.yaml +++ /dev/null @@ -1,118 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: network-config-template -data: - network_config_template: | - --- - {% set mtu_list = [ctlplane_mtu] %} - {% for network in nodeset_networks %} - {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} - {%- endfor %} - {% set min_viable_mtu = mtu_list | max %} - network_config: - - type: ovs_bridge - name: {{ neutron_physical_bridge_name }} - mtu: {{ min_viable_mtu }} - use_dhcp: false - dns_servers: {{ ctlplane_dns_nameservers }} - domain: {{ dns_search_domains }} - addresses: - - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }} - routes: {{ ctlplane_host_routes }} - members: - - type: interface - name: nic1 - mtu: {{ min_viable_mtu }} - # force the MAC address of the bridge to this interface - primary: true - {% for network in nodeset_networks %} - - type: vlan - mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }} - vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }} - addresses: - - ip_netmask: - {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }} - routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }} - {% endfor %} ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: openstack-edpm-multinode -spec: - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - services: - - download-cache - - bootstrap - - configure-network - - validate-network - - install-os - - configure-os - - run-os - - install-certs - - ovn - - neutron-metadata - - libvirt - - nova - preProvisioned: true - nodes: - edpm-compute-1: - hostName: edpm-compute-1 - networks: - - name: ctlplane - subnetName: subnet1 - defaultRoute: true - fixedIP: 192.168.122.151 - - name: internalapi - subnetName: subnet1 - fixedIP: 172.17.0.151 - - name: storage - subnetName: subnet1 - fixedIP: 172.18.0.151 - - name: tenant - subnetName: subnet1 - fixedIP: 172.19.0.151 - edpm-compute-0: - hostName: edpm-compute-0 - networks: - - name: ctlplane - subnetName: subnet1 - defaultRoute: true - fixedIP: 192.168.122.150 - - name: internalapi - subnetName: subnet1 - fixedIP: 172.17.0.150 - - name: storage - subnetName: subnet1 - fixedIP: 172.18.0.150 - - name: tenant - subnetName: subnet1 - fixedIP: 172.19.0.150 - nodeTemplate: - ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret - ansible: - ansibleUser: cloud-admin - ansiblePort: 22 - ansibleVarsFrom: - - prefix: edpm_ - configMapRef: - name: network-config-template - ansibleVars: - timesync_ntp_servers: - - hostname: clock.redhat.com - # edpm_network_config - # Default nic config template for a EDPM compute node - # These vars are edpm_network_config role vars - edpm_network_config_hide_sensitive_logs: false - edpm_nodes_validation_validate_controllers_icmp: false - edpm_nodes_validation_validate_gateway_icmp: false - gather_facts: false - enable_debug: false - # edpm firewall, change the allowed CIDR if needed - edpm_sshd_configure_firewall: true - edpm_sshd_allowed_ranges: ['192.168.122.0/24'] - # SELinux module - edpm_selinux_mode: enforcing diff --git a/tests/kuttl/tests/dataplane-multinode-nodeset-create-test/01-assert.yaml b/tests/kuttl/tests/dataplane-multinode-nodeset-create-test/01-assert.yaml deleted file mode 100644 index 9a46362e7..000000000 --- a/tests/kuttl/tests/dataplane-multinode-nodeset-create-test/01-assert.yaml +++ /dev/null @@ -1,98 +0,0 @@ -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: openstack-edpm-multinode -status: - allHostnames: - edpm-compute-0: - ctlplane: edpm-compute-0.ctlplane.example.com - internalapi: edpm-compute-0.internalapi.example.com - storage: edpm-compute-0.storage.example.com - tenant: edpm-compute-0.tenant.example.com - allIPs: - edpm-compute-0: - ctlplane: 192.168.122.150 - internalapi: 172.17.0.150 - storage: 172.18.0.150 - tenant: 172.19.0.150 - ctlplaneSearchDomain: ctlplane.example.com - conditions: - - message: Deployment not started - reason: Requested - status: "False" - type: Ready - - message: Deployment not started - reason: Requested - status: "False" - type: DeploymentReady - - message: Input data complete - reason: Ready - status: "True" - type: InputReady - - message: NodeSetDNSDataReady ready - reason: Ready - status: "True" - type: NodeSetDNSDataReady - - message: NodeSetIPReservationReady ready - reason: Ready - status: "True" - type: NodeSetIPReservationReady - - message: ServiceAccount created - reason: Ready - status: "True" - type: ServiceAccountReady - - message: Setup complete - reason: Ready - status: "True" - type: SetupReady ---- -apiVersion: network.openstack.org/v1beta1 -kind: IPSet -metadata: - name: edpm-compute-0 -status: - conditions: - - message: Setup complete - reason: Ready - status: "True" - type: Ready - - message: Input data complete - reason: Ready - status: "True" - type: InputReady - - message: Reservation successful - reason: Ready - status: "True" - type: ReservationReady - reservations: - - address: 192.168.122.150 - cidr: 192.168.122.0/24 - dnsDomain: ctlplane.example.com - gateway: 192.168.122.1 - mtu: 1500 - network: ctlplane - routes: - - destination: 0.0.0.0/0 - nexthop: 192.168.122.1 - subnet: subnet1 - - address: 172.17.0.150 - cidr: 172.17.0.0/24 - dnsDomain: internalapi.example.com - mtu: 1500 - network: internalapi - subnet: subnet1 - vlan: 20 - - address: 172.18.0.150 - cidr: 172.18.0.0/24 - dnsDomain: storage.example.com - mtu: 1500 - network: storage - subnet: subnet1 - vlan: 21 - - address: 172.19.0.150 - cidr: 172.19.0.0/24 - dnsDomain: tenant.example.com - mtu: 1500 - network: tenant - subnet: subnet1 - vlan: 22 diff --git a/tests/kuttl/tests/dataplane-multinode-nodeset-create-test/01-dataplane-scale-in.yaml b/tests/kuttl/tests/dataplane-multinode-nodeset-create-test/01-dataplane-scale-in.yaml deleted file mode 100644 index e12b9d990..000000000 --- a/tests/kuttl/tests/dataplane-multinode-nodeset-create-test/01-dataplane-scale-in.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: | - oc patch openstackdataplanenodeset/openstack-edpm-multinode -n openstack-kuttl-tests --type json --patch '[{ "op": "remove", "path": "/spec/nodes/edpm-compute-1" }]' diff --git a/tests/kuttl/tests/dataplane-multinode-nodeset-create-test/02-assert.yaml b/tests/kuttl/tests/dataplane-multinode-nodeset-create-test/02-assert.yaml deleted file mode 100644 index 04f53374b..000000000 --- a/tests/kuttl/tests/dataplane-multinode-nodeset-create-test/02-assert.yaml +++ /dev/null @@ -1,159 +0,0 @@ -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: openstack-edpm-multinode -status: - allHostnames: - edpm-compute-0: - ctlplane: edpm-compute-0.ctlplane.example.com - internalapi: edpm-compute-0.internalapi.example.com - storage: edpm-compute-0.storage.example.com - tenant: edpm-compute-0.tenant.example.com - edpm-compute-2: - ctlplane: edpm-compute-2.ctlplane.example.com - internalapi: edpm-compute-2.internalapi.example.com - storage: edpm-compute-2.storage.example.com - tenant: edpm-compute-2.tenant.example.com - allIPs: - edpm-compute-0: - ctlplane: 192.168.122.150 - internalapi: 172.17.0.150 - storage: 172.18.0.150 - tenant: 172.19.0.150 - edpm-compute-2: - ctlplane: 192.168.122.151 - internalapi: 172.17.0.151 - storage: 172.18.0.151 - tenant: 172.19.0.151 - ctlplaneSearchDomain: ctlplane.example.com - conditions: - - message: Deployment not started - reason: Requested - status: "False" - type: Ready - - message: Deployment not started - reason: Requested - status: "False" - type: DeploymentReady - - message: Input data complete - reason: Ready - status: "True" - type: InputReady - - message: NodeSetDNSDataReady ready - reason: Ready - status: "True" - type: NodeSetDNSDataReady - - message: NodeSetIPReservationReady ready - reason: Ready - status: "True" - type: NodeSetIPReservationReady - - message: ServiceAccount created - reason: Ready - status: "True" - type: ServiceAccountReady - - message: Setup complete - reason: Ready - status: "True" - type: SetupReady ---- -apiVersion: network.openstack.org/v1beta1 -kind: IPSet -metadata: - name: edpm-compute-0 -status: - conditions: - - message: Setup complete - reason: Ready - status: "True" - type: Ready - - message: Input data complete - reason: Ready - status: "True" - type: InputReady - - message: Reservation successful - reason: Ready - status: "True" - type: ReservationReady - reservations: - - address: 192.168.122.150 - cidr: 192.168.122.0/24 - dnsDomain: ctlplane.example.com - gateway: 192.168.122.1 - mtu: 1500 - network: ctlplane - routes: - - destination: 0.0.0.0/0 - nexthop: 192.168.122.1 - subnet: subnet1 - - address: 172.17.0.150 - cidr: 172.17.0.0/24 - dnsDomain: internalapi.example.com - mtu: 1500 - network: internalapi - subnet: subnet1 - vlan: 20 - - address: 172.18.0.150 - cidr: 172.18.0.0/24 - dnsDomain: storage.example.com - mtu: 1500 - network: storage - subnet: subnet1 - vlan: 21 - - address: 172.19.0.150 - cidr: 172.19.0.0/24 - dnsDomain: tenant.example.com - mtu: 1500 - network: tenant - subnet: subnet1 - vlan: 22 ---- -apiVersion: network.openstack.org/v1beta1 -kind: IPSet -metadata: - name: edpm-compute-2 -status: - conditions: - - message: Setup complete - reason: Ready - status: "True" - type: Ready - - message: Input data complete - reason: Ready - status: "True" - type: InputReady - - message: Reservation successful - reason: Ready - status: "True" - type: ReservationReady - reservations: - - address: 192.168.122.151 - cidr: 192.168.122.0/24 - dnsDomain: ctlplane.example.com - gateway: 192.168.122.1 - mtu: 1500 - network: ctlplane - routes: - - destination: 0.0.0.0/0 - nexthop: 192.168.122.1 - subnet: subnet1 - - address: 172.17.0.151 - cidr: 172.17.0.0/24 - dnsDomain: internalapi.example.com - mtu: 1500 - network: internalapi - subnet: subnet1 - vlan: 20 - - address: 172.18.0.151 - cidr: 172.18.0.0/24 - dnsDomain: storage.example.com - mtu: 1500 - network: storage - subnet: subnet1 - vlan: 21 - - address: 172.19.0.151 - cidr: 172.19.0.0/24 - dnsDomain: tenant.example.com - mtu: 1500 - network: tenant - subnet: subnet1 - vlan: 22 diff --git a/tests/kuttl/tests/dataplane-multinode-nodeset-create-test/02-dataplane-scale-out.yaml b/tests/kuttl/tests/dataplane-multinode-nodeset-create-test/02-dataplane-scale-out.yaml deleted file mode 100644 index ad5f827c4..000000000 --- a/tests/kuttl/tests/dataplane-multinode-nodeset-create-test/02-dataplane-scale-out.yaml +++ /dev/null @@ -1,81 +0,0 @@ ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: openstack-edpm-multinode -spec: - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - services: - - download-cache - - bootstrap - - configure-network - - validate-network - - install-os - - configure-os - - run-os - - install-certs - - ovn - - neutron-metadata - - libvirt - - nova - preProvisioned: true - nodes: - edpm-compute-0: - hostName: edpm-compute-0 - networks: - - name: ctlplane - subnetName: subnet1 - defaultRoute: true - fixedIP: 192.168.122.150 - - name: internalapi - subnetName: subnet1 - fixedIP: 172.17.0.150 - - name: storage - subnetName: subnet1 - fixedIP: 172.18.0.150 - - name: tenant - subnetName: subnet1 - fixedIP: 172.19.0.150 - edpm-compute-2: - hostName: edpm-compute-2 - networks: - - name: ctlplane - subnetName: subnet1 - defaultRoute: true - fixedIP: 192.168.122.151 - - name: internalapi - subnetName: subnet1 - fixedIP: 172.17.0.151 - - name: storage - subnetName: subnet1 - fixedIP: 172.18.0.151 - - name: tenant - subnetName: subnet1 - fixedIP: 172.19.0.151 - nodeTemplate: - ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret - ansible: - ansibleUser: cloud-admin - ansiblePort: 22 - ansibleVarsFrom: - - prefix: edpm_ - configMapRef: - name: network-config-template - ansibleVars: - timesync_ntp_servers: - - hostname: clock.redhat.com - # edpm_network_config - # Default nic config template for a EDPM compute node - # These vars are edpm_network_config role vars - edpm_network_config_hide_sensitive_logs: false - edpm_nodes_validation_validate_controllers_icmp: false - edpm_nodes_validation_validate_gateway_icmp: false - gather_facts: false - enable_debug: false - # edpm firewall, change the allowed CIDR if needed - edpm_sshd_configure_firewall: true - edpm_sshd_allowed_ranges: ['192.168.122.0/24'] - # SELinux module - edpm_selinux_mode: enforcing diff --git a/tests/kuttl/tests/dataplane-service-config/00-assert.yaml b/tests/kuttl/tests/dataplane-service-config/00-assert.yaml deleted file mode 100644 index e85bb60d3..000000000 --- a/tests/kuttl/tests/dataplane-service-config/00-assert.yaml +++ /dev/null @@ -1,191 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 600 -collectors: -- type: command - command: oc logs -n openstack-operators -l openstack.org/operator-name=openstack - name: operator-logs ---- -apiVersion: batch/v1 -kind: Job -metadata: - generation: 1 - labels: - app: openstackansibleee - job-name: kuttl-service-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: kuttl-service-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: kuttl-service - osaee: "true" - name: kuttl-service-edpm-compute-no-nodes-edpm-compute-no-nodes - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-no-nodes -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - annotations: - k8s.v1.cni.cncf.io/networks: '[]' - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: kuttl-service-edpm-compute-no-nodes-edpm-compute-no-nodes - job-name: kuttl-service-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: kuttl-service-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: kuttl-service - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - playbook.yaml - - -i - - kuttl-service-edpm-compute-no-nodes-edpm-compute-no-nodes - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - - hosts: localhost - gather_facts: no - name: kuttl play - tasks: - - name: Sleep - command: sleep infinity - delegate_to: localhost - - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-no-nodes - edpm_service_type: kuttl-service - - - imagePullPolicy: Always - name: kuttl-service-edpm-compute-no-nodes-edpm-compute-no-nodes - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /var/lib/openstack/configs/kuttl-service/00-ansibleVars - name: kuttl-service-cm-0-0 - subPath: 00-ansibleVars - - mountPath: /var/lib/openstack/configs/kuttl-service/00-kuttl-service.conf - name: kuttl-service-cm-0-1 - subPath: 00-kuttl-service.conf - - mountPath: /var/lib/openstack/configs/kuttl-service/01-kuttl-service.conf - name: kuttl-service-cm-0-2 - subPath: 01-kuttl-service.conf - - mountPath: /var/lib/openstack/configs/kuttl-service/01-ansibleVars - name: kuttl-service-cm-1-0 - subPath: 01-ansibleVars - - mountPath: /var/lib/openstack/configs/kuttl-service/10-kuttl-service.conf - name: kuttl-service-cm-1-1 - subPath: 10-kuttl-service.conf - - mountPath: /var/lib/openstack/configs/kuttl-service/20-kuttl-service.conf - name: kuttl-service-cm-1-2 - subPath: 20-kuttl-service.conf - - mountPath: /var/lib/openstack/configs/kuttl-service/30-kuttl-service.conf - name: kuttl-service-cm-2-0 - subPath: 30-kuttl-service.conf - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - dnsPolicy: ClusterFirst - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-no-nodes - serviceAccountName: edpm-compute-no-nodes - terminationGracePeriodSeconds: 30 - volumes: - - configMap: - defaultMode: 420 - items: - - key: 00-ansibleVars - path: 00-ansibleVars - name: kuttl-service-cm-0 - name: kuttl-service-cm-0-0 - - configMap: - defaultMode: 420 - items: - - key: 00-kuttl-service.conf - path: 00-kuttl-service.conf - name: kuttl-service-cm-0 - name: kuttl-service-cm-0-1 - - configMap: - defaultMode: 420 - items: - - key: 01-kuttl-service.conf - path: 01-kuttl-service.conf - name: kuttl-service-cm-0 - name: kuttl-service-cm-0-2 - - configMap: - defaultMode: 420 - items: - - key: 01-ansibleVars - path: 01-ansibleVars - name: kuttl-service-cm-1 - name: kuttl-service-cm-1-0 - - configMap: - defaultMode: 420 - items: - - key: 10-kuttl-service.conf - path: 10-kuttl-service.conf - name: kuttl-service-cm-1 - name: kuttl-service-cm-1-1 - - configMap: - defaultMode: 420 - items: - - key: 20-kuttl-service.conf - path: 20-kuttl-service.conf - name: kuttl-service-cm-1 - name: kuttl-service-cm-1-2 - - configMap: - defaultMode: 420 - items: - - key: 30-kuttl-service.conf - path: 30-kuttl-service.conf - name: kuttl-service-cm-2 - name: kuttl-service-cm-2-0 - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes -status: - active: 1 - ready: 1 - terminating: 0 - uncountedTerminatedPods: {} diff --git a/tests/kuttl/tests/dataplane-service-config/00-create.yaml b/tests/kuttl/tests/dataplane-service-config/00-create.yaml deleted file mode 100644 index 41884f8ad..000000000 --- a/tests/kuttl/tests/dataplane-service-config/00-create.yaml +++ /dev/null @@ -1,79 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: kuttl-service-cm-0 -data: - 00-kuttl-service.conf: | - a=b - c=d - 01-kuttl-service.conf: | - e=f - g=h - 00-ansibleVars: | - foo: bar - baz: blippy ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: kuttl-service-cm-1 -data: - 10-kuttl-service.conf: | - i=j - 20-kuttl-service.conf: | - k=l - 01-ansibleVars: | - baz: blippy - zed: zod ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: kuttl-service-cm-2 -binaryData: - 30-kuttl-service.conf: Cg== ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneService -metadata: - name: kuttl-service -spec: - playbookContents: | - - hosts: localhost - gather_facts: no - name: kuttl play - tasks: - - name: Sleep - command: sleep infinity - delegate_to: localhost - dataSources: - - configMapRef: - name: kuttl-service-cm-0 - - configMapRef: - name: kuttl-service-cm-1 - - configMapRef: - name: kuttl-service-cm-2 ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: edpm-compute-no-nodes -spec: - preProvisioned: true - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - nodes: {} - nodeTemplate: - ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret - services: - - kuttl-service ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneDeployment -metadata: - name: edpm-compute-no-nodes -spec: - nodeSets: - - edpm-compute-no-nodes diff --git a/tests/kuttl/tests/dataplane-service-custom-image/00-assert.yaml b/tests/kuttl/tests/dataplane-service-custom-image/00-assert.yaml deleted file mode 100644 index 8253d7151..000000000 --- a/tests/kuttl/tests/dataplane-service-custom-image/00-assert.yaml +++ /dev/null @@ -1,160 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 600 -collectors: -- type: command - command: oc logs -n openstack-operators -l openstack.org/operator-name=openstack - name: operator-logs ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: edpm-no-nodes-custom-svc -spec: - preProvisioned: true - services: - - custom-img-svc - nodes: {} - nodeTemplate: - ansible: - ansibleUser: cloud-admin - ansiblePort: 22 - ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret -status: - observedGeneration: 1 - conditions: - - message: Deployment in progress - reason: Requested - severity: Info - status: "False" - type: Ready - - message: Deployment in progress - reason: Requested - severity: Info - status: "False" - type: DeploymentReady - - message: Input data complete - reason: Ready - status: "True" - type: InputReady - - message: NodeSetDNSDataReady ready - reason: Ready - status: "True" - type: NodeSetDNSDataReady - - message: NodeSetIPReservationReady ready - reason: Ready - status: "True" - type: NodeSetIPReservationReady - - message: ServiceAccount created - reason: Ready - status: "True" - type: ServiceAccountReady - - message: Setup complete - reason: Ready - status: "True" - type: SetupReady ---- -apiVersion: batch/v1 -kind: Job -metadata: - labels: - app: openstackansibleee - job-name: custom-img-svc-edpm-compute-no-nodes-edpm-no-nodes-custom-svc - openstackansibleee_cr: custom-img-svc-edpm-compute-no-nodes-edpm-no-nodes-custom-svc - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-no-nodes-custom-svc - openstackdataplaneservice: custom-img-svc - osaee: "true" - name: custom-img-svc-edpm-compute-no-nodes-edpm-no-nodes-custom-svc - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-no-nodes -spec: - backoffLimit: 6 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - annotations: - k8s.v1.cni.cncf.io/networks: '[]' - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: custom-img-svc-edpm-compute-no-nodes-edpm-no-nodes-custom-svc - job-name: custom-img-svc-edpm-compute-no-nodes-edpm-no-nodes-custom-svc - openstackansibleee_cr: custom-img-svc-edpm-compute-no-nodes-edpm-no-nodes-custom-svc - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-no-nodes-custom-svc - openstackdataplaneservice: custom-img-svc - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - playbook.yaml - - -i - - custom-img-svc-edpm-compute-no-nodes-edpm-no-nodes-custom-svc - env: - - name: RUNNER_PLAYBOOK - value: |2+ - - playbook.yaml - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-no-nodes-custom-svc - edpm_service_type: custom-img-svc - - - image: example.com/repo/runner-image:latest - imagePullPolicy: Always - name: custom-img-svc-edpm-compute-no-nodes-edpm-no-nodes-custom-svc - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - dnsPolicy: ClusterFirst - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-no-nodes-custom-svc - serviceAccountName: edpm-no-nodes-custom-svc - terminationGracePeriodSeconds: 30 - volumes: - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-no-nodes-custom-svc -status: - active: 1 - ready: 0 - terminating: 0 - uncountedTerminatedPods: {} diff --git a/tests/kuttl/tests/dataplane-service-custom-image/00-dataplane-create.yaml b/tests/kuttl/tests/dataplane-service-custom-image/00-dataplane-create.yaml deleted file mode 100644 index 358f0c4c9..000000000 --- a/tests/kuttl/tests/dataplane-service-custom-image/00-dataplane-create.yaml +++ /dev/null @@ -1,37 +0,0 @@ -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneService -metadata: - name: custom-img-svc -spec: - openStackAnsibleEERunnerImage: example.com/repo/runner-image:latest - role: - name: "test role" - hosts: "all" - strategy: "linear" - tasks: - - name: "test task" - import_role: - name: "test role" ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: edpm-no-nodes-custom-svc -spec: - preProvisioned: true - services: - - custom-img-svc - nodes: {} - nodeTemplate: - ansible: - ansibleUser: cloud-admin - ansiblePort: 22 - ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneDeployment -metadata: - name: edpm-compute-no-nodes -spec: - nodeSets: - - edpm-no-nodes-custom-svc diff --git a/tests/kuttl/tests/dataplane-service-failure/00-assert.yaml b/tests/kuttl/tests/dataplane-service-failure/00-assert.yaml deleted file mode 100644 index 503536452..000000000 --- a/tests/kuttl/tests/dataplane-service-failure/00-assert.yaml +++ /dev/null @@ -1,236 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 600 -collectors: -- type: command - command: oc logs -n openstack-operators -l openstack.org/operator-name=openstack - name: operator-logs ---- -apiVersion: batch/v1 -kind: Job -metadata: - labels: - app: openstackansibleee - job-name: failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: failed-service - osaee: "true" - name: failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-no-nodes -spec: - backoffLimit: 3 - completionMode: NonIndexed - completions: 1 - manualSelector: false - parallelism: 1 - podReplacementPolicy: TerminatingOrFailed - suspend: false - template: - metadata: - annotations: - k8s.v1.cni.cncf.io/networks: '[]' - creationTimestamp: null - labels: - app: openstackansibleee - batch.kubernetes.io/job-name: failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes - job-name: failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackansibleee_cr: failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes - openstackdataplanedeployment: edpm-compute-no-nodes - openstackdataplanenodeset: edpm-compute-no-nodes - openstackdataplaneservice: failed-service - osaee: "true" - spec: - containers: - - args: - - ansible-runner - - run - - /runner - - -p - - playbook.yaml - - -i - - failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - - name: RUNNER_PLAYBOOK - value: |2+ - - - hosts: localhost - gather_facts: no - name: kuttl play - tasks: - - name: Copy absent file - ansible.builtin.shell: | - set -euxo pipefail - cp absent failed_op - - - - name: RUNNER_EXTRA_VARS - value: |2+ - - edpm_override_hosts: edpm-compute-no-nodes - edpm_service_type: failed-service - - - imagePullPolicy: Always - name: failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes - resources: {} - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - dnsPolicy: ClusterFirst - restartPolicy: Never - schedulerName: default-scheduler - securityContext: {} - serviceAccount: edpm-compute-no-nodes - serviceAccountName: edpm-compute-no-nodes - terminationGracePeriodSeconds: 30 - volumes: - - name: ssh-key - secret: - defaultMode: 420 - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - defaultMode: 420 - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes -status: - failed: 4 ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - generation: 1 - name: edpm-compute-no-nodes - namespace: openstack-kuttl-tests -spec: - nodeTemplate: - ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret - managementNetwork: ctlplane - nodes: {} - preProvisioned: true - services: - - failed-service - tlsEnabled: true -status: - conditions: - - message: 'Deployment error occurred in failed-service service error backoff limit - reached for execution.name failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes - execution.namespace openstack-kuttl-tests execution.condition.message: Job has reached the specified backoff limit' - reason: Error - severity: Error - status: "False" - type: Ready - - message: 'Deployment error occurred in failed-service service error backoff limit - reached for execution.name failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes - execution.namespace openstack-kuttl-tests execution.condition.message: Job has reached the specified backoff limit' - reason: Error - severity: Error - status: "False" - type: DeploymentReady - - message: Input data complete - reason: Ready - status: "True" - type: InputReady - - message: NodeSetDNSDataReady ready - reason: Ready - status: "True" - type: NodeSetDNSDataReady - - message: NodeSetIPReservationReady ready - reason: Ready - status: "True" - type: NodeSetIPReservationReady - - message: ServiceAccount created - reason: Ready - status: "True" - type: ServiceAccountReady - - message: Setup complete - reason: Ready - status: "True" - type: SetupReady - deploymentStatuses: - edpm-compute-no-nodes: - - message: 'Deployment error occurred in failed-service service error backoff - limit reached for execution.name failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes - execution.namespace openstack-kuttl-tests execution.condition.message: Job has reached the specified backoff limit' - reason: BackoffLimitExceeded - severity: Error - status: "False" - type: NodeSetDeploymentReady - - message: 'Deployment error occurred in failed-service service error backoff - limit reached for execution.name failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes - execution.namespace openstack-kuttl-tests execution.condition.message: Job has reached the specified backoff limit' - reason: BackoffLimitExceeded - severity: Error - status: "False" - type: ServiceFailedServiceDeploymentReady - observedGeneration: 1 ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneDeployment -metadata: - generation: 1 - name: edpm-compute-no-nodes - namespace: openstack-kuttl-tests -spec: - backoffLimit: 3 - deploymentRequeueTime: 15 - nodeSets: - - edpm-compute-no-nodes -status: - conditions: - - message: 'Deployment error occurred nodeSet: edpm-compute-no-nodes error: backoff - limit reached for execution.name failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes - execution.namespace openstack-kuttl-tests execution.condition.message: Job has reached the specified backoff limit' - reason: BackoffLimitExceeded - severity: Error - status: "False" - type: Ready - - message: 'Deployment error occurred nodeSet: edpm-compute-no-nodes error: backoff - limit reached for execution.name failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes - execution.namespace openstack-kuttl-tests execution.condition.message: Job has reached the specified backoff limit' - reason: BackoffLimitExceeded - severity: Error - status: "False" - type: DeploymentReady - - message: Input data complete - reason: Ready - status: "True" - type: InputReady - nodeSetConditions: - edpm-compute-no-nodes: - - message: 'Deployment error occurred in failed-service service error backoff - limit reached for execution.name failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes - execution.namespace openstack-kuttl-tests execution.condition.message: Job has reached the specified backoff limit' - reason: BackoffLimitExceeded - severity: Error - status: "False" - type: NodeSetDeploymentReady - - message: 'Deployment error occurred in failed-service service error backoff - limit reached for execution.name failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes - execution.namespace openstack-kuttl-tests execution.condition.message: Job has reached the specified backoff limit' - reason: BackoffLimitExceeded - severity: Error - status: "False" - type: ServiceFailedServiceDeploymentReady - observedGeneration: 1 diff --git a/tests/kuttl/tests/dataplane-service-failure/00-create.yaml b/tests/kuttl/tests/dataplane-service-failure/00-create.yaml deleted file mode 100644 index e5c6e0cf4..000000000 --- a/tests/kuttl/tests/dataplane-service-failure/00-create.yaml +++ /dev/null @@ -1,38 +0,0 @@ -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneService -metadata: - name: failed-service -spec: - playbookContents: | - - hosts: localhost - gather_facts: no - name: kuttl play - tasks: - - name: Copy absent file - ansible.builtin.shell: | - set -euxo pipefail - cp absent failed_op ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: edpm-compute-no-nodes -spec: - preProvisioned: true - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - nodes: {} - nodeTemplate: - ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret - services: - - failed-service ---- -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneDeployment -metadata: - name: edpm-compute-no-nodes -spec: - backoffLimit: 3 - nodeSets: - - edpm-compute-no-nodes