Add xena bundles

- add non-voting focal-xena bundle
- add non-voting impish-xena bundle
- remove groovy-victoria bundle
- align bundles and tests.yaml with designate charm mainly
  to allow test_nrpe_configured to be successful
- rebuild to pick up charm-helpers changes
- update tox/pip.sh to ensure setuptools<50.0.0

Change-Id: I4ba5af13097661bbd4966891c6628abf8a425659
Co-authored-by: Aurelien Lourot <aurelien.lourot@canonical.com>

osci.yaml

@@ -2,6 +2,12 @@
     templates:
       - charm-unit-jobs
       - charm-functional-jobs
+    check:
+      jobs:
+        - focal-xena:
+            voting: false
+        - impish-xena:
+            voting: false
     vars:
       needs_charm_build: true
       charm_build_name: designate-bind

pip.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+#
+# This file is managed centrally by release-tools and should not be modified
+# within individual charm repos.  See the 'global' dir contents for available
+# choices of tox.ini for OpenStack Charms:
+#     https://github.com/openstack-charmers/release-tools
+#
+# setuptools 58.0 dropped the support for use_2to3=true which is needed to
+# install blessings (an indirect dependency of charm-tools).
+#
+# More details on the beahvior of tox and virtualenv creation can be found at
+# https://github.com/tox-dev/tox/issues/448
+#
+# This script is wrapper to force the use of the pinned versions early in the
+# process when the virtualenv was created and upgraded before installing the
+# depedencies declared in the target.
+pip install 'pip<20.3' 'setuptools<50.0.0'
+pip "$@"

rebuild

@@ -2,4 +2,4 @@
 # when dependencies of the charm change,
 # but nothing in the charm needs to.
 # simply change the uuid to something new
-f9e6a1be-b3eb-11eb-acf2-f38cac67ecad
+53bafb42-1178-11ec-939d-3f35e616d7a2

src/tests/bundles/bionic-queens.yaml

@@ -8,6 +8,7 @@ machines:
   '3':
   '4':
   '5':
+  '6':
 
 applications:
   percona-cluster:
@@ -25,11 +26,9 @@ applications:
     num_units: 1
     to:
     - '2'
-  designate:
+  designate-bind:
-    charm: cs:~openstack-charmers-next/designate
+    charm: ../../../designate-bind
     num_units: 1
-    options:
-      nameservers: 'ns1.mojotest.com.'
     to:
     - '3'
   memcached:
@@ -37,11 +36,20 @@ applications:
     num_units: 1
     to:
     - '4'
-  designate-bind:
+  designate:
-    charm: ../../../designate-bind
+    charm: cs:~openstack-charmers-next/designate
     num_units: 1
+    options:
+      nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'
     to:
     - '5'
+  nrpe:
+    charm: cs:nrpe
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    to:
+    - '6'
 
 relations:
 - - 'designate:shared-db'
@@ -56,3 +64,13 @@ relations:
   - 'designate-bind:dns-backend'
 - - 'designate:coordinator-memcached'
   - 'memcached:cache'
+- - 'designate:dnsaas'
+  - 'neutron-api:external-dns'
+- - 'neutron-api:identity-service'
+  - 'keystone:identity-service'
+- - 'neutron-api:shared-db'
+  - 'percona-cluster:shared-db'
+- - 'neutron-api:amqp'
+  - 'rabbitmq-server:amqp'
+- - 'designate:nrpe-external-master'
+  - 'nrpe:nrpe-external-master'

src/tests/bundles/bionic-rocky.yaml

@@ -8,6 +8,7 @@ machines:
   '3':
   '4':
   '5':
+  '6':
 
 applications:
   percona-cluster:
@@ -27,12 +28,9 @@ applications:
     num_units: 1
     to:
     - '2'
-  designate:
+  designate-bind:
-    charm: cs:~openstack-charmers-next/designate
+    charm: ../../../designate-bind
     num_units: 1
-    options:
-      nameservers: 'ns1.mojotest.com.'
-      openstack-origin: cloud:bionic-rocky
     to:
     - '3'
   memcached:
@@ -40,11 +38,23 @@ applications:
     num_units: 1
     to:
     - '4'
-  designate-bind:
+  designate:
-    charm: ../../../designate-bind
+    charm: cs:~openstack-charmers-next/designate
     num_units: 1
+    options:
+      nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'
+      openstack-origin: cloud:bionic-rocky
     to:
     - '5'
+  nrpe:
+    charm: cs:nrpe
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-rocky
+    to:
+    - '6'
 
 relations:
 - - 'designate:shared-db'
@@ -59,3 +69,13 @@ relations:
   - 'designate-bind:dns-backend'
 - - 'designate:coordinator-memcached'
   - 'memcached:cache'
