openstack/charm-keystone-kerberos
Code Issues Proposed changes

Migrate charm to charmhub latest/edge track

Browse Source 
Change-Id: Id4e104c371610c734529d4080ae4e62a38c23d6c
This commit is contained in:
Alex Kavanagh 2022-01-27 14:13:08 +00:00
parent 6541f4ac38
commit 3b966c4924
18 changed files with 42 additions and 528 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
charmcraft.yaml Normal file
View File

@ -0,0 +1,13 @@
type: charm
parts:
charm:
source: src/
plugin: reactive
build-snaps: [charm]
bases:
- name: ubuntu
channel: "20.04"
architectures:
- amd64

1
metadata.yaml Symbolic link
View File

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

10
osci.yaml
View File

@ -1,13 +1,9 @@
- project:
templates:
- charm-yoga-unit-jobs
- charm-yoga-functional-jobs
- charm-unit-jobs-py38
- charm-unit-jobs-py39
- charm-xena-functional-jobs
- charm-wallaby-functional-jobs
- charm-victoria-functional-jobs
- charm-ussuri-functional-jobs
- charm-stein-functional-jobs
- charm-queens-functional-jobs
- charm-yoga-functional-jobs
vars:
needs_charm_build: true
charm_build_name: keystone-kerberos

3
src/metadata.yaml
View File

@ -10,10 +10,7 @@ tags:
- kerberos
- ldap
series:
- bionic
- focal
- groovy
- hirsute
- impish
subordinate: true
provides:

47
src/tests/bundles/bionic-queens.yaml
View File

@ -1,47 +0,0 @@
series: bionic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
'2':
'3':
relations:
- - keystone:shared-db
- mysql:shared-db
- - keystone
- keystone-kerberos
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
token-provider: 'fernet'
token-expiration: 60
to:
- '1'
keystone-kerberos:
charm: ../../../keystone-kerberos
options:
kerberos-realm: 'TESTUBUNTU.COM'
kerberos-server: 'kerberos.testubuntu.com'
kerberos-domain: 'k8s'
resource:
keystone_keytab: keystone.keytab
kerberos-server:
charm: cs:~openstack-charmers-next/kerberos-test-fixture
num_units: 1
to:
- '2'
ubuntu-test-host:
charm: cs:ubuntu
num_units: 1
to:
- '3'

47
src/tests/bundles/bionic-rocky.yaml
View File

@ -1,47 +0,0 @@
series: bionic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
'2':
'3':
relations:
- - keystone:shared-db
- mysql:shared-db
- - keystone
- keystone-kerberos
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
token-provider: 'fernet'
token-expiration: 60
to:
- '1'
keystone-kerberos:
charm: ../../../keystone-kerberos
options:
kerberos-realm: 'TESTUBUNTU.COM'
kerberos-server: 'kerberos.testubuntu.com'
kerberos-domain: 'k8s'
resource:
keystone_keytab: keystone.keytab
kerberos-server:
charm: cs:~openstack-charmers-next/kerberos-test-fixture
num_units: 1
to:
- '2'
ubuntu-test-host:
charm: cs:ubuntu
num_units: 1
to:
- '3'

47
src/tests/bundles/bionic-stein.yaml
View File

@ -1,47 +0,0 @@
series: bionic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
'2':
'3':
relations:
- - keystone:shared-db
- mysql:shared-db
- - keystone
- keystone-kerberos
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
token-provider: 'fernet'
token-expiration: 60
to:
- '1'
keystone-kerberos:
charm: ../../../keystone-kerberos
options:
kerberos-realm: 'TESTUBUNTU.COM'
kerberos-server: 'kerberos.testubuntu.com'
kerberos-domain: 'k8s'
resource:
keystone_keytab: keystone.keytab
kerberos-server:
charm: cs:~openstack-charmers-next/kerberos-test-fixture
num_units: 1
to:
- '2'
ubuntu-test-host:
charm: cs:ubuntu
num_units: 1
to:
- '3'

47
src/tests/bundles/bionic-train.yaml
View File

@ -1,47 +0,0 @@
series: bionic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
'2':
'3':
relations:
- - keystone:shared-db
- mysql:shared-db
- - keystone
- keystone-kerberos
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
token-provider: 'fernet'
token-expiration: 60
to:
- '1'
keystone-kerberos:
charm: ../../../keystone-kerberos
options:
kerberos-realm: 'TESTUBUNTU.COM'
kerberos-server: 'kerberos.testubuntu.com'
kerberos-domain: 'k8s'
resource:
keystone_keytab: keystone.keytab
kerberos-server:
charm: cs:~openstack-charmers-next/kerberos-test-fixture
num_units: 1
to:
- '2'
ubuntu-test-host:
charm: cs:ubuntu
num_units: 1
to:
- '3'

47
src/tests/bundles/bionic-ussuri.yaml
View File

@ -1,47 +0,0 @@
series: bionic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
'2':
'3':
relations:
- - keystone:shared-db
- mysql:shared-db
- - keystone
- keystone-kerberos
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
token-provider: 'fernet'
token-expiration: 60
to:
- '1'
keystone-kerberos:
charm: ../../../keystone-kerberos
options:
kerberos-realm: 'TESTUBUNTU.COM'
kerberos-server: 'kerberos.testubuntu.com'
kerberos-domain: 'k8s'
resource:
keystone_keytab: keystone.keytab
kerberos-server:
charm: cs:~openstack-charmers-next/kerberos-test-fixture
num_units: 1
to:
- '2'
ubuntu-test-host:
charm: cs:ubuntu
num_units: 1
to:
- '3'

