Enable Zed.

Changes:

- Drop focal-*
- Add jammy-zed and kinetic-zed
- Update target deploy status for keystone-openidc
- Reorder setup functions to configure keystone-openidc earlier
- Drop OVN in favor of neutron-openvswitch in the testing bundles
- Set constraints for nova-compute machines

Change-Id: Ifbab960704eeeb2170bf4d314548f3620fd0cd83

osci.yaml

@@ -1,8 +1,7 @@
 - project:
     templates:
       - charm-yoga-unit-jobs
-      - charm-xena-functional-jobs
+      - charm-zed-functional-jobs
-      - charm-yoga-functional-jobs
     vars:
       needs_charm_build: true
       charm_build_name: keystone-openidc

tests/bundles/jammy-yoga.yaml

@@ -1,6 +1,5 @@
 variables:
   openstack-origin: &openstack-origin distro
-  data-port: &data-port to-be-set
 
 local_overlay_enabled: False
 
@@ -22,8 +21,12 @@ machines:
   '7':
   '8':
   '9':
+  # machines 10 and 11 are for nova-compute which needs more memory for the
+  # instances.
   '10':
+    constraints: mem=4096M cores=4
   '11':
+    constraints: mem=4096M cores=4
   '12':
   '13':
   '14':
@@ -32,9 +35,7 @@ machines:
   '17':
   '18':
   '19':
-  '20':
+     series: jammy
-  '21':
-    series: jammy
 
 applications:
 
@@ -202,29 +203,19 @@ applications:
       cluster_count: 3
     channel: latest/edge
 
-  neutron-api-plugin-ovn:
+  neutron-gateway:
-    charm: ch:neutron-api-plugin-ovn
+    charm: ch:neutron-gateway
-    num_units: 0
+    num_units: 1
-    channel: latest/edge
-
-  ovn-central:
-    charm: ch:ovn-central
-    num_units: 3
     options:
-      source: *openstack-origin
+      openstack-origin: *openstack-origin
+      bridge-mappings: physnet1:br-ex
     to:
       - '18'
-      - '19'
-      - '20'
     channel: latest/edge
 
-  ovn-chassis:
+  neutron-openvswitch:
-    charm: ch:ovn-chassis
+    charm: ch:neutron-openvswitch
-    num_units: 0
     channel: latest/edge
-    options:
-      ovn-bridge-mappings: physnet1:br-ex
-      bridge-interface-mappings: *data-port
 
   openidc-test-fixture:
     charm: ch:openidc-test-fixture
@@ -232,7 +223,7 @@ applications:
     series: jammy
     channel: latest/edge
     to:
-      - '21'
+      - '19'
 
 relations:
 
@@ -362,21 +353,6 @@ relations:
   - - "openstack-dashboard:ha"
     - "openstack-dashboard-hacluster:ha"
 
-  - - 'neutron-api-plugin-ovn:neutron-plugin'
-    - 'neutron-api:neutron-plugin-api-subordinate'
-  - - 'ovn-central:certificates'
-    - 'vault:certificates'
-  - - 'ovn-central:ovsdb-cms'
-    - 'neutron-api-plugin-ovn:ovsdb-cms'
-  - - 'ovn-chassis:nova-compute'
-    - 'nova-compute:neutron-plugin'
-  - - 'ovn-chassis:certificates'
-    - 'vault:certificates'
-  - - 'ovn-chassis:ovsdb'
-    - 'ovn-central:ovsdb'
-  - - 'vault:certificates'
-    - 'neutron-api-plugin-ovn:certificates'
-
   - - 'keystone-openidc:keystone-fid-service-provider'
     - 'keystone:keystone-fid-service-provider'
 
@@ -385,3 +361,15 @@ relations:
 
   - - 'vault:certificates'
     - 'openidc-test-fixture:certificates'
+
+  - - 'neutron-gateway:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'nova-cloud-controller:quantum-network-service'
+    - 'neutron-gateway:quantum-network-service'
+
+  - - 'nova-compute:neutron-plugin'
+    - 'neutron-openvswitch:neutron-plugin'
+
+  - - 'rabbitmq-server:amqp'
+    - 'neutron-openvswitch:amqp'

tests/bundles/jammy-zed.yaml

@@ -1,10 +1,9 @@
 variables:
-  openstack-origin: &openstack-origin cloud:focal-xena
+  openstack-origin: &openstack-origin cloud:jammy-zed
-  data-port: &data-port to-be-set
 
 local_overlay_enabled: False
 
-series: focal
+series: jammy
 
 comment:
 - 'machines section to decide order of deployment. database sooner = faster'
@@ -22,8 +21,12 @@ machines:
   '7':
   '8':
   '9':