+- - 'designate:dnsaas'
+  - 'neutron-api:external-dns'
+- - 'neutron-api:identity-service'
+  - 'keystone:identity-service'
+- - 'neutron-api:shared-db'
+  - 'percona-cluster:shared-db'
+- - 'neutron-api:amqp'
+  - 'rabbitmq-server:amqp'
+- - 'designate:nrpe-external-master'
+  - 'nrpe:nrpe-external-master'

src/tests/bundles/bionic-stein.yaml

@@ -8,6 +8,7 @@ machines:
   '3':
   '4':
   '5':
+  '6':
 
 applications:
   percona-cluster:
@@ -27,12 +28,9 @@ applications:
     num_units: 1
     to:
     - '2'
-  designate:
+  designate-bind:
-    charm: cs:~openstack-charmers-next/designate
+    charm: ../../../designate-bind
     num_units: 1
-    options:
-      nameservers: 'ns1.mojotest.com.'
-      openstack-origin: cloud:bionic-stein
     to:
     - '3'
   memcached:
@@ -40,11 +38,23 @@ applications:
     num_units: 1
     to:
     - '4'
-  designate-bind:
+  designate:
-    charm: ../../../designate-bind
+    charm: cs:~openstack-charmers-next/designate
     num_units: 1
+    options:
+      nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'
+      openstack-origin: cloud:bionic-stein
     to:
     - '5'
+  nrpe:
+    charm: cs:nrpe
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-stein
+    to:
+    - '6'
 
 relations:
 - - 'designate:shared-db'
@@ -59,3 +69,13 @@ relations:
   - 'designate-bind:dns-backend'
 - - 'designate:coordinator-memcached'
   - 'memcached:cache'
+- - 'designate:dnsaas'
+  - 'neutron-api:external-dns'
+- - 'neutron-api:identity-service'
+  - 'keystone:identity-service'
+- - 'neutron-api:shared-db'
+  - 'percona-cluster:shared-db'
+- - 'neutron-api:amqp'
+  - 'rabbitmq-server:amqp'
+- - 'designate:nrpe-external-master'
+  - 'nrpe:nrpe-external-master'

src/tests/bundles/bionic-train.yaml

@@ -8,6 +8,7 @@ machines:
   '3':
   '4':
   '5':
+  '6':
 
 applications:
   percona-cluster:
@@ -27,12 +28,9 @@ applications:
     num_units: 1
     to:
     - '2'
-  designate:
+  designate-bind:
-    charm: cs:~openstack-charmers-next/designate
+    charm: ../../../designate-bind
     num_units: 1
-    options:
-      nameservers: 'ns1.mojotest.com.'
-      openstack-origin: cloud:bionic-train
     to:
     - '3'
   memcached:
@@ -40,11 +38,23 @@ applications:
     num_units: 1
     to:
     - '4'
-  designate-bind:
+  designate:
-    charm: ../../../designate-bind
+    charm: cs:~openstack-charmers-next/designate
     num_units: 1
+    options:
+      nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'
+      openstack-origin: cloud:bionic-train
     to:
     - '5'
+  nrpe:
+    charm: cs:nrpe
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-train
+    to:
+    - '6'
 
 relations:
 - - 'designate:shared-db'
@@ -59,3 +69,13 @@ relations:
   - 'designate-bind:dns-backend'
 - - 'designate:coordinator-memcached'
   - 'memcached:cache'
+- - 'designate:dnsaas'
+  - 'neutron-api:external-dns'
+- - 'neutron-api:identity-service'
+  - 'keystone:identity-service'
+- - 'neutron-api:shared-db'
+  - 'percona-cluster:shared-db'
+- - 'neutron-api:amqp'
+  - 'rabbitmq-server:amqp'
+- - 'designate:nrpe-external-master'
+  - 'nrpe:nrpe-external-master'

src/tests/bundles/bionic-ussuri.yaml

@@ -8,6 +8,7 @@ machines:
   '3':
   '4':
   '5':
+  '6':
 
 applications:
   percona-cluster:
@@ -27,12 +28,9 @@ applications:
     num_units: 1
     to:
     - '2'
-  designate:
+  designate-bind:
-    charm: cs:~openstack-charmers-next/designate
+    charm: ../../../designate-bind
     num_units: 1
-    options:
-      nameservers: 'ns1.mojotest.com.'
-      openstack-origin: cloud:bionic-ussuri
     to:
     - '3'
   memcached:
@@ -40,11 +38,24 @@ applications:
     num_units: 1
     to:
     - '4'
-  designate-bind:
+  designate:
-    charm: ../../../designate-bind
+    charm: cs:~openstack-charmers-next/designate
     num_units: 1
