Migrate charm to charmhub latest/edge track

Change-Id: I6c63e64dd7a1150cc4a1a1dae680157e2c47b6a3

charmcraft.yaml

@@ -0,0 +1,27 @@
+type: charm
+
+parts:
+  charm:
+    plugin: dump
+    source: .
+    prime:
+      - actions/*
+      - files/*
+      - hooks/*
+      - lib/*
+      - templates/*
+      - actions.yaml
+      - config.yaml
+      - copyright
+      - hardening.yaml
+      - icon.svg
+      - LICENSE
+      - Makefile
+      - metadata.yaml
+      - README.md
+
+bases:
+  - name: ubuntu
+    channel: "20.04"
+    architectures:
+      - amd64

metadata.yaml

@@ -10,10 +10,7 @@ tags:
 - identity
 - misc
 series:
-- bionic
 - focal
-- groovy
-- hirsute
 - impish
 extra-bindings:
   public:

osci.yaml

@@ -1,10 +1,6 @@
 - project:
     templates:
-      - charm-yoga-unit-jobs
+      - charm-unit-jobs-py38
-      - charm-yoga-functional-jobs
+      - charm-unit-jobs-py39
       - charm-xena-functional-jobs
-      - charm-wallaby-functional-jobs
+      - charm-yoga-functional-jobs
-      - charm-victoria-functional-jobs
-      - charm-ussuri-functional-jobs
-      - charm-stein-functional-jobs
-      - charm-queens-functional-jobs

tests/bundles/bionic-queens.yaml

@@ -1,39 +0,0 @@
-series: bionic
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-  '3':
-  '4':
-relations:
-- - keystone:shared-db
-  - mysql:shared-db
-- - glance:shared-db
-  - mysql:shared-db
-- - glance:identity-service
-  - keystone:identity-service
-applications:
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-    - '0'
-  keystone:
-    series: bionic
-    charm: ../../
-    num_units: 3
-    options:
-      token-provider: 'fernet'
-      token-expiration: 300
-    to:
-    - '1'
-    - '2'
-    - '3'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    to:
-    - '4'

tests/bundles/bionic-rocky.yaml

@@ -1,41 +0,0 @@
-series: bionic
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-  '3':
-  '4':
-relations:
-- - keystone:shared-db
-  - mysql:shared-db
-- - glance:shared-db
-  - mysql:shared-db
-- - glance:identity-service
-  - keystone:identity-service
-applications:
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-    - '0'
-  keystone:
-    series: bionic
-    charm: ../../
-    num_units: 3
-    options:
-      openstack-origin: cloud:bionic-rocky
-      token-expiration: 300
-    to:
-    - '1'
-    - '2'
-    - '3'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-rocky
-    to:
-    - '4'

tests/bundles/bionic-stein.yaml

@@ -1,41 +0,0 @@
-series: bionic
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-  '3':
-  '4':
-relations:
-- - keystone:shared-db
-  - mysql:shared-db
-- - glance:shared-db
-  - mysql:shared-db
-- - glance:identity-service
-  - keystone:identity-service
-applications:
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-    - '0'
-  keystone:
-    series: bionic
-    charm: ../../
-    num_units: 3
-    options:
-      openstack-origin: cloud:bionic-stein
-      token-expiration: 300
-    to:
-    - '1'
-    - '2'
-    - '3'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-stein
-    to:
-    - '4'

tests/bundles/bionic-train-cmr.yaml

@@ -1 +0,0 @@
-bionic-train.yaml

tests/bundles/bionic-train.yaml

@@ -1,41 +0,0 @@
-series: bionic
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-  '3':
-  '4':
-relations:
-- - keystone:shared-db
-  - mysql:shared-db
-- - glance:shared-db
-  - mysql:shared-db
-- - glance:identity-service
-  - keystone:identity-service
-applications:
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-    - '0'
-  keystone:
-    series: bionic
-    charm: ../../
-    num_units: 3
-    options:
-      openstack-origin: cloud:bionic-train
-      token-expiration: 300
-    to:
-    - '1'
-    - '2'
-    - '3'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-train
-    to:
-    - '4'

tests/bundles/bionic-ussuri.yaml

@@ -1,40 +0,0 @@
-series: bionic
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-  '3':
-  '4':
-relations:
-- - keystone:shared-db
-  - mysql:shared-db
-- - glance:shared-db
-  - mysql:shared-db
-- - glance:identity-service
-  - keystone:identity-service
-applications:
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-    - '0'
-  keystone:
-    charm: ../../
-    num_units: 3
-    options:
-      openstack-origin: cloud:bionic-ussuri
-      token-expiration: 300
-    to:
-    - '1'
-    - '2'
-    - '3'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-ussuri
-    to:
-    - '4'

tests/bundles/bionic-vault.yaml

@@ -1,13 +0,0 @@
-local_overlay_enabled: False
-series: bionic
-services:
-  vault:
-    num_units: 1
-    series: bionic
-    charm: vault
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-relations:
-- - vault:shared-db
-  - mysql:shared-db

tests/bundles/focal-ussuri.yaml

@@ -1,68 +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':
-
-applications:
-
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  keystone-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'
-
-  keystone:
-    charm: ../../
-    num_units: 3
-    options:
-      openstack-origin: *openstack-origin
-      token-provider: 'fernet'
-      token-expiration: 300
-    to:
-    - '3'
-    - '4'
-    - '5'
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-    - '6'
-
-relations:
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'

tests/bundles/focal-victoria.yaml

@@ -1,68 +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':
-
-applications:
-
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  keystone-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'
-
-  keystone:
-    charm: ../../
-    num_units: 3
-    options:
-      openstack-origin: *openstack-origin
-      token-provider: 'fernet'
-      token-expiration: 300
-    to:
-    - '3'
-    - '4'
-    - '5'
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-    - '6'
-
-relations:
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'

tests/bundles/focal-wallaby.yaml

@@ -1,68 +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':
-
-applications:
-
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  keystone-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'
-
-  keystone:
-    charm: ../../
-    num_units: 3
-    options:
-      openstack-origin: *openstack-origin
-      token-provider: 'fernet'
-      token-expiration: 300
-    to:
-    - '3'
-    - '4'
-    - '5'
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-    - '6'
-
-relations:
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'

tests/bundles/focal-xena.yaml

@@ -20,12 +20,14 @@ machines:
 applications:
 
   glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   keystone-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
@@ -33,6 +35,7 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   keystone:
     charm: ../../
@@ -47,12 +50,13 @@ applications:
     - '5'
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
     - '6'
+    channel: latest/edge
 
 relations:
 

tests/bundles/focal-yoga.yaml

@@ -20,12 +20,14 @@ machines:
 applications:
 
   glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   keystone-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
@@ -33,6 +35,7 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   keystone:
     charm: ../../../keystone
@@ -47,12 +50,13 @@ applications:
     - '5'
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
     - '6'
+    channel: latest/edge
 
 relations:
 

tests/bundles/hirsute-wallaby.yaml

@@ -1,68 +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':
-
-applications:
-
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  keystone-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'
-
-  keystone:
-    charm: ../../
-    num_units: 3
-    options:
-      openstack-origin: *openstack-origin
-      token-provider: 'fernet'
-      token-expiration: 300
-    to:
-    - '3'
-    - '4'
-    - '5'
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-    - '6'
-
-relations:
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'

tests/bundles/impish-xena.yaml

@@ -20,12 +20,14 @@ machines:
 applications:
 
   glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   keystone-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
@@ -33,6 +35,7 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   keystone:
     charm: ../../
@@ -47,12 +50,13 @@ applications:
     - '5'
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
     - '6'
+    channel: latest/edge
 
 relations:
 

tests/bundles/jammy-yoga.yaml

@@ -20,12 +20,14 @@ machines:
 applications:
 
   glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   keystone-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
@@ -33,6 +35,7 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   keystone:
     charm: ../../
@@ -47,12 +50,13 @@ applications:
     - '5'
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
     - '6'
+    channel: latest/edge
 
 relations:
 

tests/bundles/overlays/local-charm-overlay.yaml.j2

@@ -4,8 +4,9 @@ applications:
     options:
       vip: '{{ OS_VIP00 }}'
   hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: ch:hacluster
     num_units: 0
+    channel: latest/edge
 relations:
 - - keystone
   - hacluster

tests/tests.yaml

@@ -1,25 +1,13 @@
 charm_name: keystone
 
 smoke_bundles:
-- focal-ussuri
+- focal-xena
 
 gate_bundles:
-- bionic-queens
-- bionic-stein
-- bionic-ussuri
-- focal-ussuri
-- focal-victoria
-- focal-wallaby
 - focal-xena
-- hirsute-wallaby
 - impish-xena
-- bionic-train-vault-cmr:
-  - vault: bionic-vault
-  - keystone: bionic-train-cmr
 
 dev_bundles:
-- bionic-rocky
-- bionic-train
 - focal-yoga
 - jammy-yoga
 
@@ -52,7 +40,6 @@ tests_options:
   policyd:
     service: keystone
   force_deploy:
-    - hirsute-wallaby
     - impish-xena
     - jammy-yoga
 target_deploy_status: