Add Antelope support

* sync charm-helpers to classic charms
* change openstack-origin/source default to antelope
* align testing with antelope
* add new antelope bundles
* add antelope bundles to tests.yaml
* add antelope tests to osci.yaml and .zuul.yaml
* update build-on and run-on bases

Change-Id: I8cacbaf5ed4a4b0be2a7adbda56e294e3fbbbff6

.zuul.yaml

@@ -1,5 +1,5 @@
 - project:
     templates:
-      - openstack-python3-charm-zed-jobs
+      - openstack-python3-charm-jobs
       - openstack-cover-jobs
 

charmcraft.yaml

@@ -31,6 +31,9 @@ bases:
       - name: ubuntu
         channel: "22.10"
         architectures: [amd64]
+      - name: ubuntu
+        channel: "23.04"
+        architectures: [amd64]
   - build-on:
       - name: ubuntu
         channel: "22.04"
@@ -42,6 +45,9 @@ bases:
       - name: ubuntu
         channel: "22.10"
         architectures: [arm64]
+      - name: ubuntu
+        channel: "23.04"
+        architectures: [arm64]
   - build-on:
       - name: ubuntu
         channel: "22.04"
@@ -53,6 +59,9 @@ bases:
       - name: ubuntu
         channel: "22.10"
         architectures: [ppc64el]
+      - name: ubuntu
+        channel: "23.04"
+        architectures: [ppc64el]
   - build-on:
       - name: ubuntu
         channel: "22.04"
@@ -64,3 +73,6 @@ bases:
       - name: ubuntu
         channel: "22.10"
         architectures: [s390x]
+      - name: ubuntu
+        channel: "23.04"
+        architectures: [s390x]

osci.yaml

@@ -1,7 +1,7 @@
 - project:
     templates:
       - charm-unit-jobs-py310
-      - charm-zed-functional-jobs
+      - charm-functional-jobs
     vars:
       needs_charm_build: true
       charm_build_name: manila-ganesha

src/config.yaml

@@ -1,6 +1,6 @@
 options:
   openstack-origin:
-    default: zed
+    default: antelope
     type: string
     description: |
       Repository from which to install.  May be one of the following:

src/metadata.yaml

@@ -12,6 +12,7 @@ tags:
 series:
 - jammy
 - kinetic
+- lunar
 subordinate: false
 extra-bindings:
   tenant-storage:

src/tests/bundles/jammy-antelope.yaml