+    options:
+      nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'
+      openstack-origin: cloud:bionic-ussuri
     to:
     - '5'
+  nrpe:
+    charm: cs:nrpe
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      manage-neutron-plugin-legacy-mode: true
+      openstack-origin: cloud:bionic-ussuri
+    to:
+    - '6'
 
 relations:
 - - 'designate:shared-db'
@@ -59,3 +70,13 @@ relations:
   - 'designate-bind:dns-backend'
 - - 'designate:coordinator-memcached'
   - 'memcached:cache'
+- - 'designate:dnsaas'
+  - 'neutron-api:external-dns'
+- - 'neutron-api:identity-service'
+  - 'keystone:identity-service'
+- - 'neutron-api:shared-db'
+  - 'percona-cluster:shared-db'
+- - 'neutron-api:amqp'
+  - 'rabbitmq-server:amqp'
+- - 'designate:nrpe-external-master'
+  - 'nrpe:nrpe-external-master'

src/tests/bundles/focal-ussuri.yaml

@@ -3,8 +3,6 @@ variables:
 
 series: focal
 
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
 machines:
   '0':
     constraints: mem=3072M
@@ -16,14 +14,17 @@ machines:
   '4':
   '5':
   '6':
-    series: bionic
   '7':
+    series: bionic
+  '8':
 
 applications:
 
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
   designate-mysql-router:
     charm: cs:~openstack-charmers-next/mysql-router
-  keystone-mysql-router:
+  neutron-api-mysql-router:
     charm: cs:~openstack-charmers-next/mysql-router
 
   mysql-innodb-cluster:
@@ -36,45 +37,66 @@ applications:
       - '1'
       - '2'
 
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-    - '3'
-
   rabbitmq-server:
     charm: cs:~openstack-charmers-next/rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
+    - '3'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
     - '4'
 
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      manage-neutron-plugin-legacy-mode: true
+      openstack-origin: *openstack-origin
+    to:
+    - '5'
+
+  designate-bind:
+    charm: ../../../designate-bind
+    num_units: 1
+    # NOTE(ajkavanagh) apparently it has no openstack origin!
+    #options:
+      #openstack-origin: *openstack-origin
+    to:
+    - '6'
+
+  memcached:
+    charm: cs:~memcached-team/memcached
+    num_units: 1
+    # holding charm at bionic as it isn't available for focal+ yet
+    series: bionic
+    to:
+    - '7'
+
   designate:
     charm: cs:~openstack-charmers-next/designate
     num_units: 1
     options:
-      nameservers: 'ns1.mojotest.com.'
+      nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'
       openstack-origin: *openstack-origin
     to:
-    - '5'
+    - '8'
 
-  memcached:
+  nrpe:
-    series: bionic
+    charm: cs:nrpe
-    charm: cs:~memcached-team/memcached
-    num_units: 1
-    to:
-    - '6'
-
-  designate-bind:
-    charm: ../../../designate-bind
-    num_units: 1
-    to:
-    - '7'
 
 relations:
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
   - - 'designate:shared-db'
     - 'designate-mysql-router:shared-db'
   - - 'designate-mysql-router:db-router'
@@ -86,13 +108,25 @@ relations:
   - - 'designate:identity-service'
     - 'keystone:identity-service'
 
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
   - - 'designate:dns-backend'
     - 'designate-bind:dns-backend'
 
   - - 'designate:coordinator-memcached'
     - 'memcached:cache'
+
+  - - 'designate:dnsaas'
+    - 'neutron-api:external-dns'
+
+  - - 'neutron-api:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'neutron-api:shared-db'
+    - 'neutron-api-mysql-router:shared-db'
+  - - 'neutron-api-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'neutron-api:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'designate:nrpe-external-master'
+    - 'nrpe:nrpe-external-master'

src/tests/bundles/focal-victoria.yaml

@@ -3,8 +3,6 @@ variables:
 
 series: focal
 
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
 machines:
   '0':
     constraints: mem=3072M
@@ -16,14 +14,17 @@ machines:
   '4':
   '5':
   '6':
-    series: bionic
   '7':
+    series: bionic
+  '8':
 
 applications:
 
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
   designate-mysql-router:
     charm: cs:~openstack-charmers-next/mysql-router
-  keystone-mysql-router:
+  neutron-api-mysql-router:
     charm: cs:~openstack-charmers-next/mysql-router
 
   mysql-innodb-cluster:
@@ -36,45 +37,66 @@ applications:
       - '1'
       - '2'
 
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-    - '3'
-
   rabbitmq-server:
     charm: cs:~openstack-charmers-next/rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