65
src/tests/bundles/focal-ussuri.yaml
View File

@ -1,65 +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':
relations:
- - keystone:shared-db
- keystone-mysql-router:shared-db
- - keystone-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - keystone
- keystone-kerberos
applications:
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: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
token-provider: 'fernet'
token-expiration: 60
to:
- '3'
keystone-kerberos:
charm: ../../../keystone-kerberos
options:
kerberos-realm: 'TESTUBUNTU.COM'
kerberos-server: 'kerberos.testubuntu.com'
kerberos-domain: 'k8s'
resource:
keystone_keytab: keystone.keytab
kerberos-server:
charm: cs:~openstack-charmers-next/kerberos-test-fixture
num_units: 1
to:
- '4'
ubuntu-test-host:
charm: cs:ubuntu
num_units: 1
to:
- '5'

65
src/tests/bundles/focal-victoria.yaml
View File

@ -1,65 +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':
relations:
- - keystone:shared-db
- keystone-mysql-router:shared-db
- - keystone-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - keystone
- keystone-kerberos
applications:
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: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
token-provider: 'fernet'
token-expiration: 60
to:
- '3'
keystone-kerberos:
charm: ../../../keystone-kerberos
options:
kerberos-realm: 'TESTUBUNTU.COM'
kerberos-server: 'kerberos.testubuntu.com'
kerberos-domain: 'k8s'
resource:
keystone_keytab: keystone.keytab
kerberos-server:
charm: cs:~openstack-charmers-next/kerberos-test-fixture
num_units: 1
to:
- '4'
ubuntu-test-host:
charm: cs:ubuntu
num_units: 1
to:
- '5'

65
src/tests/bundles/focal-wallaby.yaml
View File

@ -1,65 +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':
relations:
- - keystone:shared-db
- keystone-mysql-router:shared-db
- - keystone-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - keystone
- keystone-kerberos
applications:
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: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
token-provider: 'fernet'
token-expiration: 60
to:
- '3'
keystone-kerberos:
charm: ../../../keystone-kerberos
options:
kerberos-realm: 'TESTUBUNTU.COM'
kerberos-server: 'kerberos.testubuntu.com'
kerberos-domain: 'k8s'
resource:
keystone_keytab: keystone.keytab
kerberos-server:
charm: cs:~openstack-charmers-next/kerberos-test-fixture
num_units: 1
to:
- '4'
ubuntu-test-host:
charm: cs:ubuntu
num_units: 1
to:
- '5'

9
src/tests/bundles/focal-xena.yaml
View File

@ -23,10 +23,11 @@ relations:
- keystone-kerberos
applications:
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
@ -34,9 +35,10 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
@ -44,6 +46,7 @@ applications:
token-expiration: 60
to:
- '3'
channel: latest/edge
keystone-kerberos:
charm: ../../../keystone-kerberos
options:

9
src/tests/bundles/focal-yoga.yaml
View File

@ -23,10 +23,11 @@ relations:
- keystone-kerberos
applications:
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
@ -34,9 +35,10 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
@ -44,6 +46,7 @@ applications:
token-expiration: 60
to:
- '3'
channel: latest/edge
keystone-kerberos:
charm: ../../../keystone-kerberos
options:

65
src/tests/bundles/hirsute-wallaby.yaml
View File

@ -1,65 +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':
relations:
- - keystone:shared-db
- keystone-mysql-router:shared-db
- - keystone-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - keystone
- keystone-kerberos
applications:
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: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
token-provider: 'fernet'
token-expiration: 60
to:
- '3'
keystone-kerberos:
charm: ../../../keystone-kerberos
options:
kerberos-realm: 'TESTUBUNTU.COM'
kerberos-server: 'kerberos.testubuntu.com'
kerberos-domain: 'k8s'
resource:
keystone_keytab: keystone.keytab
kerberos-server:
charm: cs:~openstack-charmers-next/kerberos-test-fixture
num_units: 1
to:
- '4'
ubuntu-test-host:
charm: cs:ubuntu
num_units: 1
to:
- '5'

9
src/tests/bundles/impish-xena.yaml
View File

@ -23,10 +23,11 @@ relations:
- keystone-kerberos
applications:
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
@ -34,9 +35,10 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
@ -44,6 +46,7 @@ applications:
token-expiration: 60
to:
- '3'
channel: latest/edge
keystone-kerberos:
charm: ../../../keystone-kerberos
options:

9
src/tests/bundles/jammy-yoga.yaml
View File

@ -23,10 +23,11 @@ relations:
- keystone-kerberos
applications:
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
@ -34,9 +35,10 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
@ -44,6 +46,7 @@ applications:
token-expiration: 60
to:
- '3'
channel: latest/edge
keystone-kerberos:
charm: ../../../keystone-kerberos
options:

12
src/tests/tests.yaml
View File

@ -1,22 +1,13 @@
charm_name: keystone-kerberos
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
dev_bundles:
- bionic-rocky
- bionic-train
- focal-yoga
- jammy-yoga
@ -28,7 +19,6 @@ tests:
tests_options:
force_deploy:
- hirsute-wallaby
- impish-xena
- jammy-yoga