+  # machines 10 and 11 are for nova-compute which needs more memory for the
+  # instances.
   '10':
+    constraints: mem=4096M cores=4
   '11':
+    constraints: mem=4096M cores=4
   '12':
   '13':
   '14':
@@ -32,9 +35,7 @@ machines:
   '17':
   '18':
   '19':
-  '20':
+     series: jammy
-  '21':
-    series: jammy
 
 applications:
 
@@ -202,37 +203,27 @@ applications:
       cluster_count: 3
     channel: latest/edge
 
-  neutron-api-plugin-ovn:
+  neutron-gateway:
-    charm: ch:neutron-api-plugin-ovn
+    charm: ch:neutron-gateway
-    num_units: 0
+    num_units: 1
-    channel: latest/edge
-
-  ovn-central:
-    charm: ch:ovn-central
-    num_units: 3
     options:
-      source: *openstack-origin
+      openstack-origin: *openstack-origin
+      bridge-mappings: physnet1:br-ex
     to:
       - '18'
-      - '19'
-      - '20'
     channel: latest/edge
 
-  ovn-chassis:
+  neutron-openvswitch:
-    charm: ch:ovn-chassis
+    charm: ch:neutron-openvswitch
-    num_units: 0
     channel: latest/edge
-    options:
-      ovn-bridge-mappings: physnet1:br-ex
-      bridge-interface-mappings: *data-port
 
   openidc-test-fixture:
     charm: ch:openidc-test-fixture
     num_units: 1
-    channel: latest/edge
     series: jammy
+    channel: latest/edge
     to:
-      - '21'
+      - '19'
 
 relations:
 
@@ -362,21 +353,6 @@ relations:
   - - "openstack-dashboard:ha"
     - "openstack-dashboard-hacluster:ha"
 
-  - - 'neutron-api-plugin-ovn:neutron-plugin'
-    - 'neutron-api:neutron-plugin-api-subordinate'
-  - - 'ovn-central:certificates'
-    - 'vault:certificates'
-  - - 'ovn-central:ovsdb-cms'
-    - 'neutron-api-plugin-ovn:ovsdb-cms'
-  - - 'ovn-chassis:nova-compute'
-    - 'nova-compute:neutron-plugin'
-  - - 'ovn-chassis:certificates'
-    - 'vault:certificates'
-  - - 'ovn-chassis:ovsdb'
-    - 'ovn-central:ovsdb'
-  - - 'vault:certificates'
-    - 'neutron-api-plugin-ovn:certificates'
-
   - - 'keystone-openidc:keystone-fid-service-provider'
     - 'keystone:keystone-fid-service-provider'
 
@@ -385,3 +361,15 @@ relations:
 
   - - 'vault:certificates'
     - 'openidc-test-fixture:certificates'
+
+  - - 'neutron-gateway:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'nova-cloud-controller:quantum-network-service'
+    - 'neutron-gateway:quantum-network-service'
+
+  - - 'nova-compute:neutron-plugin'
+    - 'neutron-openvswitch:neutron-plugin'
+
+  - - 'rabbitmq-server:amqp'
+    - 'neutron-openvswitch:amqp'

tests/bundles/kinetic-zed.yaml

@@ -1,10 +1,9 @@
 variables:
-  openstack-origin: &openstack-origin cloud:focal-yoga
+  openstack-origin: &openstack-origin distro
-  data-port: &data-port to-be-set
 
 local_overlay_enabled: False
 
-series: focal
+series: kinetic
 
 comment:
 - 'machines section to decide order of deployment. database sooner = faster'
@@ -22,8 +21,12 @@ machines:
   '7':
   '8':
   '9':
+  # machines 10 and 11 are for nova-compute which needs more memory for the
+  # instances.
   '10':
+    constraints: mem=4096M cores=4
   '11':
+    constraints: mem=4096M cores=4
   '12':
   '13':
   '14':
@@ -32,9 +35,7 @@ machines:
   '17':
   '18':
   '19':
-  '20':
+     series: jammy
-  '21':
-    series: jammy
 
 applications:
 
@@ -202,37 +203,27 @@ applications:
       cluster_count: 3
     channel: latest/edge
 
-  neutron-api-plugin-ovn:
+  neutron-gateway:
-    charm: ch:neutron-api-plugin-ovn
+    charm: ch:neutron-gateway
-    num_units: 0
+    num_units: 1
-    channel: latest/edge
-
-  ovn-central:
-    charm: ch:ovn-central
-    num_units: 3
     options:
-      source: *openstack-origin
+      openstack-origin: *openstack-origin
+      bridge-mappings: physnet1:br-ex
     to:
       - '18'
-      - '19'
-      - '20'
     channel: latest/edge
 