+    - '3'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
     - '4'
 
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      manage-neutron-plugin-legacy-mode: true
+      openstack-origin: *openstack-origin
+    to:
+    - '5'
+
+  designate-bind:
+    charm: ../../../designate-bind
+    num_units: 1
+    # NOTE(ajkavanagh) apparently it has no openstack origin!
+    #options:
+      #openstack-origin: *openstack-origin
+    to:
+    - '6'
+
+  memcached:
+    charm: cs:~memcached-team/memcached
+    num_units: 1
+    # holding charm at bionic as it isn't available for focal+ yet
+    series: bionic
+    to:
+    - '7'
+
   designate:
     charm: cs:~openstack-charmers-next/designate
     num_units: 1
     options:
-      nameservers: 'ns1.mojotest.com.'
+      nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'
       openstack-origin: *openstack-origin
     to:
-    - '5'
+    - '8'
 
-  memcached:
+  nrpe:
-    series: bionic
+    charm: cs:nrpe
-    charm: cs:~memcached-team/memcached
-    num_units: 1
-    to:
-    - '6'
-
-  designate-bind:
-    charm: ../../../designate-bind
-    num_units: 1
-    to:
-    - '7'
 
 relations:
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
   - - 'designate:shared-db'
     - 'designate-mysql-router:shared-db'
   - - 'designate-mysql-router:db-router'
@@ -86,13 +108,25 @@ relations:
   - - 'designate:identity-service'
     - 'keystone:identity-service'
 
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
   - - 'designate:dns-backend'
     - 'designate-bind:dns-backend'
 
   - - 'designate:coordinator-memcached'
     - 'memcached:cache'
+
+  - - 'designate:dnsaas'
+    - 'neutron-api:external-dns'
+
+  - - 'neutron-api:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'neutron-api:shared-db'
+    - 'neutron-api-mysql-router:shared-db'
+  - - 'neutron-api-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'neutron-api:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'designate:nrpe-external-master'
+    - 'nrpe:nrpe-external-master'

src/tests/bundles/focal-wallaby.yaml

@@ -3,8 +3,6 @@ variables:
 
 series: focal
 
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
 machines:
   '0':
     constraints: mem=3072M
@@ -16,14 +14,17 @@ machines:
   '4':
   '5':
   '6':
-    series: bionic
   '7':
+    series: bionic
+  '8':
 
 applications:
 
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
   designate-mysql-router:
     charm: cs:~openstack-charmers-next/mysql-router
-  keystone-mysql-router:
+  neutron-api-mysql-router:
     charm: cs:~openstack-charmers-next/mysql-router
 
   mysql-innodb-cluster:
@@ -36,45 +37,66 @@ applications:
       - '1'
       - '2'
 
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-    - '3'
-
   rabbitmq-server:
     charm: cs:~openstack-charmers-next/rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
+    - '3'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
     - '4'
 
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      manage-neutron-plugin-legacy-mode: true
+      openstack-origin: *openstack-origin
+    to:
+    - '5'
+
+  designate-bind:
+    charm: ../../../designate-bind
+    num_units: 1
+    # NOTE(ajkavanagh) apparently it has no openstack origin!
+    #options:
+      #openstack-origin: *openstack-origin
+    to:
+    - '6'
+
+  memcached:
+    charm: cs:~memcached-team/memcached
+    num_units: 1
+    # holding charm at bionic as it isn't available for focal+ yet
+    series: bionic
+    to:
+    - '7'
+
   designate:
     charm: cs:~openstack-charmers-next/designate
     num_units: 1
     options:
-      nameservers: 'ns1.mojotest.com.'
+      nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'
       openstack-origin: *openstack-origin
     to:
-    - '5'
+    - '8'
 
-  memcached:
+  nrpe:
-    series: bionic
+    charm: cs:nrpe
-    charm: cs:~memcached-team/memcached
-    num_units: 1
-    to:
-    - '6'
-
-  designate-bind:
-    charm: ../../../designate-bind
-    num_units: 1
-    to:
-    - '7'
 
 relations:
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
   - - 'designate:shared-db'
     - 'designate-mysql-router:shared-db'
   - - 'designate-mysql-router:db-router'
@@ -86,13 +108,25 @@ relations:
   - - 'designate:identity-service'
     - 'keystone:identity-service'
 
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
   - - 'designate:dns-backend'
     - 'designate-bind:dns-backend'
 
   - - 'designate:coordinator-memcached'
     - 'memcached:cache'
+
+  - - 'designate:dnsaas'
+    - 'neutron-api:external-dns'
+
+  - - 'neutron-api:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'neutron-api:shared-db'
+    - 'neutron-api-mysql-router:shared-db'
+  - - 'neutron-api-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'neutron-api:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'designate:nrpe-external-master'
+    - 'nrpe:nrpe-external-master'

