Update to build using charmcraft

Due to a build problem with the reactive plugin, this change falls back
on overriding the steps and doing a manual build, but it also ensures
the CI system builds the charm using charmcraft.  Changes:

- add a build-requirements.txt
- modify charmcraft.yaml
- modify osci.yaml
    -> indicate build with charmcraft
- modify tox.ini
    -> tox -e build does charmcraft build/rename
    -> tox -e build-reactive does the reactive build
- modify bundles to use the <charm>.charm artifact in tests.
  and fix deprecation warning re: prefix
- tox inception to enable tox -e func-test in the CI

Change-Id: Iee0101df1f2a943f3da8ad8b5719bdaa031af151

build-requirements.txt

@@ -0,0 +1,7 @@
+# NOTES(lourot):
+# * We don't install charmcraft via pip anymore because it anyway spins up a
+#   container and scp the system's charmcraft snap inside it. So the charmcraft
+#   snap is necessary on the system anyway.
+# * `tox -e build` successfully validated with charmcraft 1.2.1
+
+cffi==1.14.6; python_version < '3.6'  # cffi 1.15.0 drops support for py35.

charmcraft.yaml

@@ -0,0 +1,26 @@
+type: charm
+
+parts:
+  charm:
+    build-packages:
+      - tox
+      - git
+      - python3-dev
+      - libffi-dev
+    override-build: |
+      apt-get install ca-certificates -y
+      tox -e build-reactive
+    override-stage: |
+      echo "Copying charm to staging area: $CHARMCRAFT_STAGE"
+      NAME=$(ls $CHARMCRAFT_PART_BUILD/build/builds)
+      cp -r $CHARMCRAFT_PART_BUILD/build/builds/$NAME/* $CHARMCRAFT_STAGE/
+    override-prime: |
+      # For some reason, the normal priming chokes on the fact that there's a
+      # hooks directory.
+      cp -r $CHARMCRAFT_STAGE/* .
+
+bases:
+  - name: ubuntu
+    channel: "20.04"
+    architectures:
+      - amd64

metadata.yaml

@@ -0,0 +1 @@
+src/metadata.yaml

osci.yaml

@@ -1,18 +1,12 @@
 - project:
     templates:
-      - charm-yoga-unit-jobs
+      - charm-unit-jobs-py38
+      - charm-unit-jobs-py39
     check:
       jobs:
-      - charm-build
-      - bionic-stein-pacemaker-remote-ssl_masakari
-      - bionic-ussuri-pacemaker-remote-ssl_masakari
-      - focal-ussuri-pacemaker-remote-ssl_masakari
-      - focal-victoria-pacemaker-remote-ssl_masakari
-      - focal-wallaby-pacemaker-remote-ssl_masakari
       - focal-xena-pacemaker-remote-ssl_masakari
       - focal-yoga-pacemaker-remote-ssl_masakari:
           voting: false
-      - hirsute-wallaby-pacemaker-remote-ssl_masakari
       - impish-xena-pacemaker-remote-ssl_masakari:
           voting: false
       - jammy-yoga-pacemaker-remote-ssl_masakari:
@@ -20,68 +14,36 @@
     vars:
       needs_charm_build: true
       charm_build_name: masakari
+      build_type: charmcraft
 
-- job:
-    name: bionic-ussuri-pacemaker-remote-ssl_masakari
-    parent: func-target
-    dependencies: &smoke-jobs
-      - osci-lint
-      - tox-py36
-      - tox-py38
-      - tox-py39
-    vars:
-      tox_extra_args: bionic-ussuri-pacemaker-remote-ssl
-- job:
-    name: bionic-stein-pacemaker-remote-ssl_masakari
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: bionic-stein-pacemaker-remote-ssl
-- job:
-    name: focal-ussuri-pacemaker-remote-ssl_masakari
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: focal-ussuri-pacemaker-remote-ssl
-- job:
-    name: focal-victoria-pacemaker-remote-ssl_masakari
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: focal-victoria-pacemaker-remote-ssl
-- job:
-    name: focal-wallaby-pacemaker-remote-ssl_masakari
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: focal-wallaby-pacemaker-remote-ssl
 - job:
     name: focal-xena-pacemaker-remote-ssl_masakari
     parent: func-target
-    dependencies: *smoke-jobs
+    dependencies:
+      - osci-lint
+      - tox-py38
+      - tox-py39
+      - charm-build
     vars:
       tox_extra_args: focal-xena-pacemaker-remote-ssl
 - job:
     name: focal-yoga-pacemaker-remote-ssl_masakari
     parent: func-target
-    dependencies: *smoke-jobs
+    dependencies:
+      - focal-xena-pacemaker-remote-ssl_masakari
     vars:
       tox_extra_args: focal-yoga-pacemaker-remote-ssl
-- job:
-    name: hirsute-wallaby-pacemaker-remote-ssl_masakari
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: hirsute-wallaby-pacemaker-remote-ssl
 - job:
     name: impish-xena-pacemaker-remote-ssl_masakari
     parent: func-target
-    dependencies: *smoke-jobs
+    dependencies:
+      - focal-xena-pacemaker-remote-ssl_masakari
     vars:
       tox_extra_args: impish-xena-pacemaker-remote-ssl
 - job:
     name: jammy-yoga-pacemaker-remote-ssl_masakari
     parent: func-target
-    dependencies: *smoke-jobs
+    dependencies:
+      - focal-xena-pacemaker-remote-ssl_masakari
     vars:
       tox_extra_args: jammy-yoga-pacemaker-remote-ssl

rename.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+charm=$(grep "charm_build_name" osci.yaml | awk '{print $2}')
+echo "renaming ${charm}_*.charm to ${charm}.charm"
+echo -n "pwd: "
+pwd
+ls -al
+echo "Removing bad downloaded charm maybe?"
+if [[ -e "${charm}.charm" ]];
+then
+    rm "${charm}.charm"
+fi
+echo "Renaming charm here."
+mv ${charm}_*.charm ${charm}.charm

src/metadata.yaml

@@ -10,8 +10,5 @@ description: |
 tags:
 - openstack
 series:
-- bionic
 - focal
-- groovy
-- hirsute
 - impish

src/test-requirements.txt

@@ -4,6 +4,9 @@
 #     https://github.com/openstack-charmers/release-tools
 #
 
+# Need tox to be available from tox... inception yes, but its a workaround for now
+tox
+
 # Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
 git+https://github.com/openstack-charmers/zaza.git#egg=zaza
 git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack

src/tests/bundles/bionic-rocky-pacemaker-remote-ssl.yaml

@@ -1,200 +0,0 @@
-series: bionic
-relations:
-- - nova-compute:amqp
-  - rabbitmq-server:amqp
-- - neutron-gateway:amqp
-  - rabbitmq-server:amqp
-- - neutron-gateway:amqp-nova
-  - rabbitmq-server:amqp
-- - keystone:shared-db
-  - mysql:shared-db
-- - cinder:identity-service
-  - keystone:identity-service
-- - nova-cloud-controller:identity-service
-  - keystone:identity-service
-- - glance:identity-service
-  - keystone:identity-service
-- - neutron-api:identity-service
-  - keystone:identity-service
-- - neutron-openvswitch:neutron-plugin-api
-  - neutron-api:neutron-plugin-api
-- - cinder:shared-db
-  - mysql:shared-db
-- - neutron-api:shared-db
-  - mysql:shared-db
-- - cinder:amqp
-  - rabbitmq-server:amqp
-- - neutron-api:amqp
-  - rabbitmq-server:amqp
-- - neutron-gateway:neutron-plugin-api
-  - neutron-api:neutron-plugin-api
-- - glance:shared-db
-  - mysql:shared-db
-- - glance:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:image-service
-  - glance:image-service
-- - nova-compute:image-service
-  - glance:image-service
-- - nova-cloud-controller:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:quantum-network-service
-  - neutron-gateway:quantum-network-service
-- - nova-compute:neutron-plugin
-  - neutron-openvswitch:neutron-plugin
-- - neutron-openvswitch:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:shared-db
-  - mysql:shared-db
-- - nova-cloud-controller:neutron-api
-  - neutron-api:neutron-api
-- - nova-cloud-controller:cloud-compute
-  - nova-compute:cloud-compute
-- - masakari:shared-db
-  - mysql:shared-db
-- - masakari:amqp
-  - rabbitmq-server:amqp
-- - masakari:identity-service
-  - keystone:identity-service
-- - glance:ceph
-  - ceph-mon:client
-- - ceph-mon:osd
-  - ceph-osd:mon
-- - cinder:storage-backend
-  - cinder-ceph:storage-backend
-- - cinder-ceph:ceph
-  - ceph-mon:client
-- - cinder-ceph:ceph-access
-  - nova-compute:ceph-access
-- - nova-compute:juju-info
-  - masakari-monitors:container
-- - masakari:ha
-  - hacluster:ha
-- - keystone:identity-credentials
-  - masakari-monitors:identity-credentials
-- - nova-compute:juju-info
-  - pacemaker-remote:juju-info
-- - hacluster:pacemaker-remote
-  - pacemaker-remote:pacemaker-remote
-- - vault:shared-db
-  - mysql:shared-db
-- - vault:certificates
-  - keystone:certificates
-- - vault:certificates
-  - neutron-api:certificates
-- - vault:certificates
-  - cinder:certificates
-- - vault:certificates
-  - glance:certificates
-- - vault:certificates
-  - nova-cloud-controller:certificates
-- - vault:certificates
-  - masakari:certificates
-applications:
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-rocky
-      worker-multiplier: 0.25
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      block-device: "None"
-      glance-api-version: 2
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    series: bionic
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: cloud:bionic-rocky
-      worker-multiplier: 0.25
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      max-connections: 1000
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: cloud:bionic-rocky
-      worker-multiplier: 0.25
-  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: cloud:bionic-rocky
-      worker-multiplier: 0.25
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-    num_units: 0
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: cloud:bionic-rocky
-      worker-multiplier: 0.25
-      debug: true
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 3
-    constraints: mem=4G
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: cloud:bionic-rocky
-      debug: true
-      cpu-model: kvm64
-      cpu-mode: custom
-      # Allow for more retries when testing ontop of openstack
-      config-flags: block_device_allocate_retries=120
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-  masakari:
-    charm: ../../../masakari
-    series: bionic
-    num_units: 3
-    options:
-      openstack-origin: cloud:bionic-rocky/proposed
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: cloud:bionic-rocky
-      expected-osd-count: 3
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    constraints: mem=1G
-    num_units: 3
-    options:
-      source: cloud:bionic-rocky
-    storage:
-      osd-devices:  cinder,40G
-  cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
-  masakari-monitors:
-    charm: cs:~openstack-charmers-next/masakari-monitors
-  hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
-    options:
-      corosync_transport: unicast
-      cluster_count: 3
-  pacemaker-remote:
-    charm: cs:~openstack-charmers-next/pacemaker-remote
-    options:
-      enable-stonith: False
-      enable-resources: False
-  vault:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/vault

src/tests/bundles/bionic-stein-pacemaker-remote-ssl.yaml

@@ -1,200 +0,0 @@
-series: bionic
-relations:
-- - nova-compute:amqp
-  - rabbitmq-server:amqp
-- - neutron-gateway:amqp
-  - rabbitmq-server:amqp
-- - neutron-gateway:amqp-nova
-  - rabbitmq-server:amqp
-- - keystone:shared-db
-  - mysql:shared-db
-- - cinder:identity-service
-  - keystone:identity-service
-- - nova-cloud-controller:identity-service
-  - keystone:identity-service
-- - glance:identity-service
-  - keystone:identity-service
-- - neutron-api:identity-service
-  - keystone:identity-service
-- - neutron-openvswitch:neutron-plugin-api
-  - neutron-api:neutron-plugin-api
-- - cinder:shared-db
-  - mysql:shared-db
-- - neutron-api:shared-db
-  - mysql:shared-db
-- - cinder:amqp
-  - rabbitmq-server:amqp
-- - neutron-api:amqp
-  - rabbitmq-server:amqp
-- - neutron-gateway:neutron-plugin-api
-  - neutron-api:neutron-plugin-api
-- - glance:shared-db
-  - mysql:shared-db
-- - glance:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:image-service
-  - glance:image-service
-- - nova-compute:image-service
-  - glance:image-service
-- - nova-cloud-controller:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:quantum-network-service
-  - neutron-gateway:quantum-network-service
-- - nova-compute:neutron-plugin
-  - neutron-openvswitch:neutron-plugin
-- - neutron-openvswitch:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:shared-db
-  - mysql:shared-db
-- - nova-cloud-controller:neutron-api
-  - neutron-api:neutron-api
-- - nova-cloud-controller:cloud-compute
-  - nova-compute:cloud-compute
-- - masakari:shared-db
-  - mysql:shared-db
-- - masakari:amqp
-  - rabbitmq-server:amqp
-- - masakari:identity-service
-  - keystone:identity-service
-- - glance:ceph
-  - ceph-mon:client
-- - ceph-mon:osd
-  - ceph-osd:mon
-- - cinder:storage-backend
-  - cinder-ceph:storage-backend
-- - cinder-ceph:ceph
-  - ceph-mon:client
-- - cinder-ceph:ceph-access
-  - nova-compute:ceph-access
-- - nova-compute:juju-info
-  - masakari-monitors:container
-- - masakari:ha
-  - hacluster:ha
-- - keystone:identity-credentials
-  - masakari-monitors:identity-credentials
-- - nova-compute:juju-info
-  - pacemaker-remote:juju-info
-- - hacluster:pacemaker-remote
-  - pacemaker-remote:pacemaker-remote
-- - vault:shared-db
-  - mysql:shared-db
-- - vault:certificates
-  - keystone:certificates
-- - vault:certificates
-  - neutron-api:certificates
-- - vault:certificates
-  - cinder:certificates
-- - vault:certificates
-  - glance:certificates
-- - vault:certificates
-  - nova-cloud-controller:certificates
-- - vault:certificates
-  - masakari:certificates
-applications:
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-stein
-      worker-multiplier: 0.25
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      block-device: "None"
-      glance-api-version: 2
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    series: bionic
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: cloud:bionic-stein
-      worker-multiplier: 0.25
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      max-connections: 1000
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: cloud:bionic-stein
-      worker-multiplier: 0.25
-  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: cloud:bionic-stein
-      worker-multiplier: 0.25
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-    num_units: 0
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: cloud:bionic-stein
-      worker-multiplier: 0.25
-      debug: true
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 3
-    constraints: mem=4G
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: cloud:bionic-stein
-      debug: true
-      cpu-model: kvm64
-      cpu-mode: custom
-      # Allow for more retries when testing ontop of openstack
-      config-flags: block_device_allocate_retries=120
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-  masakari:
-    charm: ../../../masakari
-    series: bionic
-    num_units: 3
-    options:
-      openstack-origin: cloud:bionic-stein
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: cloud:bionic-stein
-      expected-osd-count: 3
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    constraints: mem=1G
-    num_units: 3
-    options:
-      source: cloud:bionic-stein
-    storage:
-      osd-devices:  cinder,40G
-  cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
-  masakari-monitors:
-    charm: cs:~openstack-charmers-next/masakari-monitors
-  hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
-    options:
-      corosync_transport: unicast
-      cluster_count: 3
-  pacemaker-remote:
-    charm: cs:~openstack-charmers-next/pacemaker-remote
-    options:
-      enable-stonith: False
-      enable-resources: False
-  vault:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/vault

src/tests/bundles/bionic-train-pacemaker-remote-ssl.yaml

@@ -1,214 +0,0 @@
-series: bionic
-relations:
-- - nova-compute:amqp
-  - rabbitmq-server:amqp
-- - neutron-gateway:amqp
-  - rabbitmq-server:amqp
-- - neutron-gateway:amqp-nova
-  - rabbitmq-server:amqp
-- - keystone:shared-db
-  - mysql:shared-db
-- - cinder:identity-service
-  - keystone:identity-service
-- - nova-cloud-controller:identity-service
-  - keystone:identity-service
-- - glance:identity-service
-  - keystone:identity-service
-- - neutron-api:identity-service
-  - keystone:identity-service
-- - neutron-openvswitch:neutron-plugin-api
-  - neutron-api:neutron-plugin-api
-- - cinder:shared-db
-  - mysql:shared-db
-- - neutron-api:shared-db
-  - mysql:shared-db
-- - cinder:amqp
-  - rabbitmq-server:amqp
-- - neutron-api:amqp
-  - rabbitmq-server:amqp
-- - neutron-gateway:neutron-plugin-api
-  - neutron-api:neutron-plugin-api
-- - glance:shared-db
-  - mysql:shared-db
-- - glance:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:image-service
-  - glance:image-service
-- - nova-compute:image-service
-  - glance:image-service
-- - nova-cloud-controller:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:quantum-network-service
-  - neutron-gateway:quantum-network-service
-- - nova-compute:neutron-plugin
-  - neutron-openvswitch:neutron-plugin
-- - neutron-openvswitch:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:shared-db
-  - mysql:shared-db
-- - nova-cloud-controller:neutron-api
-  - neutron-api:neutron-api
-- - nova-cloud-controller:cloud-compute
-  - nova-compute:cloud-compute
-- - masakari:shared-db
-  - mysql:shared-db
-- - masakari:amqp
-  - rabbitmq-server:amqp
-- - masakari:identity-service
-  - keystone:identity-service
-- - glance:ceph
-  - ceph-mon:client
-- - ceph-mon:osd
-  - ceph-osd:mon
-- - cinder:storage-backend
-  - cinder-ceph:storage-backend
-- - cinder-ceph:ceph
-  - ceph-mon:client
-- - cinder-ceph:ceph-access
-  - nova-compute:ceph-access
-- - nova-compute:juju-info
-  - masakari-monitors:container
-- - masakari:ha
-  - hacluster:ha
-- - keystone:identity-credentials
-  - masakari-monitors:identity-credentials
-- - nova-compute:juju-info
-  - pacemaker-remote:juju-info
-- - hacluster:pacemaker-remote
-  - pacemaker-remote:pacemaker-remote
-- - vault:shared-db
-  - mysql:shared-db
-- - vault:certificates
-  - keystone:certificates
-- - vault:certificates
-  - neutron-api:certificates
-- - vault:certificates
-  - cinder:certificates
-- - vault:certificates
-  - glance:certificates
-- - vault:certificates
-  - nova-cloud-controller:certificates
-- - vault:certificates
-  - masakari:certificates
-- - placement:shared-db
-  - mysql:shared-db
-- - placement:identity-service
-  - keystone:identity-service
-- - placement:placement
-  - nova-cloud-controller:placement
-- - vault:certificates
-  - placement:certificates
-applications:
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-train
-      worker-multiplier: 0.25
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-train
-      block-device: "None"
-      glance-api-version: 2
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    series: bionic
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: cloud:bionic-train
-      worker-multiplier: 0.25
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      max-connections: 1000
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: cloud:bionic-train
-      worker-multiplier: 0.25
-  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: cloud:bionic-train
-      worker-multiplier: 0.25
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-    num_units: 0
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: cloud:bionic-train
-      worker-multiplier: 0.25
-      debug: true
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 3
-    constraints: mem=4G
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: cloud:bionic-train
-      debug: true
-      cpu-model: kvm64
-      cpu-mode: custom
-      # Allow for more retries when testing ontop of openstack
-      config-flags: block_device_allocate_retries=120
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-  masakari:
-    charm: ../../../masakari
-    series: bionic
-    num_units: 3
-    options:
-      openstack-origin: cloud:bionic-train
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: cloud:bionic-train
-      expected-osd-count: 3
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    constraints: mem=1G
-    num_units: 3
-    options:
-      source: cloud:bionic-train
-    storage:
-      osd-devices:  cinder,40G
-  cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
-  masakari-monitors:
-    charm: cs:~openstack-charmers-next/masakari-monitors
-  hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
-    options:
-      corosync_transport: unicast
-      cluster_count: 3
-  pacemaker-remote:
-    charm: cs:~openstack-charmers-next/pacemaker-remote
-    options:
-      enable-stonith: False
-      enable-resources: False
-  vault:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/vault
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-train

src/tests/bundles/bionic-ussuri-pacemaker-remote-ssl.yaml

@@ -1,215 +0,0 @@
-series: bionic
-relations:
-- - nova-compute:amqp
-  - rabbitmq-server:amqp
-- - neutron-gateway:amqp
-  - rabbitmq-server:amqp
-- - neutron-gateway:amqp-nova
-  - rabbitmq-server:amqp
-- - keystone:shared-db
-  - mysql:shared-db
-- - cinder:identity-service
-  - keystone:identity-service
-- - nova-cloud-controller:identity-service
-  - keystone:identity-service
-- - glance:identity-service
-  - keystone:identity-service
-- - neutron-api:identity-service
-  - keystone:identity-service
-- - neutron-openvswitch:neutron-plugin-api
-  - neutron-api:neutron-plugin-api
-- - cinder:shared-db
-  - mysql:shared-db
-- - neutron-api:shared-db
-  - mysql:shared-db
-- - cinder:amqp
-  - rabbitmq-server:amqp
-- - neutron-api:amqp
-  - rabbitmq-server:amqp
-- - neutron-gateway:neutron-plugin-api
-  - neutron-api:neutron-plugin-api
-- - glance:shared-db
-  - mysql:shared-db
-- - glance:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:image-service
-  - glance:image-service
-- - nova-compute:image-service
-  - glance:image-service
-- - nova-cloud-controller:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:quantum-network-service
-  - neutron-gateway:quantum-network-service
-- - nova-compute:neutron-plugin
-  - neutron-openvswitch:neutron-plugin
-- - neutron-openvswitch:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:shared-db
-  - mysql:shared-db
-- - nova-cloud-controller:neutron-api
-  - neutron-api:neutron-api
-- - nova-cloud-controller:cloud-compute
-  - nova-compute:cloud-compute
-- - masakari:shared-db
-  - mysql:shared-db
-- - masakari:amqp
-  - rabbitmq-server:amqp
-- - masakari:identity-service
-  - keystone:identity-service
-- - glance:ceph
-  - ceph-mon:client
-- - ceph-mon:osd
-  - ceph-osd:mon
-- - cinder:storage-backend
-  - cinder-ceph:storage-backend
-- - cinder-ceph:ceph
-  - ceph-mon:client
-- - cinder-ceph:ceph-access
-  - nova-compute:ceph-access
-- - nova-compute:juju-info
-  - masakari-monitors:container
-- - masakari:ha
-  - hacluster:ha
-- - keystone:identity-credentials
-  - masakari-monitors:identity-credentials
-- - nova-compute:juju-info
-  - pacemaker-remote:juju-info
-- - hacluster:pacemaker-remote
-  - pacemaker-remote:pacemaker-remote
-- - vault:shared-db
-  - mysql:shared-db
-- - vault:certificates
-  - keystone:certificates
-- - vault:certificates
-  - neutron-api:certificates
-- - vault:certificates
-  - cinder:certificates
-- - vault:certificates
-  - glance:certificates
-- - vault:certificates
-  - nova-cloud-controller:certificates
-- - vault:certificates
-  - masakari:certificates
-- - placement:shared-db
-  - mysql:shared-db
-- - placement:identity-service
-  - keystone:identity-service
-- - placement:placement
-  - nova-cloud-controller:placement
-- - vault:certificates
-  - placement:certificates
-applications:
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-ussuri
-      worker-multiplier: 0.25
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-ussuri
-      block-device: "None"
-      glance-api-version: 2
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    series: bionic
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: cloud:bionic-ussuri
-      worker-multiplier: 0.25
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      max-connections: 1000
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: cloud:bionic-ussuri
-      worker-multiplier: 0.25
-  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: cloud:bionic-ussuri
-      worker-multiplier: 0.25
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-    num_units: 0
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: cloud:bionic-ussuri
-      worker-multiplier: 0.25
-      debug: true
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 3
-    constraints: mem=4G
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: cloud:bionic-ussuri
-      debug: true
-      cpu-model: kvm64
-      cpu-mode: custom
-      # Allow for more retries when testing ontop of openstack
-      config-flags: block_device_allocate_retries=120
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-  masakari:
-    charm: ../../../masakari
-    series: bionic
-    num_units: 3
-    options:
-      openstack-origin: cloud:bionic-ussuri
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: cloud:bionic-ussuri
-      expected-osd-count: 3
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    constraints: mem=1G
-    num_units: 3
-    options:
-      source: cloud:bionic-ussuri
-    storage:
-      osd-devices:  cinder,40G
-  cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
-  masakari-monitors:
-    charm: cs:~openstack-charmers-next/masakari-monitors
-  hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
-    options:
-      corosync_transport: unicast
-      cluster_count: 3
-  pacemaker-remote:
-    charm: cs:~openstack-charmers-next/pacemaker-remote
-    options:
-      enable-stonith: False
-      enable-resources: False
-  vault:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/vault
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-ussuri

src/tests/bundles/focal-ussuri-pacemaker-remote-ssl.yaml

@@ -1,391 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-series: focal
-
-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':
-    constraints: mem=4096M
-  '9':
-    constraints: mem=4096M
-  '10':
-    constraints: mem=4096M
-  '11':
-  '12':
-  '13':
-  '14':
-  '15':
-  '16':
-  '17':
-  '18':
-  '19':
-  '20':
-  '21':
-  '22':
-  '23':
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  cinder-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  masakari-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '3'
-
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      block-device: "None"
-      glance-api-version: 2
-    to:
-      - '4'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '5'
-
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '6'
-
-  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '7'
-
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-    num_units: 0
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-      debug: true
-    to:
-      - '23'
-
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 3
-    constraints: mem=4G
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *openstack-origin
-      debug: true
-      cpu-model: kvm64
-      cpu-mode: custom
-      # Allow for more retries when testing ontop of openstack
-      config-flags: block_device_allocate_retries=120
-    to:
-      - '8'
-      - '9'
-      - '10'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-      - '11'
-
-  masakari:
-    charm: ../../../masakari
-    series: focal
-    num_units: 3
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '12'
-      - '13'
-      - '14'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-      expected-osd-count: 3
-    to:
-      - '15'
-      - '16'
-      - '17'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    constraints: mem=1G
-    num_units: 3
-    options:
-      source: *openstack-origin
-    storage:
-      osd-devices:  cinder,40G
-    to:
-      - '18'
-      - '19'
-      - '20'
-
-  cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
-
-  masakari-monitors:
-    charm: cs:~openstack-charmers-next/masakari-monitors
-
-  hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
-    options:
-      corosync_transport: unicast
-      cluster_count: 3
-
-  pacemaker-remote:
-    charm: cs:~openstack-charmers-next/pacemaker-remote
-    options:
-      enable-stonith: False
-      enable-resources: False
-
-  vault:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/vault
-    to:
-      - '21'
-
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '22'
-
-relations:
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-gateway:amqp-nova'
-    - 'rabbitmq-server:amqp'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'cinder:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'neutron-openvswitch:neutron-plugin-api'
-    - 'neutron-api:neutron-plugin-api'
-
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-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'
-
-  - - 'cinder:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-api:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-gateway:neutron-plugin-api'
-    - 'neutron-api:neutron-plugin-api'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:neutron-api'
-    - 'neutron-api:neutron-api'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'masakari:shared-db'
-    - 'masakari-mysql-router:shared-db'
-  - - 'masakari-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'masakari:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'masakari:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:ceph'
-    - 'ceph-mon:client'
-
-  - - 'ceph-mon:osd'
-    - 'ceph-osd:mon'
-
-  - - 'cinder:storage-backend'
-    - 'cinder-ceph:storage-backend'
-
-  - - 'cinder-ceph:ceph'
-    - 'ceph-mon:client'
-
-  - - 'cinder-ceph:ceph-access'
-    - 'nova-compute:ceph-access'
-
-  - - 'nova-compute:juju-info'
-    - 'masakari-monitors:container'
-
-  - - 'masakari:ha'
-    - 'hacluster:ha'
-
-  - - 'keystone:identity-credentials'
-    - 'masakari-monitors:identity-credentials'
-
-  - - 'nova-compute:juju-info'
-    - 'pacemaker-remote:juju-info'
-
-  - - 'hacluster:pacemaker-remote'
-    - 'pacemaker-remote:pacemaker-remote'
-
-  - - 'vault:shared-db'
-    - 'vault-mysql-router:shared-db'
-  - - 'vault-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'vault:certificates'
-    - 'keystone:certificates'
-
-  - - 'vault:certificates'
-    - 'neutron-api:certificates'
-
-  - - 'vault:certificates'
-    - 'cinder:certificates'
-
-  - - 'vault:certificates'
-    - 'glance:certificates'
-
-  - - 'vault:certificates'
-    - 'nova-cloud-controller:certificates'
-
-  - - 'vault:certificates'
-    - 'masakari:certificates'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - 'vault:certificates'
-    - 'placement:certificates'

src/tests/bundles/focal-victoria-pacemaker-remote-ssl.yaml

@@ -1,391 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:focal-victoria
-
-series: focal
-
-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':
-    constraints: mem=4096M
-  '9':
-    constraints: mem=4096M
-  '10':
-    constraints: mem=4096M
-  '11':
-  '12':
-  '13':
-  '14':
-  '15':
-  '16':
-  '17':
-  '18':
-  '19':
-  '20':
-  '21':
-  '22':
-  '23':
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  cinder-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  masakari-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '3'
-
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      block-device: "None"
-      glance-api-version: 2
-    to:
-      - '4'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '5'
-
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '6'
-
-  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '7'
-
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-    num_units: 0
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-      debug: true
-    to:
-      - '23'
-
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 3
-    constraints: mem=4G
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *openstack-origin
-      debug: true
-      cpu-model: kvm64
-      cpu-mode: custom
-      # Allow for more retries when testing ontop of openstack
-      config-flags: block_device_allocate_retries=120
-    to:
-      - '8'
-      - '9'
-      - '10'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-      - '11'
-
-  masakari:
-    charm: ../../../masakari
-    series: focal
-    num_units: 3
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '12'
-      - '13'
-      - '14'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-      expected-osd-count: 3
-    to:
-      - '15'
-      - '16'
-      - '17'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    constraints: mem=1G
-    num_units: 3
-    options:
-      source: *openstack-origin
-    storage:
-      osd-devices:  cinder,40G
-    to:
-      - '18'
-      - '19'
-      - '20'
-
-  cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
-
-  masakari-monitors:
-    charm: cs:~openstack-charmers-next/masakari-monitors
-
-  hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
-    options:
-      corosync_transport: unicast
-      cluster_count: 3
-
-  pacemaker-remote:
-    charm: cs:~openstack-charmers-next/pacemaker-remote
-    options:
-      enable-stonith: False
-      enable-resources: False
-
-  vault:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/vault
-    to:
-      - '21'
-
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '22'
-
-relations:
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-gateway:amqp-nova'
-    - 'rabbitmq-server:amqp'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'cinder:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'neutron-openvswitch:neutron-plugin-api'
-    - 'neutron-api:neutron-plugin-api'
-
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-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'
-
-  - - 'cinder:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-api:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-gateway:neutron-plugin-api'
-    - 'neutron-api:neutron-plugin-api'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:neutron-api'
-    - 'neutron-api:neutron-api'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'masakari:shared-db'
-    - 'masakari-mysql-router:shared-db'
-  - - 'masakari-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'masakari:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'masakari:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:ceph'
-    - 'ceph-mon:client'
-
-  - - 'ceph-mon:osd'
-    - 'ceph-osd:mon'
-
-  - - 'cinder:storage-backend'
-    - 'cinder-ceph:storage-backend'
-
-  - - 'cinder-ceph:ceph'
-    - 'ceph-mon:client'
-
-  - - 'cinder-ceph:ceph-access'
-    - 'nova-compute:ceph-access'
-
-  - - 'nova-compute:juju-info'
-    - 'masakari-monitors:container'
-
-  - - 'masakari:ha'
-    - 'hacluster:ha'
-
-  - - 'keystone:identity-credentials'
-    - 'masakari-monitors:identity-credentials'
-
-  - - 'nova-compute:juju-info'
-    - 'pacemaker-remote:juju-info'
-
-  - - 'hacluster:pacemaker-remote'
-    - 'pacemaker-remote:pacemaker-remote'
-
-  - - 'vault:shared-db'
-    - 'vault-mysql-router:shared-db'
-  - - 'vault-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'vault:certificates'
-    - 'keystone:certificates'
-
-  - - 'vault:certificates'
-    - 'neutron-api:certificates'
-
-  - - 'vault:certificates'
-    - 'cinder:certificates'
-
-  - - 'vault:certificates'
-    - 'glance:certificates'
-
-  - - 'vault:certificates'
-    - 'nova-cloud-controller:certificates'
-
-  - - 'vault:certificates'
-    - 'masakari:certificates'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - 'vault:certificates'
-    - 'placement:certificates'

src/tests/bundles/focal-wallaby-pacemaker-remote-ssl.yaml

@@ -1,391 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:focal-wallaby
-
-series: focal
-
-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':
-    constraints: mem=4096M
-  '9':
-    constraints: mem=4096M
-  '10':
-    constraints: mem=4096M
-  '11':
-  '12':
-  '13':
-  '14':
-  '15':
-  '16':
-  '17':
-  '18':
-  '19':
-  '20':
-  '21':
-  '22':
-  '23':
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  cinder-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  masakari-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '3'
-
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      block-device: "None"
-      glance-api-version: 2
-    to:
-      - '4'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '5'
-
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '6'
-
-  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '7'
-
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-    num_units: 0
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-      debug: true
-    to:
-      - '23'
-
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 3
-    constraints: mem=4G
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *openstack-origin
-      debug: true
-      cpu-model: kvm64
-      cpu-mode: custom
-      # Allow for more retries when testing ontop of openstack
-      config-flags: block_device_allocate_retries=120
-    to:
-      - '8'
-      - '9'
-      - '10'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-      - '11'
-
-  masakari:
-    charm: ../../../masakari
-    series: focal
-    num_units: 3
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '12'
-      - '13'
-      - '14'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-      expected-osd-count: 3
-    to:
-      - '15'
-      - '16'
-      - '17'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    constraints: mem=1G
-    num_units: 3
-    options:
-      source: *openstack-origin
-    storage:
-      osd-devices:  cinder,40G
-    to:
-      - '18'
-      - '19'
-      - '20'
-
-  cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
-
-  masakari-monitors:
-    charm: cs:~openstack-charmers-next/masakari-monitors
-
-  hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
-    options:
-      corosync_transport: unicast
-      cluster_count: 3
-
-  pacemaker-remote:
-    charm: cs:~openstack-charmers-next/pacemaker-remote
-    options:
-      enable-stonith: False
-      enable-resources: False
-
-  vault:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/vault
-    to:
-      - '21'
-
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '22'
-
-relations:
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-gateway:amqp-nova'
-    - 'rabbitmq-server:amqp'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'cinder:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'neutron-openvswitch:neutron-plugin-api'
-    - 'neutron-api:neutron-plugin-api'
-
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-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'
-
-  - - 'cinder:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-api:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-gateway:neutron-plugin-api'
-    - 'neutron-api:neutron-plugin-api'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:neutron-api'
-    - 'neutron-api:neutron-api'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'masakari:shared-db'
-    - 'masakari-mysql-router:shared-db'
-  - - 'masakari-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'masakari:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'masakari:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:ceph'
-    - 'ceph-mon:client'
-
-  - - 'ceph-mon:osd'
-    - 'ceph-osd:mon'
-
-  - - 'cinder:storage-backend'
-    - 'cinder-ceph:storage-backend'
-
-  - - 'cinder-ceph:ceph'
-    - 'ceph-mon:client'
-
-  - - 'cinder-ceph:ceph-access'
-    - 'nova-compute:ceph-access'
-
-  - - 'nova-compute:juju-info'
-    - 'masakari-monitors:container'
-
-  - - 'masakari:ha'
-    - 'hacluster:ha'
-
-  - - 'keystone:identity-credentials'
-    - 'masakari-monitors:identity-credentials'
-
-  - - 'nova-compute:juju-info'
-    - 'pacemaker-remote:juju-info'
-
-  - - 'hacluster:pacemaker-remote'
-    - 'pacemaker-remote:pacemaker-remote'
-
-  - - 'vault:shared-db'
-    - 'vault-mysql-router:shared-db'
-  - - 'vault-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'vault:certificates'
-    - 'keystone:certificates'
-
-  - - 'vault:certificates'
-    - 'neutron-api:certificates'
-
-  - - 'vault:certificates'
-    - 'cinder:certificates'
-
-  - - 'vault:certificates'
-    - 'glance:certificates'
-
-  - - 'vault:certificates'
-    - 'nova-cloud-controller:certificates'
-
-  - - 'vault:certificates'
-    - 'masakari:certificates'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - 'vault:certificates'
-    - 'placement:certificates'

src/tests/bundles/focal-xena-pacemaker-remote-ssl.yaml

@@ -1,6 +1,8 @@
 variables:
   openstack-origin: &openstack-origin cloud:focal-xena
 
+local_overlay_enabled: False
+
 series: focal
 
 comment:
@@ -40,24 +42,32 @@ machines:
 applications:
 
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   cinder-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   masakari-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
 
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     options:
       source: *openstack-origin
@@ -65,18 +75,20 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       worker-multiplier: 0.25
     to:
       - '3'
+    channel: latest/edge
 
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: ch:cinder
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -84,9 +96,10 @@ applications:
       glance-api-version: 2
     to:
       - '4'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       admin-password: openstack
@@ -94,9 +107,10 @@ applications:
       worker-multiplier: 0.25
     to:
       - '5'
+    channel: latest/edge
 
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
     num_units: 1
     options:
       manage-neutron-plugin-legacy-mode: true
@@ -106,9 +120,10 @@ applications:
       worker-multiplier: 0.25
     to:
       - '6'
+    channel: latest/edge
 
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: ch:neutron-gateway
     num_units: 1
     options:
       bridge-mappings: physnet1:br-ex
@@ -116,13 +131,15 @@ applications:
       worker-multiplier: 0.25
     to:
       - '7'
+    channel: latest/edge
 
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: ch:neutron-openvswitch
     num_units: 0
+    channel: latest/edge
 
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
@@ -131,9 +148,10 @@ applications:
       debug: true
     to:
       - '23'
+    channel: latest/edge
 
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 3
     constraints: mem=4G
     options:
@@ -151,15 +169,17 @@ applications:
       - '8'
       - '9'
       - '10'
+    channel: latest/edge
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     to:
       - '11'
+    channel: latest/edge
 
   masakari:
-    charm: ../../../masakari
+    charm: ../../../masakari.charm
     series: focal
     num_units: 3
     options:
@@ -170,7 +190,7 @@ applications:
       - '14'
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     options:
       source: *openstack-origin
@@ -179,9 +199,10 @@ applications:
       - '15'
       - '16'
       - '17'
+    channel: latest/edge
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     constraints: mem=1G
     num_units: 3
     options:
@@ -192,18 +213,22 @@ applications:
       - '18'
       - '19'
       - '20'
+    channel: latest/edge
 
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: ch:cinder-ceph
+    channel: latest/edge
 
   masakari-monitors:
-    charm: cs:~openstack-charmers-next/masakari-monitors
+    charm: ch:masakari-monitors
+    channel: latest/edge
 
   hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: ch:hacluster
     options:
       corosync_transport: unicast
       cluster_count: 3
+    channel: latest/edge
 
   pacemaker-remote:
     charm: cs:~openstack-charmers-next/pacemaker-remote
@@ -213,17 +238,19 @@ applications:
 
   vault:
     num_units: 1
-    charm: cs:~openstack-charmers-next/vault
+    charm: ch:vault
     to:
       - '21'
+    channel: latest/edge
 
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '22'
+    channel: latest/edge
 
 relations:
 

src/tests/bundles/focal-yoga-pacemaker-remote-ssl.yaml

@@ -1,6 +1,8 @@
 variables:
   openstack-origin: &openstack-origin cloud:focal-yoga
 
+local_overlay_enabled: False
+
 series: focal
 
 comment:
@@ -40,24 +42,32 @@ machines:
 applications:
 
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   cinder-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   masakari-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
 
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     options:
       source: *openstack-origin
@@ -65,18 +75,20 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       worker-multiplier: 0.25
     to:
       - '3'
+    channel: latest/edge
 
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: ch:cinder
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -84,9 +96,10 @@ applications:
       glance-api-version: 2
     to:
       - '4'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       admin-password: openstack
@@ -94,9 +107,10 @@ applications:
       worker-multiplier: 0.25
     to:
       - '5'
+    channel: latest/edge
 
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
     num_units: 1
     options:
       manage-neutron-plugin-legacy-mode: true
@@ -106,9 +120,10 @@ applications:
       worker-multiplier: 0.25
     to:
       - '6'
+    channel: latest/edge
 
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: ch:neutron-gateway
     num_units: 1
     options:
       bridge-mappings: physnet1:br-ex
@@ -116,13 +131,15 @@ applications:
       worker-multiplier: 0.25
     to:
       - '7'
+    channel: latest/edge
 
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: ch:neutron-openvswitch
     num_units: 0
+    channel: latest/edge
 
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
@@ -131,9 +148,10 @@ applications:
       debug: true
     to:
       - '23'
+    channel: latest/edge
 
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 3
     constraints: mem=4G
     options:
@@ -151,15 +169,17 @@ applications:
       - '8'
       - '9'
       - '10'
+    channel: latest/edge
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     to:
       - '11'
+    channel: latest/edge
 
   masakari:
-    charm: ../../../masakari
+    charm: ../../../masakari.charm
     series: focal
     num_units: 3
     options:
@@ -170,7 +190,7 @@ applications:
       - '14'
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     options:
       source: *openstack-origin
@@ -179,9 +199,10 @@ applications:
       - '15'
       - '16'
       - '17'
+    channel: latest/edge
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     constraints: mem=1G
     num_units: 3
     options:
@@ -192,18 +213,22 @@ applications:
       - '18'
       - '19'
       - '20'
+    channel: latest/edge
 
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: ch:cinder-ceph
+    channel: latest/edge
 
   masakari-monitors:
-    charm: cs:~openstack-charmers-next/masakari-monitors
+    charm: ch:masakari-monitors
+    channel: latest/edge
 
   hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: ch:hacluster
     options:
       corosync_transport: unicast
       cluster_count: 3
+    channel: latest/edge
 
   pacemaker-remote:
     charm: cs:~openstack-charmers-next/pacemaker-remote
@@ -213,17 +238,19 @@ applications:
 
   vault:
     num_units: 1
-    charm: cs:~openstack-charmers-next/vault
+    charm: ch:vault
     to:
       - '21'
+    channel: latest/edge
 
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '22'
+    channel: latest/edge
 
 relations:
 

src/tests/bundles/hirsute-wallaby-pacemaker-remote-ssl.yaml

@@ -1,390 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-series: hirsute
-
-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':
-    constraints: mem=4096M
-  '9':
-    constraints: mem=4096M
-  '10':
-    constraints: mem=4096M
-  '11':
-  '12':
-  '13':
-  '14':
-  '15':
-  '16':
-  '17':
-  '18':
-  '19':
-  '20':
-  '21':
-  '22':
-  '23':
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  cinder-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  masakari-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '3'
-
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      block-device: "None"
-      glance-api-version: 2
-    to:
-      - '4'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '5'
-
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '6'
-
-  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '7'
-
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-    num_units: 0
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-      debug: true
-    to:
-      - '23'
-
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 3
-    constraints: mem=4G
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *openstack-origin
-      debug: true
-      cpu-model: kvm64
-      cpu-mode: custom
-      # Allow for more retries when testing ontop of openstack
-      config-flags: block_device_allocate_retries=120
-    to:
-      - '8'
-      - '9'
-      - '10'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-      - '11'
-
-  masakari:
-    charm: ../../../masakari
-    num_units: 3
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '12'
-      - '13'
-      - '14'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-      expected-osd-count: 3
-    to:
-      - '15'
-      - '16'
-      - '17'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    constraints: mem=1G
-    num_units: 3
-    options:
-      source: *openstack-origin
-    storage:
-      osd-devices:  cinder,40G
-    to:
-      - '18'
-      - '19'
-      - '20'
-
-  cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
-
-  masakari-monitors:
-    charm: cs:~openstack-charmers-next/masakari-monitors
-
-  hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
-    options:
-      corosync_transport: unicast
-      cluster_count: 3
-
-  pacemaker-remote:
-    charm: cs:~openstack-charmers-next/pacemaker-remote
-    options:
-      enable-stonith: False
-      enable-resources: False
-
-  vault:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/vault
-    to:
-      - '21'
-
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '22'
-
-relations:
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-gateway:amqp-nova'
-    - 'rabbitmq-server:amqp'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'cinder:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'neutron-openvswitch:neutron-plugin-api'
-    - 'neutron-api:neutron-plugin-api'
-
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-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'
-
-  - - 'cinder:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-api:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-gateway:neutron-plugin-api'
-    - 'neutron-api:neutron-plugin-api'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:neutron-api'
-    - 'neutron-api:neutron-api'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'masakari:shared-db'
-    - 'masakari-mysql-router:shared-db'
-  - - 'masakari-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'masakari:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'masakari:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:ceph'
-    - 'ceph-mon:client'
-
-  - - 'ceph-mon:osd'
-    - 'ceph-osd:mon'
-
-  - - 'cinder:storage-backend'
-    - 'cinder-ceph:storage-backend'
-
-  - - 'cinder-ceph:ceph'
-    - 'ceph-mon:client'
-
-  - - 'cinder-ceph:ceph-access'
-    - 'nova-compute:ceph-access'
-
-  - - 'nova-compute:juju-info'
-    - 'masakari-monitors:container'
-
-  - - 'masakari:ha'
-    - 'hacluster:ha'
-
-  - - 'keystone:identity-credentials'
-    - 'masakari-monitors:identity-credentials'
-
-  - - 'nova-compute:juju-info'
-    - 'pacemaker-remote:juju-info'
-
-  - - 'hacluster:pacemaker-remote'
-    - 'pacemaker-remote:pacemaker-remote'
-
-  - - 'vault:shared-db'
-    - 'vault-mysql-router:shared-db'
-  - - 'vault-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'vault:certificates'
-    - 'keystone:certificates'
-
-  - - 'vault:certificates'
-    - 'neutron-api:certificates'
-
-  - - 'vault:certificates'
-    - 'cinder:certificates'
-
-  - - 'vault:certificates'
-    - 'glance:certificates'
-
-  - - 'vault:certificates'
-    - 'nova-cloud-controller:certificates'
-
-  - - 'vault:certificates'
-    - 'masakari:certificates'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - 'vault:certificates'
-    - 'placement:certificates'

src/tests/bundles/impish-xena-pacemaker-remote-ssl.yaml

@@ -1,6 +1,8 @@
 variables:
   openstack-origin: &openstack-origin distro
 
+local_overlay_enabled: False
+
 series: impish
 
 comment:
@@ -40,24 +42,32 @@ machines:
 applications:
 
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   cinder-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   masakari-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
 
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     options:
       source: *openstack-origin
@@ -65,18 +75,20 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       worker-multiplier: 0.25
     to:
       - '3'
+    channel: latest/edge
 
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: ch:cinder
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -84,9 +96,10 @@ applications:
       glance-api-version: 2
     to:
       - '4'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       admin-password: openstack
@@ -94,9 +107,10 @@ applications:
       worker-multiplier: 0.25
     to:
       - '5'
+    channel: latest/edge
 
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
     num_units: 1
     options:
       manage-neutron-plugin-legacy-mode: true
@@ -106,9 +120,10 @@ applications:
       worker-multiplier: 0.25
     to:
       - '6'
+    channel: latest/edge
 
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: ch:neutron-gateway
     num_units: 1
     options:
       bridge-mappings: physnet1:br-ex
@@ -116,13 +131,15 @@ applications:
       worker-multiplier: 0.25
     to:
       - '7'
+    channel: latest/edge
 
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: ch:neutron-openvswitch
     num_units: 0
+    channel: latest/edge
 
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
@@ -131,9 +148,10 @@ applications:
       debug: true
     to:
       - '23'
+    channel: latest/edge
 
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 3
     constraints: mem=4G
     options:
@@ -151,15 +169,17 @@ applications:
       - '8'
       - '9'
       - '10'
+    channel: latest/edge
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     to:
       - '11'
+    channel: latest/edge
 
   masakari:
-    charm: ../../../masakari
+    charm: ../../../masakari.charm
     num_units: 3
     options:
       openstack-origin: *openstack-origin
@@ -169,7 +189,7 @@ applications:
       - '14'
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     options:
       source: *openstack-origin
@@ -178,9 +198,10 @@ applications:
       - '15'
       - '16'
       - '17'
+    channel: latest/edge
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     constraints: mem=1G
     num_units: 3
     options:
@@ -191,18 +212,22 @@ applications:
       - '18'
       - '19'
       - '20'
+    channel: latest/edge
 
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: ch:cinder-ceph
+    channel: latest/edge
 
   masakari-monitors:
-    charm: cs:~openstack-charmers-next/masakari-monitors
+    charm: ch:masakari-monitors
+    channel: latest/edge
 
   hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: ch:hacluster
     options:
       corosync_transport: unicast
       cluster_count: 3
+    channel: latest/edge
 
   pacemaker-remote:
     charm: cs:~openstack-charmers-next/pacemaker-remote
@@ -212,17 +237,19 @@ applications:
 
   vault:
     num_units: 1
-    charm: cs:~openstack-charmers-next/vault
+    charm: ch:vault
     to:
       - '21'
+    channel: latest/edge
 
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '22'
+    channel: latest/edge
 
 relations:
 

src/tests/bundles/jammy-yoga-pacemaker-remote-ssl.yaml

@@ -1,6 +1,8 @@
 variables:
   openstack-origin: &openstack-origin distro
 
+local_overlay_enabled: False
+
 series: jammy
 
 comment:
@@ -40,24 +42,32 @@ machines:
 applications:
 
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   cinder-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   masakari-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
 
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     options:
       source: *openstack-origin
@@ -65,18 +75,20 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       worker-multiplier: 0.25
     to:
       - '3'
+    channel: latest/edge
 
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: ch:cinder
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -84,9 +96,10 @@ applications:
       glance-api-version: 2
     to:
       - '4'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       admin-password: openstack
@@ -94,9 +107,10 @@ applications:
       worker-multiplier: 0.25
     to:
       - '5'
+    channel: latest/edge
 
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
     num_units: 1
     options:
       manage-neutron-plugin-legacy-mode: true
@@ -106,9 +120,10 @@ applications:
       worker-multiplier: 0.25
     to:
       - '6'
+    channel: latest/edge
 
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: ch:neutron-gateway
     num_units: 1
     options:
       bridge-mappings: physnet1:br-ex
@@ -116,13 +131,15 @@ applications:
       worker-multiplier: 0.25
     to:
       - '7'
+    channel: latest/edge
 
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: ch:neutron-openvswitch
     num_units: 0
+    channel: latest/edge
 
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
@@ -131,9 +148,10 @@ applications:
       debug: true
     to:
       - '23'
+    channel: latest/edge
 
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 3
     constraints: mem=4G
     options:
@@ -151,15 +169,17 @@ applications:
       - '8'
       - '9'
       - '10'
+    channel: latest/edge
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     to:
       - '11'
+    channel: latest/edge
 
   masakari:
-    charm: ../../../masakari
+    charm: ../../../masakari.charm
     num_units: 3
     options:
       openstack-origin: *openstack-origin
@@ -169,7 +189,7 @@ applications:
       - '14'
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     options:
       source: *openstack-origin
@@ -178,9 +198,10 @@ applications:
       - '15'
       - '16'
       - '17'
+    channel: latest/edge
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     constraints: mem=1G
     num_units: 3
     options:
@@ -191,18 +212,22 @@ applications:
       - '18'
       - '19'
       - '20'
+    channel: latest/edge
 
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: ch:cinder-ceph
+    channel: latest/edge
 
   masakari-monitors:
-    charm: cs:~openstack-charmers-next/masakari-monitors
+    charm: ch:masakari-monitors
+    channel: latest/edge
 
   hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: ch:hacluster
     options:
       corosync_transport: unicast
       cluster_count: 3
+    channel: latest/edge
 
   pacemaker-remote:
     charm: cs:~openstack-charmers-next/pacemaker-remote
@@ -212,17 +237,19 @@ applications:
 
   vault:
     num_units: 1
-    charm: cs:~openstack-charmers-next/vault
+    charm: ch:vault
     to:
       - '21'
+    channel: latest/edge
 
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '22'
+    channel: latest/edge
 
 relations:
 

src/tests/tests.yaml

@@ -13,45 +13,37 @@ configure:
   - zaza.openstack.charm_tests.masakari.setup.create_segments
 
 gate_bundles:
-  - bionic-stein-pacemaker-remote-ssl
-  - bionic-ussuri-pacemaker-remote-ssl
-  - focal-ussuri-pacemaker-remote-ssl
-  - focal-victoria-pacemaker-remote-ssl
   - focal-wallaby-pacemaker-remote-ssl
   - focal-xena-pacemaker-remote-ssl
-  - hirsute-wallaby-pacemaker-remote-ssl
   - impish-xena-pacemaker-remote-ssl
 
 dev_bundles:
 # Rocky disabled until https://review.opendev.org/#/c/647756/ lands in
 # packaging
-  - bionic-rocky-pacemaker-remote-ssl
-  - bionic-train-pacemaker-remote-ssl
   - focal-yoga-pacemaker-remote-ssl
   - jammy-yoga-pacemaker-remote-ssl
 
 smoke_bundles:
-  - focal-ussuri-pacemaker-remote-ssl
+  - focal-xena-pacemaker-remote-ssl
 
 target_deploy_status:
   easyrsa:
-    workload-status-message: Certificate Authority connected.
+    workload-status-message-prefix: Certificate Authority connected.
   etcd:
-    workload-status-message: Healthy
+    workload-status-message-prefix: Healthy
   postgresql:
-    workload-status-message: Live
+    workload-status-message-prefix: Live
   vault:
     workload-status: blocked
-    workload-status-message: Vault needs to be initialized
+    workload-status-message-prefix: Vault needs to be initialized
   ceph-osd:
     workload-status: waiting
-    workload-status-message: "Incomplete relation: vault"
+    workload-status-message-prefix: "Incomplete relation: vault"
   ceph-mon:
     workload-status: waiting
-    workload-status-message: "Monitor bootstrapped but waiting for number of OSDs to reach expected-osd-count (3)"
+    workload-status-message-prefix: "Monitor bootstrapped but waiting for number of OSDs to reach expected-osd-count (3)"
 
 tests_options:
   force_deploy:
-    - hirsute-wallaby-pacemaker-remote-ssl
     - impish-xena-pacemaker-remote-ssl
     - jammy-yoga-pacemaker-remote-ssl

src/wheelhouse.txt

@@ -1,7 +1,7 @@
 dnspython
-
+poetry-core
 psutil
-
+six
 git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
 
 git+https://github.com/juju/charm-helpers.git#egg=charmhelpers

test-requirements.txt

@@ -28,6 +28,11 @@ oslo.utils<=3.41.0;python_version<'3.6'
 requests>=2.18.4
 charms.reactive
 
+# Newer mock seems to have some syntax which is newer than python3.5 (e.g.
+# f'{something}'
+mock>=1.2,<4.0.0; python_version < '3.6'
+mock>=1.2; python_version >= '3.6'
+
 nose>=1.3.7
 coverage>=3.6
 git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
@@ -46,3 +51,4 @@ pbr==5.6.0       # vault
 cryptography<3.4 # vault, keystone-saml-mellon
 lxml             # keystone-saml-mellon
 hvac             # vault, barbican-vault
+psutil           # cinder-lvm

tox.ini

@@ -37,11 +37,24 @@ setenv = VIRTUAL_ENV={envdir}
 passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY
 install_command =
   {toxinidir}/pip.sh install {opts} {packages}
+allowlist_externals =
+    charmcraft
+    bash
+    tox
+    rename.sh
 deps =
     -r{toxinidir}/requirements.txt
 
 [testenv:build]
 basepython = python3
+deps = -r{toxinidir}/build-requirements.txt
+commands =
+    charmcraft clean
+    charmcraft -v build
+    {toxinidir}/rename.sh
+
+[testenv:build-reactive]
+basepython = python3
 commands =
     charm-build --log-level DEBUG --use-lock-file-branches -o {toxinidir}/build/builds src {posargs}
 
@@ -86,6 +99,18 @@ deps = flake8==3.9.2
        charm-tools==2.8.3
 commands = flake8 {posargs} src unit_tests
 
+[testenv:func-target]
+# Hack to get functional tests working in the charmcraft
+# world. We should fix this.
+basepython = python3
+passenv = HOME TERM CS_* OS_* TEST_*
+deps = -r{toxinidir}/src/test-requirements.txt
+changedir = {toxinidir}/src
+commands =
+  bash -c "if [ ! -f ../*.charm ]; then echo 'Charm does not exist. Run tox -e build'; exit 1; fi"
+  tox --version
+  tox -e func-target {posargs}
+
 [testenv:cover]
 # Technique based heavily upon
 # https://github.com/openstack/nova/blob/master/tox.ini