@@ -0,0 +1,339 @@
+variables:
+  openstack-origin: &openstack-origin cloud:jammy-antelope
+
+local_overlay_enabled: True
+
+series: jammy
+
+comment:
+- 'machines section to decide order of deployment. database sooner = faster'
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+    constraints: mem=3072M
+  '2':
+    constraints: mem=3072M
+  '3':
+  '4':
+  '5':
+  '6':
+  '7':
+  '8':
+  '9':
+  '10':
+  '11':
+  '12':
+  '13':
+  '14':
+  '15':
+  '16':
+  '17':
+    constraints: mem=8G
+  '18':
+    constraints: mem=8G
+  '19':
+  '20':
+  '21':
+  '22':
+  '23':
+
+services:
+
+  manila-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+  manila-ganesha-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+  keystone-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+  neutron-api-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+  nova-cloud-controller-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+  glance-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+  placement-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+
+  mysql-innodb-cluster:
+    charm: ch:mysql-innodb-cluster
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+      - '1'
+      - '2'
+    channel: latest/edge
+
+  manila-ganesha-az1:
+    num_units: 3
+    charm: ../../../manila-ganesha_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+      - '4'
+      - '5'
+
+  ceph-mon:
+    charm: ch:ceph-mon
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '6'
+      - '7'
+      - '8'
+    channel: latest/edge
+
+  ceph-osd:
+    charm: ch:ceph-osd
+    num_units: 3
+    options:
+      source: *openstack-origin
+    storage:
+      osd-devices: 'cinder,10G'
+    to:
+      - '9'
+      - '10'
+      - '11'
+    channel: latest/edge
+
+  ceph-fs:
+    charm: ch:ceph-fs
+    num_units: 2
+    options:
+      source: *openstack-origin
+    to:
+      - '12'
+      - '13'
+    channel: latest/edge
+
+  manila:
+    charm: ch:manila
+    num_units: 1
+    options:
+      default-share-backend: cephfsnfs1
+      share-protocols: NFS
+      openstack-origin: *openstack-origin
+    to:
+      - '14'
+    channel: latest/edge
+
+  nova-cloud-controller:
+    charm: ch:nova-cloud-controller
+    num_units: 1
+    options:
+      network-manager: Neutron
+      openstack-origin: *openstack-origin
+    to:
+      - '15'
+    channel: latest/edge
+
+  placement:
+    charm: ch:placement
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '16'
+    channel: latest/edge
+
+  nova-compute:
+    charm: ch:nova-compute
+    num_units: 2
+    options:
+      config-flags: default_ephemeral_format=ext4
+      enable-live-migration: true
+      enable-resize: true
+      migration-auth-type: ssh
+      openstack-origin: *openstack-origin
+    to:
+      - '17'
+      - '18'
+    channel: latest/edge
+
+  glance:
+    charm: ch:glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '19'
+    channel: latest/edge
+
+  neutron-api:
+    charm: ch:neutron-api
+    num_units: 1
+    options:
+      manage-neutron-plugin-legacy-mode: true
+      neutron-plugin: ovs
+      flat-network-providers: physnet1
+      neutron-security-groups: true
+      openstack-origin: *openstack-origin
+    to:
+      - '20'
+    channel: latest/edge
+
+  neutron-openvswitch:
+    charm: ch:neutron-openvswitch
+    channel: latest/edge
+
+  neutron-gateway:
+    charm: ch:neutron-gateway
+    num_units: 1
+    options:
+      bridge-mappings: physnet1:br-ex
+      openstack-origin: *openstack-origin
+    to:
+      - '21'
+    channel: latest/edge
+
+  rabbitmq-server:
+    charm: ch:rabbitmq-server
+    num_units: 1
+    to:
+      - '22'
+    channel: latest/edge
+
+  keystone:
+    charm: ch:keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '23'
+    channel: latest/edge
+
+  nrpe:
+    charm: ch:nrpe
+    channel: latest/edge
+
+relations:
+
+  - - 'ceph-mon'
+    - 'ceph-osd'
+
+  - - 'ceph-mon'
+    - 'ceph-fs'
+
+  - - 'ceph-mon'
+    - 'manila-ganesha-az1'
+
+  - - 'manila:shared-db'
+    - 'manila-mysql-router:shared-db'
+  - - 'manila-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'manila-ganesha-az1'
+    - 'rabbitmq-server'
+
+  - - 'manila-ganesha-az1'
+    - 'keystone'
+
+  - - 'manila'
+    - 'manila-ganesha-az1'
+
+  - - 'manila-ganesha-az1:shared-db'
+    - 'manila-ganesha-mysql-router:shared-db'
+  - - 'manila-ganesha-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'manila'
+    - 'rabbitmq-server'
+
+  - - 'manila'
+    - 'keystone'
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'neutron-api:shared-db'
+    - 'neutron-api-mysql-router:shared-db'
+  - - 'neutron-api-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'neutron-api:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'neutron-api:neutron-api'
+    - 'nova-cloud-controller:neutron-api'
+
+  - - 'placement:placement'
+    - 'nova-cloud-controller:placement'
+
+  - - 'placement:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'placement:shared-db'
+    - 'placement-mysql-router:shared-db'
+  - - 'placement-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'placement:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'neutron-api:neutron-plugin-api'
+    - 'neutron-gateway:neutron-plugin-api'
+
+  - - 'neutron-api:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'nova-compute:neutron-plugin'
+    - 'neutron-openvswitch:neutron-plugin'
+
+  - - 'nova-cloud-controller:shared-db'
+    - 'nova-cloud-controller-mysql-router:shared-db'
+  - - 'nova-cloud-controller-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'neutron-gateway:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'nova-cloud-controller:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'nova-compute:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'neutron-openvswitch:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'nova-cloud-controller:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'nova-cloud-controller:cloud-compute'
+    - 'nova-compute:cloud-compute'
+
+  - - 'glance:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'glance:shared-db'
+    - 'glance-mysql-router:shared-db'
+  - - 'glance-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'glance:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'nova-compute:image-service'
+    - 'glance:image-service'
+
+  - - 'nova-cloud-controller:image-service'
+    - 'glance:image-service'
+
+  - - 'nova-cloud-controller:quantum-network-service'
+    - 'neutron-gateway:quantum-network-service'
+
+  - - 'manila-ganesha-az1:nrpe-external-master'
+    - 'nrpe:nrpe-external-master'

src/tests/bundles/jammy-zed.yaml

@@ -75,7 +75,7 @@ services:
 
   manila-ganesha-az1:
     num_units: 3
-    charm: ../../../manila-ganesha_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
+    charm: ../../../manila-ganesha_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
     options:
       openstack-origin: *openstack-origin
     to:

src/tests/bundles/kinetic-zed.yaml

@@ -75,7 +75,7 @@ services:
 
   manila-ganesha-az1:
     num_units: 3
-    charm: ../../../manila-ganesha_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
+    charm: ../../../manila-ganesha_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
     options:
       openstack-origin: *openstack-origin
     to:

src/tests/bundles/lunar-antelope.yaml

@@ -3,7 +3,7 @@ variables:
 
 local_overlay_enabled: True
 
-series: jammy
+series: lunar
 
 comment:
 - 'machines section to decide order of deployment. database sooner = faster'
@@ -75,7 +75,7 @@ services:
 
   manila-ganesha-az1:
     num_units: 3
-    charm: ../../../manila-ganesha_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
+    charm: ../../../manila-ganesha_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
     options:
       openstack-origin: *openstack-origin
     to:
@@ -213,6 +213,10 @@ services:
       - '23'
     channel: latest/edge
 
+  nrpe:
+    charm: ch:nrpe
+    channel: latest/edge
+
 relations:
 
   - - 'ceph-mon'
@@ -330,3 +334,6 @@ relations:
 
   - - 'nova-cloud-controller:quantum-network-service'
     - 'neutron-gateway:quantum-network-service'
+
+  - - 'manila-ganesha-az1:nrpe-external-master'
+    - 'nrpe:nrpe-external-master'

src/tests/tests.yaml

@@ -1,12 +1,12 @@
 charm_name: manila-ganesha
 
 gate_bundles:
-- jammy-yoga
+- jammy-zed
 
 dev_bundles:
-- jammy-yoga
+- jammy-antelope
-- jammy-zed
 - kinetic-zed
+- lunar-antelope
 
 smoke_bundles:
 - jammy-yoga
@@ -27,3 +27,4 @@ configure:
 tests_options:
   force_deploy:
     - kinetic-zed
+    - lunar-antelope