src/tests/bundles/focal-xena.yaml

@@ -0,0 +1,132 @@
+variables:
+  openstack-origin: &openstack-origin cloud:focal-xena
+
+series: focal
+
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+    constraints: mem=3072M
+  '2':
+    constraints: mem=3072M
+  '3':
+  '4':
+  '5':
+  '6':
+  '7':
+    series: bionic
+  '8':
+
+applications:
+
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  designate-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  neutron-api-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'
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+    - '3'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+    - '4'
+
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      manage-neutron-plugin-legacy-mode: true
+      openstack-origin: *openstack-origin
+    to:
+    - '5'
+
+  designate-bind:
+    charm: ../../../designate-bind
+    num_units: 1
+    # NOTE(ajkavanagh) apparently it has no openstack origin!
+    #options:
+      #openstack-origin: *openstack-origin
+    to:
+    - '6'
+
+  memcached:
+    charm: cs:~memcached-team/memcached
+    num_units: 1
+    # holding charm at bionic as it isn't available for focal+ yet
+    series: bionic
+    to:
+    - '7'
+
+  designate:
+    charm: cs:~openstack-charmers-next/designate
+    num_units: 1
+    options:
+      nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'
+      openstack-origin: *openstack-origin
+    to:
+    - '8'
+
+  nrpe:
+    charm: cs:nrpe
+
+relations:
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'designate:shared-db'
+    - 'designate-mysql-router:shared-db'
+  - - 'designate-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'designate:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'designate:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'designate:dns-backend'
+    - 'designate-bind:dns-backend'
+
+  - - 'designate:coordinator-memcached'
+    - 'memcached:cache'
+
+  - - 'designate:dnsaas'
+    - 'neutron-api:external-dns'
+
+  - - 'neutron-api:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'neutron-api:shared-db'
+    - 'neutron-api-mysql-router:shared-db'
+  - - 'neutron-api-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'neutron-api:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'designate:nrpe-external-master'
+    - 'nrpe:nrpe-external-master'

src/tests/bundles/hirsute-wallaby.yaml

@@ -3,8 +3,6 @@ variables:
 
 series: hirsute
 
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
 machines:
   '0':
     constraints: mem=3072M
@@ -16,14 +14,17 @@ machines:
   '4':
   '5':
   '6':
-    series: bionic
   '7':
+    series: bionic
+  '8':
 
 applications:
 
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
   designate-mysql-router:
     charm: cs:~openstack-charmers-next/mysql-router
-  keystone-mysql-router:
+  neutron-api-mysql-router:
     charm: cs:~openstack-charmers-next/mysql-router
 
   mysql-innodb-cluster:
@@ -36,45 +37,67 @@ applications:
       - '1'
       - '2'
 
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-    - '3'
-
   rabbitmq-server:
     charm: cs:~openstack-charmers-next/rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
+    - '3'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
     - '4'
 
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      manage-neutron-plugin-legacy-mode: true
+      openstack-origin: *openstack-origin
+    to:
+    - '5'
+
+  designate-bind:
+    charm: ../../../designate-bind
+    num_units: 1
+    # NOTE(ajkavanagh) apparently it has no openstack origin!
+    #options:
+      #openstack-origin: *openstack-origin
+    to:
+    - '6'
+
+  memcached:
+    charm: cs:~memcached-team/memcached
+    num_units: 1
+    # holding charm at bionic as it isn't available for focal+ yet
+    series: bionic
+    to:
+    - '7'
+
   designate:
     charm: cs:~openstack-charmers-next/designate
     num_units: 1
     options:
-      nameservers: 'ns1.mojotest.com.'
+      nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'
       openstack-origin: *openstack-origin
     to:
-    - '5'
+    - '8'
 
-  memcached:
+  nrpe:
-    series: bionic
+    charm: cs:nrpe
-    charm: cs:~memcached-team/memcached
+    series: focal
-    num_units: 1
-    to:
-    - '6'
-
-  designate-bind:
-    charm: ../../../designate-bind
-    num_units: 1
-    to:
-    - '7'
 
 relations:
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
   - - 'designate:shared-db'
     - 'designate-mysql-router:shared-db'
   - - 'designate-mysql-router:db-router'
@@ -86,13 +109,25 @@ relations:
   - - 'designate:identity-service'
     - 'keystone:identity-service'
 
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
   - - 'designate:dns-backend'
     - 'designate-bind:dns-backend'
 
   - - 'designate:coordinator-memcached'
     - 'memcached:cache'