-  ovn-chassis:
+  neutron-openvswitch:
-    charm: ch:ovn-chassis
+    charm: ch:neutron-openvswitch
-    num_units: 0
     channel: latest/edge
-    options:
-      ovn-bridge-mappings: physnet1:br-ex
-      bridge-interface-mappings: *data-port
 
   openidc-test-fixture:
     charm: ch:openidc-test-fixture
     num_units: 1
-    channel: latest/edge
     series: jammy
+    channel: latest/edge
     to:
-      - '21'
+      - '19'
 
 relations:
 
@@ -362,21 +353,6 @@ relations:
   - - "openstack-dashboard:ha"
     - "openstack-dashboard-hacluster:ha"
 
-  - - 'neutron-api-plugin-ovn:neutron-plugin'
-    - 'neutron-api:neutron-plugin-api-subordinate'
-  - - 'ovn-central:certificates'
-    - 'vault:certificates'
-  - - 'ovn-central:ovsdb-cms'
-    - 'neutron-api-plugin-ovn:ovsdb-cms'
-  - - 'ovn-chassis:nova-compute'
-    - 'nova-compute:neutron-plugin'
-  - - 'ovn-chassis:certificates'
-    - 'vault:certificates'
-  - - 'ovn-chassis:ovsdb'
-    - 'ovn-central:ovsdb'
-  - - 'vault:certificates'
-    - 'neutron-api-plugin-ovn:certificates'
-
   - - 'keystone-openidc:keystone-fid-service-provider'
     - 'keystone:keystone-fid-service-provider'
 
@@ -385,3 +361,15 @@ relations:
 
   - - 'vault:certificates'
     - 'openidc-test-fixture:certificates'
+
+  - - 'neutron-gateway:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'nova-cloud-controller:quantum-network-service'
+    - 'neutron-gateway:quantum-network-service'
+
+  - - 'nova-compute:neutron-plugin'
+    - 'neutron-openvswitch:neutron-plugin'
+
+  - - 'rabbitmq-server:amqp'
+    - 'neutron-openvswitch:amqp'

tests/tests.yaml

@@ -1,37 +1,35 @@
 charm_name: keystone-openidc
 
 smoke_bundles:
-- focal-yoga
+- jammy-zed
 
 gate_bundles:
-- focal-xena
-- focal-yoga
 - jammy-yoga
+- jammy-zed
+- kinetic-zed
 
 dev_bundles:
-- jammy-yoga
+- jammy-zed
 
 configure:
 - zaza.openstack.charm_tests.vault.setup.auto_initialize
-- zaza.openstack.charm_tests.keystone.setup.add_demo_user
-- zaza.openstack.charm_tests.glance.setup.add_lts_image
-- zaza.openstack.charm_tests.nova.setup.create_flavors
-- zaza.openstack.charm_tests.nova.setup.manage_ssh_key
-- zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
 - zaza.openstack.charm_tests.openidc.setup.configure_keystone_openidc
 - zaza.openstack.charm_tests.openidc.setup.keystone_federation_setup_site1
+- zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
+- zaza.openstack.charm_tests.keystone.setup.add_demo_user
+- zaza.openstack.charm_tests.glance.setup.add_cirros_image
+- zaza.openstack.charm_tests.nova.setup.create_flavors
+- zaza.openstack.charm_tests.nova.setup.manage_ssh_key
 
 tests:
 - zaza.openstack.charm_tests.keystone.tests.AuthenticationAuthorizationTest
 
 target_deploy_status:
   keystone-openidc:
-    # NOTE: at first we deploy a bundle in which this subordinate charm isn't
+    workload-status: blocked
-    # related to anything, so it has no unit. It will become related and
+    workload-status-message-prefix: 'required keys: oidc_client_id, oidc_provider_metadata_url'
-    # receive units later as part of the setup stage.
-    num-expected-units: 0
-    workload-status: waiting
   openidc-test-fixture:
+    workload-status: active
     workload-status-message-prefix: 'ready'
   vault:
     workload-status: blocked
@@ -39,14 +37,6 @@ target_deploy_status:
   ntp:
     workload-status: active
     workload-status-message-prefix: 'chrony: Ready'
-  ovn-central:
-    workload-status: waiting
-    workload-status-message-prefix: "'ovsdb-peer' incomplete, 'certificates' awaiting server certificate data"
-  ovn-chassis:
-    workload-status: waiting
-    workload-status-message-prefix: "'certificates' awaiting server certificate data"
-  neutron-api-plugin-ovn:
-    workload-status: waiting
-    workload-status-message-prefix: "'certificates' awaiting server certificate data, 'ovsdb-cms' incomplete"
 tests_options:
-  force_deploy: []
+  force_deploy:
+    - kinetic-zed