+
+  - - 'designate:dnsaas'
+    - 'neutron-api:external-dns'
+
+  - - 'neutron-api:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'neutron-api:shared-db'
+    - 'neutron-api-mysql-router:shared-db'
+  - - 'neutron-api-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'neutron-api:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'designate:nrpe-external-master'
+    - 'nrpe:nrpe-external-master'

src/tests/bundles/impish-xena.yaml

@@ -1,10 +1,8 @@
 variables:
   openstack-origin: &openstack-origin distro
 
-series: groovy
+series: impish
 
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
 machines:
   '0':
     constraints: mem=3072M
@@ -16,14 +14,17 @@ machines:
   '4':
   '5':
   '6':
-    series: bionic
   '7':
+    series: bionic
+  '8':
 
 applications:
 
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
   designate-mysql-router:
     charm: cs:~openstack-charmers-next/mysql-router
-  keystone-mysql-router:
+  neutron-api-mysql-router:
     charm: cs:~openstack-charmers-next/mysql-router
 
   mysql-innodb-cluster:
@@ -36,45 +37,67 @@ applications:
       - '1'
       - '2'
 
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-    - '3'
-
   rabbitmq-server:
     charm: cs:~openstack-charmers-next/rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
+    - '3'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
     - '4'
 
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      manage-neutron-plugin-legacy-mode: true
+      openstack-origin: *openstack-origin
+    to:
+    - '5'
+
+  designate-bind:
+    charm: ../../../designate-bind
+    num_units: 1
+    # NOTE(ajkavanagh) apparently it has no openstack origin!
+    #options:
+      #openstack-origin: *openstack-origin
+    to:
+    - '6'
+
+  memcached:
+    charm: cs:~memcached-team/memcached
+    num_units: 1
+    # holding charm at bionic as it isn't available for focal+ yet
+    series: bionic
+    to:
+    - '7'
+
   designate:
     charm: cs:~openstack-charmers-next/designate
     num_units: 1
     options:
-      nameservers: 'ns1.mojotest.com.'
+      nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'
       openstack-origin: *openstack-origin
     to:
-    - '5'
+    - '8'
 
-  memcached:
+  nrpe:
-    series: bionic
+    charm: cs:nrpe
-    charm: cs:~memcached-team/memcached
+    series: focal
-    num_units: 1
-    to:
-    - '6'
-
-  designate-bind:
-    charm: ../../../designate-bind
-    num_units: 1
-    to:
-    - '7'
 
 relations:
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
   - - 'designate:shared-db'
     - 'designate-mysql-router:shared-db'
   - - 'designate-mysql-router:db-router'
@@ -86,13 +109,25 @@ relations:
   - - 'designate:identity-service'
     - 'keystone:identity-service'
 
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
   - - 'designate:dns-backend'
     - 'designate-bind:dns-backend'
 
   - - 'designate:coordinator-memcached'
     - 'memcached:cache'
+
+  - - 'designate:dnsaas'
+    - 'neutron-api:external-dns'
+
+  - - 'neutron-api:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'neutron-api:shared-db'
+    - 'neutron-api-mysql-router:shared-db'
+  - - 'neutron-api-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'neutron-api:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'designate:nrpe-external-master'
+    - 'nrpe:nrpe-external-master'

src/tests/bundles/trusty-mitaka.yaml

@@ -8,6 +8,7 @@ machines:
   '3':
   '4':
   '5':
+  '6':
 
 applications:
   percona-cluster:
@@ -27,12 +28,9 @@ applications:
     num_units: 1
     to:
     - '2'
-  designate:
+  designate-bind:
-    charm: cs:~openstack-charmers-next/designate
+    charm: ../../../designate-bind
     num_units: 1
-    options:
-      nameservers: 'ns1.mojotest.com.'
-      openstack-origin: cloud:trusty-mitaka
     to:
     - '3'
   memcached:
@@ -40,11 +38,21 @@ applications:
     num_units: 1
     to:
     - '4'
-  designate-bind:
+  designate:
-    charm: ../../../designate-bind
+    charm: cs:~openstack-charmers-next/designate
     num_units: 1
+    options:
+      nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'
+      openstack-origin: cloud:trusty-mitaka
     to:
     - '5'
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      openstack-origin: cloud:trusty-mitaka
+    to:
+    - '6'
 
 relations:
 - - 'designate:shared-db'
@@ -59,3 +67,11 @@ relations:
   - 'designate-bind:dns-backend'
 - - 'designate:coordinator-memcached'
   - 'memcached:cache'
+- - 'designate:dnsaas'
+  - 'neutron-api:external-dns'
+- - 'neutron-api:identity-service'
+  - 'keystone:identity-service'
+- - 'neutron-api:shared-db'
+  - 'percona-cluster:shared-db'
+- - 'neutron-api:amqp'
+  - 'rabbitmq-server:amqp'

src/tests/bundles/xenial-mitaka.yaml

@@ -8,6 +8,7 @@ machines:
   '3':
   '4':
   '5':
+  '6':
 
 applications:
   percona-cluster:
@@ -25,11 +26,9 @@ applications:
     num_units: 1
     to:
     - '2'
-  designate:
+  designate-bind:
-    charm: cs:~openstack-charmers-next/designate
+    charm: ../../../designate-bind
     num_units: 1
-    options:
-      nameservers: 'ns1.mojotest.com.'
     to:
     - '3'
   memcached:
@@ -37,11 +36,20 @@ applications:
     num_units: 1
     to:
     - '4'
-  designate-bind:
+  designate:
-    charm: ../../../designate-bind
+    charm: cs:~openstack-charmers-next/designate
     num_units: 1
+    options:
+      nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'
     to:
     - '5'
+  nrpe:
+    charm: cs:nrpe
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    to:
+    - '6'
 
 relations:
 - - 'designate:shared-db'
@@ -56,3 +64,13 @@ relations:
   - 'designate-bind:dns-backend'
 - - 'designate:coordinator-memcached'
   - 'memcached:cache'
+- - 'designate:dnsaas'
+  - 'neutron-api:external-dns'
+- - 'neutron-api:identity-service'
+  - 'keystone:identity-service'
+- - 'neutron-api:shared-db'
+  - 'percona-cluster:shared-db'
+- - 'neutron-api:amqp'
+  - 'rabbitmq-server:amqp'
+- - 'designate:nrpe-external-master'
+  - 'nrpe:nrpe-external-master'

src/tests/bundles/xenial-ocata.yaml

@@ -8,6 +8,7 @@ machines:
   '3':
   '4':
   '5':
+  '6':
 
 applications:
   percona-cluster:
@@ -27,12 +28,9 @@ applications:
     num_units: 1
     to:
     - '2'
-  designate:
+  designate-bind:
-    charm: cs:~openstack-charmers-next/designate
+    charm: ../../../designate-bind
     num_units: 1
-    options:
-      nameservers: 'ns1.mojotest.com.'
-      openstack-origin: cloud:xenial-ocata
     to:
     - '3'
   memcached:
@@ -40,11 +38,23 @@ applications:
     num_units: 1
     to:
     - '4'
-  designate-bind:
+  designate:
-    charm: ../../../designate-bind
+    charm: cs:~openstack-charmers-next/designate
     num_units: 1
+    options:
+      nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'
+      openstack-origin: cloud:xenial-ocata
     to:
     - '5'
+  nrpe:
+    charm: cs:nrpe
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      openstack-origin: cloud:xenial-ocata
+    to:
+    - '6'
 
 relations:
 - - 'designate:shared-db'
@@ -59,3 +69,13 @@ relations:
   - 'designate-bind:dns-backend'
 - - 'designate:coordinator-memcached'
   - 'memcached:cache'
+- - 'designate:dnsaas'
+  - 'neutron-api:external-dns'
+- - 'neutron-api:identity-service'
+  - 'keystone:identity-service'
+- - 'neutron-api:shared-db'
+  - 'percona-cluster:shared-db'
+- - 'neutron-api:amqp'
+  - 'rabbitmq-server:amqp'
+- - 'designate:nrpe-external-master'
+  - 'nrpe:nrpe-external-master'

src/tests/bundles/xenial-pike.yaml

@@ -8,6 +8,7 @@ machines:
   '3':
   '4':
   '5':
+  '6':
 
 applications:
   percona-cluster:
@@ -27,12 +28,9 @@ applications:
     num_units: 1
     to:
     - '2'
-  designate:
+  designate-bind:
-    charm: cs:~openstack-charmers-next/designate
+    charm: ../../../designate-bind
     num_units: 1
-    options:
-      nameservers: 'ns1.mojotest.com.'
-      openstack-origin: cloud:xenial-pike
     to:
     - '3'
   memcached:
@@ -40,11 +38,23 @@ applications:
     num_units: 1
     to:
     - '4'
-  designate-bind:
+  designate:
-    charm: ../../../designate-bind
+    charm: cs:~openstack-charmers-next/designate
     num_units: 1
+    options:
+      nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'
+      openstack-origin: cloud:xenial-pike
     to:
     - '5'
+  nrpe:
+    charm: cs:nrpe
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      openstack-origin: cloud:xenial-pike
+    to:
+    - '6'
 
 relations:
 - - 'designate:shared-db'
@@ -59,3 +69,13 @@ relations:
   - 'designate-bind:dns-backend'
 - - 'designate:coordinator-memcached'
   - 'memcached:cache'
+- - 'designate:dnsaas'
+  - 'neutron-api:external-dns'
+- - 'neutron-api:identity-service'
+  - 'keystone:identity-service'
+- - 'neutron-api:shared-db'
+  - 'percona-cluster:shared-db'
+- - 'neutron-api:amqp'
+  - 'rabbitmq-server:amqp'
+- - 'designate:nrpe-external-master'
+  - 'nrpe:nrpe-external-master'

src/tests/bundles/xenial-queens.yaml

@@ -8,6 +8,7 @@ machines:
   '3':
   '4':
   '5':
+  '6':
 
 applications:
   percona-cluster:
@@ -27,12 +28,9 @@ applications:
     num_units: 1
     to:
     - '2'
-  designate:
+  designate-bind:
-    charm: cs:~openstack-charmers-next/designate
+    charm: ../../../designate-bind
     num_units: 1
-    options:
-      nameservers: 'ns1.mojotest.com.'
-      openstack-origin: cloud:xenial-queens
     to:
     - '3'
   memcached:
@@ -40,11 +38,23 @@ applications:
     num_units: 1
     to:
     - '4'
-  designate-bind:
+  designate:
-    charm: ../../../designate-bind
+    charm: cs:~openstack-charmers-next/designate
     num_units: 1
+    options:
+      nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'
+      openstack-origin: cloud:xenial-queens
     to:
     - '5'
+  nrpe:
+    charm: cs:nrpe
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      openstack-origin: cloud:xenial-queens
+    to:
+    - '6'
 
 relations:
 - - 'designate:shared-db'
@@ -59,3 +69,13 @@ relations:
   - 'designate-bind:dns-backend'
 - - 'designate:coordinator-memcached'
   - 'memcached:cache'
+- - 'designate:dnsaas'
+  - 'neutron-api:external-dns'
+- - 'neutron-api:identity-service'
+  - 'keystone:identity-service'
+- - 'neutron-api:shared-db'
+  - 'percona-cluster:shared-db'
+- - 'neutron-api:amqp'
+  - 'rabbitmq-server:amqp'
+- - 'designate:nrpe-external-master'
+  - 'nrpe:nrpe-external-master'

src/tests/tests.yaml

@@ -7,24 +7,30 @@ gate_bundles:
   - xenial-mitaka
   - bionic-queens
   - bionic-stein
-  - bionic-train
   - bionic-ussuri
   - focal-ussuri
-  - focal-victoria
   - focal-wallaby
-  - groovy-victoria
+  - focal-xena
+  - hirsute-wallaby
 
 dev_bundles:
   - trusty-mitaka
   - xenial-ocata
   - xenial-pike
   - xenial-queens
+  - bionic-train
   - bionic-rocky
-  - hirsute-wallaby
+  - focal-victoria
+  - impish-xena
 
 tests:
   - zaza.openstack.charm_tests.designate.tests.DesignateTests
 
+target_deploy_status:
+  nrpe:
+    workload-status: blocked
+    workload-status-message-prefix: "Nagios server not configured or related"
+
 tests_options:
   force_deploy:
-    - hirsute-wallaby
+    - impish-xena

src/tox.ini

@@ -22,12 +22,12 @@ skip_missing_interpreters = False
 requires = pip < 20.3
            virtualenv < 20.0
 # NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci
-minversion = 3.2.0
+minversion = 3.18.0
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
-whitelist_externals = juju
+allowlist_externals = juju
 passenv = HOME TERM CS_* OS_* TEST_*
 deps = -r{toxinidir}/test-requirements.txt
 install_command =

tox.ini

@@ -11,6 +11,21 @@ envlist = pep8,py3
 sitepackages = False
 # NOTE: Avoid false positives by not skipping missing interpreters.
 skip_missing_interpreters = False
+# NOTES:
+# * We avoid the new dependency resolver by pinning pip < 20.3, see
+#   https://github.com/pypa/pip/issues/9187
+# * Pinning dependencies requires tox >= 3.2.0, see
+#   https://tox.readthedocs.io/en/latest/config.html#conf-requires
+# * It is also necessary to pin virtualenv as a newer virtualenv would still
+#   lead to fetching the latest pip in the func* tox targets, see
+#   https://stackoverflow.com/a/38133283
+requires =
+  pip < 20.3
+  virtualenv < 20.0
+  setuptools<50.0.0
+
+# NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci
+minversion = 3.18.0
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
@@ -21,7 +36,7 @@ setenv = VIRTUAL_ENV={envdir}
          JUJU_REPOSITORY={toxinidir}/build
 passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY
 install_command =
-  pip install {opts} {packages}
+  {toxinidir}/pip.sh install {opts} {packages}
 deps =
     -r{toxinidir}/requirements.txt