From 8537d24afe280e63818a884b1d50943ffda4e951 Mon Sep 17 00:00:00 2001 From: Camille Rodriguez Date: Thu, 19 Mar 2020 19:02:30 -0500 Subject: [PATCH 01/27] Adding test bundle and setup for bionic-queens --- src/test-requirements.txt | 3 +- src/tests/bundles/bionic-queens.yaml | 49 ++++++++++++++++++++++++++++ src/tests/tests.yaml | 12 +++++++ 3 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 src/tests/bundles/bionic-queens.yaml create mode 100644 src/tests/tests.yaml diff --git a/src/test-requirements.txt b/src/test-requirements.txt index f62563a..cadb3c7 100644 --- a/src/test-requirements.txt +++ b/src/test-requirements.txt @@ -5,4 +5,5 @@ # # 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 \ No newline at end of file +#git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack +git+https://github.com/camille-rodriguez/zaza-openstack-tests.git#egg=zaza.openstack \ No newline at end of file diff --git a/src/tests/bundles/bionic-queens.yaml b/src/tests/bundles/bionic-queens.yaml new file mode 100644 index 0000000..bd8ea6e --- /dev/null +++ b/src/tests/bundles/bionic-queens.yaml @@ -0,0 +1,49 @@ +series: bionic +comment: +- 'machines section to decide order of deployment. database sooner = faster' +machines: + '0': + constraints: mem=3072M + '1': + '2': + '3': + '4': + '5': +relations: +- - keystone:shared-db + - mysql:shared-db +- - keystone + - keystone-kerberos +- - openstack-dashboard:identity-service + - keystone:identity-service +- - openstack-dashboard:shared-db + - mysql:shared-db +applications: + mysql: + charm: cs:~openstack-charmers-next/percona-cluster + num_units: 1 + to: + - '0' + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 3 + options: + token-provider: 'fernet' + token-expiration: 60 + to: + - '1' + - '2' + - '3' + openstack-dashboard: + charm: cs:~openstack-charmers-next/openstack-dashboard + num_units: 1 + to: + - '4' + keystone-kerberos: + charm: ../../../keystone-kerberos + kerberos-server: + charm: /home/ubutu/charm-kerberos-test-fixture + to: + - '5' + + diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml new file mode 100644 index 0000000..48cfa3d --- /dev/null +++ b/src/tests/tests.yaml @@ -0,0 +1,12 @@ +charm_name: keystone-kerberos +smoke_bundles: +- bionic-queens.yaml +gate_bundles: +- bionic-queens.yaml +configure: +- zaza.openstack.charm_tests.kerberos.setup.add_dns_entry_to_keystone +- zaza.openstack.charm_tests.kerberos.setup.configure_keystone_service_in_kerberos +- zaza.openstack.charm_tests.kerberos.setup.retrieve_and_attach_keytab +- zaza.openstack.charm_tests.kerberos.setup.openstack_setup_kerberos +tests: +- zaza.openstack.charm_tests.kerberos.tests.CharmKeystoneKerberosTest From 5e3841e81e72c5bf92f41ddbf06b12a4188565e9 Mon Sep 17 00:00:00 2001 From: Camille Rodriguez Date: Thu, 19 Mar 2020 19:13:56 -0500 Subject: [PATCH 02/27] Fixing path and num_units --- src/tests/bundles/bionic-queens.yaml | 3 ++- src/tests/tests.yaml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/tests/bundles/bionic-queens.yaml b/src/tests/bundles/bionic-queens.yaml index bd8ea6e..b804655 100644 --- a/src/tests/bundles/bionic-queens.yaml +++ b/src/tests/bundles/bionic-queens.yaml @@ -42,7 +42,8 @@ applications: keystone-kerberos: charm: ../../../keystone-kerberos kerberos-server: - charm: /home/ubutu/charm-kerberos-test-fixture + charm: /home/ubuntu/charm-kerberos-test-fixture + num_units: 1 to: - '5' diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 48cfa3d..6157ef1 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,8 +1,8 @@ charm_name: keystone-kerberos smoke_bundles: -- bionic-queens.yaml +- bionic-queens gate_bundles: -- bionic-queens.yaml +- bionic-queens configure: - zaza.openstack.charm_tests.kerberos.setup.add_dns_entry_to_keystone - zaza.openstack.charm_tests.kerberos.setup.configure_keystone_service_in_kerberos From 375d974857a5b609321e7da19d28cae7ecac904b Mon Sep 17 00:00:00 2001 From: Camille Rodriguez Date: Thu, 19 Mar 2020 19:34:31 -0500 Subject: [PATCH 03/27] Addind kerberos config options --- src/tests/bundles/bionic-queens.yaml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/tests/bundles/bionic-queens.yaml b/src/tests/bundles/bionic-queens.yaml index b804655..308cb95 100644 --- a/src/tests/bundles/bionic-queens.yaml +++ b/src/tests/bundles/bionic-queens.yaml @@ -32,19 +32,28 @@ applications: token-expiration: 60 to: - '1' - - '2' - - '3' +# - '2' +# - '3' openstack-dashboard: charm: cs:~openstack-charmers-next/openstack-dashboard num_units: 1 to: - - '4' + - '2' +# - '4' 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: /home/ubuntu/charm-kerberos-test-fixture num_units: 1 to: - - '5' + - '3' +# - '5' From caf59517239decfd2867930ff1a2d33b11988217 Mon Sep 17 00:00:00 2001 From: Camille Rodriguez Date: Fri, 20 Mar 2020 09:32:01 -0500 Subject: [PATCH 04/27] Need target deploy status configuration incomplete because no keytab will be attached at first --- src/tests/tests.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 6157ef1..8fbf0f2 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -10,3 +10,7 @@ configure: - zaza.openstack.charm_tests.kerberos.setup.openstack_setup_kerberos tests: - zaza.openstack.charm_tests.kerberos.tests.CharmKeystoneKerberosTest +target_deploy_status: + keystone-saml-mellon: + workload-status: blocked + workload-status-message: "Kerberos configuration incomplete" \ No newline at end of file From 5882474bb6a22e435c32c972c2b11122a2677ddd Mon Sep 17 00:00:00 2001 From: Camille Rodriguez Date: Fri, 20 Mar 2020 12:22:42 -0500 Subject: [PATCH 05/27] adjusting tests for one keystone unit --- src/tests/bundles/bionic-queens.yaml | 6 +++--- src/tests/tests.yaml | 11 ++++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/tests/bundles/bionic-queens.yaml b/src/tests/bundles/bionic-queens.yaml index 308cb95..bb9008f 100644 --- a/src/tests/bundles/bionic-queens.yaml +++ b/src/tests/bundles/bionic-queens.yaml @@ -7,8 +7,8 @@ machines: '1': '2': '3': - '4': - '5': +# '4': +# '5': relations: - - keystone:shared-db - mysql:shared-db @@ -26,7 +26,7 @@ applications: - '0' keystone: charm: cs:~openstack-charmers-next/keystone - num_units: 3 + num_units: 1 options: token-provider: 'fernet' token-expiration: 60 diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 8fbf0f2..58f7e92 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -4,13 +4,14 @@ smoke_bundles: gate_bundles: - bionic-queens configure: -- zaza.openstack.charm_tests.kerberos.setup.add_dns_entry_to_keystone -- zaza.openstack.charm_tests.kerberos.setup.configure_keystone_service_in_kerberos -- zaza.openstack.charm_tests.kerberos.setup.retrieve_and_attach_keytab -- zaza.openstack.charm_tests.kerberos.setup.openstack_setup_kerberos +- zaza.openstack.charm_tests.kerberos.setup +#- zaza.openstack.charm_tests.kerberos.setup.add_dns_entry_to_keystone +#- zaza.openstack.charm_tests.kerberos.setup.configure_keystone_service_in_kerberos +#- zaza.openstack.charm_tests.kerberos.setup.retrieve_and_attach_keytab +#- zaza.openstack.charm_tests.kerberos.setup.openstack_setup_kerberos tests: - zaza.openstack.charm_tests.kerberos.tests.CharmKeystoneKerberosTest target_deploy_status: - keystone-saml-mellon: + keystone-kerberos: workload-status: blocked workload-status-message: "Kerberos configuration incomplete" \ No newline at end of file From 22b3b8b9f9342ac5ad5d5f908be2a5fe2c204059 Mon Sep 17 00:00:00 2001 From: Camille Rodriguez Date: Fri, 20 Mar 2020 14:44:16 -0500 Subject: [PATCH 06/27] list all configuration functions --- src/tests/tests.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 58f7e92..9f81897 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -4,11 +4,12 @@ smoke_bundles: gate_bundles: - bionic-queens configure: -- zaza.openstack.charm_tests.kerberos.setup -#- zaza.openstack.charm_tests.kerberos.setup.add_dns_entry_to_keystone -#- zaza.openstack.charm_tests.kerberos.setup.configure_keystone_service_in_kerberos -#- zaza.openstack.charm_tests.kerberos.setup.retrieve_and_attach_keytab -#- zaza.openstack.charm_tests.kerberos.setup.openstack_setup_kerberos +- zaza.openstack.charm_tests.kerberos.setup.add_empty_resource_file_to_keystone_kerberos +- zaza.openstack.charm_tests.kerberos.setup.add_dns_entry_to_keystone +- zaza.openstack.charm_tests.kerberos.setup.configure_keystone_service_in_kerberos +- zaza.openstack.charm_tests.kerberos.setup.retrieve_and_attach_keytab +- zaza.openstack.charm_tests.kerberos.setup.openstack_setup_kerberos +- zaza.openstack.charm_tests.kerberos.setup.retrieve_token_and_conf_for_test_host tests: - zaza.openstack.charm_tests.kerberos.tests.CharmKeystoneKerberosTest target_deploy_status: From 223bb2fda152413707179da70a6fd601da571514 Mon Sep 17 00:00:00 2001 From: Camille Rodriguez Date: Mon, 23 Mar 2020 13:13:08 -0500 Subject: [PATCH 07/27] Functional tests bundle and descriptor --- src/tests/bundles/bionic-queens.yaml | 9 ++------- src/tests/tests.yaml | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/tests/bundles/bionic-queens.yaml b/src/tests/bundles/bionic-queens.yaml index bb9008f..0c22ec7 100644 --- a/src/tests/bundles/bionic-queens.yaml +++ b/src/tests/bundles/bionic-queens.yaml @@ -7,8 +7,6 @@ machines: '1': '2': '3': -# '4': -# '5': relations: - - keystone:shared-db - mysql:shared-db @@ -32,14 +30,11 @@ applications: token-expiration: 60 to: - '1' -# - '2' -# - '3' openstack-dashboard: charm: cs:~openstack-charmers-next/openstack-dashboard num_units: 1 to: - '2' -# - '4' keystone-kerberos: charm: ../../../keystone-kerberos options: @@ -50,10 +45,10 @@ applications: keystone_keytab: keystone.keytab kerberos-server: - charm: /home/ubuntu/charm-kerberos-test-fixture + charm: cs:~openstack-charmers-next/kerberos-test-fixture num_units: 1 to: - '3' -# - '5' + diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 9f81897..a6f5bef 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -9,7 +9,7 @@ configure: - zaza.openstack.charm_tests.kerberos.setup.configure_keystone_service_in_kerberos - zaza.openstack.charm_tests.kerberos.setup.retrieve_and_attach_keytab - zaza.openstack.charm_tests.kerberos.setup.openstack_setup_kerberos -- zaza.openstack.charm_tests.kerberos.setup.retrieve_token_and_conf_for_test_host +- zaza.openstack.charm_tests.kerberos.setup.setup_kerberos_configuration_for_test_host tests: - zaza.openstack.charm_tests.kerberos.tests.CharmKeystoneKerberosTest target_deploy_status: From f7ee149eaaa4f968f23ef2bae7440c53f44b803a Mon Sep 17 00:00:00 2001 From: Camille Rodriguez Date: Mon, 23 Mar 2020 14:57:32 -0500 Subject: [PATCH 08/27] unique test function and mock module missing --- src/test-requirements.txt | 3 ++- src/tests/tests.yaml | 7 +------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/test-requirements.txt b/src/test-requirements.txt index cadb3c7..3f8cb7a 100644 --- a/src/test-requirements.txt +++ b/src/test-requirements.txt @@ -6,4 +6,5 @@ # 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 -git+https://github.com/camille-rodriguez/zaza-openstack-tests.git#egg=zaza.openstack \ No newline at end of file +git+https://github.com/camille-rodriguez/zaza-openstack-tests.git#egg=zaza.openstack +mock>=1.2 \ No newline at end of file diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index a6f5bef..405a9ea 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -4,12 +4,7 @@ smoke_bundles: gate_bundles: - bionic-queens configure: -- zaza.openstack.charm_tests.kerberos.setup.add_empty_resource_file_to_keystone_kerberos -- zaza.openstack.charm_tests.kerberos.setup.add_dns_entry_to_keystone -- zaza.openstack.charm_tests.kerberos.setup.configure_keystone_service_in_kerberos -- zaza.openstack.charm_tests.kerberos.setup.retrieve_and_attach_keytab -- zaza.openstack.charm_tests.kerberos.setup.openstack_setup_kerberos -- zaza.openstack.charm_tests.kerberos.setup.setup_kerberos_configuration_for_test_host +- zaza.openstack.charm_tests.kerberos.setup.run_all_tests tests: - zaza.openstack.charm_tests.kerberos.tests.CharmKeystoneKerberosTest target_deploy_status: From 4aa7b420f2fc9b2e3c9dc9744b92d6c5127da61a Mon Sep 17 00:00:00 2001 From: Camille Rodriguez Date: Mon, 23 Mar 2020 16:23:23 -0500 Subject: [PATCH 09/27] missing python module for kerberos --- src/test-requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test-requirements.txt b/src/test-requirements.txt index 3f8cb7a..b192d2d 100644 --- a/src/test-requirements.txt +++ b/src/test-requirements.txt @@ -7,4 +7,5 @@ git+https://github.com/openstack-charmers/zaza.git#egg=zaza #git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack git+https://github.com/camille-rodriguez/zaza-openstack-tests.git#egg=zaza.openstack -mock>=1.2 \ No newline at end of file +mock>=1.2 +keystoneauth1[kerberos] \ No newline at end of file From 1eeb65d5dbaf0b67ec9bd4e4669bebf3ba1ed9a3 Mon Sep 17 00:00:00 2001 From: Camille Rodriguez Date: Mon, 23 Mar 2020 17:58:25 -0500 Subject: [PATCH 10/27] mock not needed, krb5-user for kinit --- src/test-requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test-requirements.txt b/src/test-requirements.txt index b192d2d..008cae5 100644 --- a/src/test-requirements.txt +++ b/src/test-requirements.txt @@ -7,5 +7,5 @@ git+https://github.com/openstack-charmers/zaza.git#egg=zaza #git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack git+https://github.com/camille-rodriguez/zaza-openstack-tests.git#egg=zaza.openstack -mock>=1.2 -keystoneauth1[kerberos] \ No newline at end of file +keystoneauth1[kerberos] +krb5-user From d96c1941252a4060e2ee560ed303062952d15328 Mon Sep 17 00:00:00 2001 From: Camille Rodriguez Date: Mon, 23 Mar 2020 18:03:08 -0500 Subject: [PATCH 11/27] krb5-user is a package, not a python module --- src/test-requirements.txt | 1 - test-requirements.txt | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test-requirements.txt b/src/test-requirements.txt index 008cae5..ee2ece5 100644 --- a/src/test-requirements.txt +++ b/src/test-requirements.txt @@ -8,4 +8,3 @@ git+https://github.com/openstack-charmers/zaza.git#egg=zaza #git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack git+https://github.com/camille-rodriguez/zaza-openstack-tests.git#egg=zaza.openstack keystoneauth1[kerberos] -krb5-user diff --git a/test-requirements.txt b/test-requirements.txt index 14b380e..93d09bf 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -10,4 +10,5 @@ charms.reactive mock>=1.2 nose>=1.3.7 coverage>=3.6 +krb5-user git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack From 3e705e375baf10dc99330f1cc70fb8e5bffafa38 Mon Sep 17 00:00:00 2001 From: Camille Rodriguez Date: Tue, 24 Mar 2020 15:59:19 -0500 Subject: [PATCH 12/27] add func tests --- src/tests/bundles/bionic-queens.yaml | 15 +--------- src/tests/bundles/bionic-rocky.yaml | 41 ++++++++++++++++++++++++++++ src/tests/bundles/bionic-stein.yaml | 41 ++++++++++++++++++++++++++++ src/tests/bundles/bionic-train.yaml | 41 ++++++++++++++++++++++++++++ src/tests/bundles/bionic-ussuri.yaml | 41 ++++++++++++++++++++++++++++ src/tests/bundles/focal-ussuri.yaml | 41 ++++++++++++++++++++++++++++ src/tests/tests.yaml | 10 +++++-- 7 files changed, 214 insertions(+), 16 deletions(-) create mode 100644 src/tests/bundles/bionic-rocky.yaml create mode 100644 src/tests/bundles/bionic-stein.yaml create mode 100644 src/tests/bundles/bionic-train.yaml create mode 100644 src/tests/bundles/bionic-ussuri.yaml create mode 100644 src/tests/bundles/focal-ussuri.yaml diff --git a/src/tests/bundles/bionic-queens.yaml b/src/tests/bundles/bionic-queens.yaml index 0c22ec7..3588252 100644 --- a/src/tests/bundles/bionic-queens.yaml +++ b/src/tests/bundles/bionic-queens.yaml @@ -6,16 +6,11 @@ machines: constraints: mem=3072M '1': '2': - '3': relations: - - keystone:shared-db - mysql:shared-db - - keystone - keystone-kerberos -- - openstack-dashboard:identity-service - - keystone:identity-service -- - openstack-dashboard:shared-db - - mysql:shared-db applications: mysql: charm: cs:~openstack-charmers-next/percona-cluster @@ -30,11 +25,6 @@ applications: token-expiration: 60 to: - '1' - openstack-dashboard: - charm: cs:~openstack-charmers-next/openstack-dashboard - num_units: 1 - to: - - '2' keystone-kerberos: charm: ../../../keystone-kerberos options: @@ -48,7 +38,4 @@ applications: charm: cs:~openstack-charmers-next/kerberos-test-fixture num_units: 1 to: - - '3' - - - + - '2' diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml new file mode 100644 index 0000000..3588252 --- /dev/null +++ b/src/tests/bundles/bionic-rocky.yaml @@ -0,0 +1,41 @@ +series: bionic +comment: +- 'machines section to decide order of deployment. database sooner = faster' +machines: + '0': + constraints: mem=3072M + '1': + '2': +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' diff --git a/src/tests/bundles/bionic-stein.yaml b/src/tests/bundles/bionic-stein.yaml new file mode 100644 index 0000000..3588252 --- /dev/null +++ b/src/tests/bundles/bionic-stein.yaml @@ -0,0 +1,41 @@ +series: bionic +comment: +- 'machines section to decide order of deployment. database sooner = faster' +machines: + '0': + constraints: mem=3072M + '1': + '2': +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' diff --git a/src/tests/bundles/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml new file mode 100644 index 0000000..3588252 --- /dev/null +++ b/src/tests/bundles/bionic-train.yaml @@ -0,0 +1,41 @@ +series: bionic +comment: +- 'machines section to decide order of deployment. database sooner = faster' +machines: + '0': + constraints: mem=3072M + '1': + '2': +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' diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml new file mode 100644 index 0000000..3588252 --- /dev/null +++ b/src/tests/bundles/bionic-ussuri.yaml @@ -0,0 +1,41 @@ +series: bionic +comment: +- 'machines section to decide order of deployment. database sooner = faster' +machines: + '0': + constraints: mem=3072M + '1': + '2': +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' diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml new file mode 100644 index 0000000..d8507bd --- /dev/null +++ b/src/tests/bundles/focal-ussuri.yaml @@ -0,0 +1,41 @@ +series: focal +comment: +- 'machines section to decide order of deployment. database sooner = faster' +machines: + '0': + constraints: mem=3072M + '1': + '2': +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' diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 405a9ea..e4fde64 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,8 +1,14 @@ charm_name: keystone-kerberos smoke_bundles: -- bionic-queens + - bionic-train gate_bundles: -- bionic-queens + - bionic-queens + - bionic-rocky + - bionic-stein + - bionic-train +dev_bundles: + - bionic-ussuri + - focal-ussuri configure: - zaza.openstack.charm_tests.kerberos.setup.run_all_tests tests: From 417eb076423d34aca502c591119deaa3e46efb44 Mon Sep 17 00:00:00 2001 From: Camille Rodriguez Date: Tue, 24 Mar 2020 16:06:22 -0500 Subject: [PATCH 13/27] not needed here --- test-requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 93d09bf..14b380e 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -10,5 +10,4 @@ charms.reactive mock>=1.2 nose>=1.3.7 coverage>=3.6 -krb5-user git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack From 4bb25d9af5788f77a55c2f1fa48c9954cb2817fe Mon Sep 17 00:00:00 2001 From: Camille Rodriguez Date: Wed, 25 Mar 2020 13:51:39 -0500 Subject: [PATCH 14/27] add a test server in which the kerberos client will be configured --- src/tests/bundles/bionic-queens.yaml | 6 ++++++ src/tests/tests.yaml | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/tests/bundles/bionic-queens.yaml b/src/tests/bundles/bionic-queens.yaml index 3588252..cb0b906 100644 --- a/src/tests/bundles/bionic-queens.yaml +++ b/src/tests/bundles/bionic-queens.yaml @@ -6,6 +6,7 @@ machines: constraints: mem=3072M '1': '2': + '3': relations: - - keystone:shared-db - mysql:shared-db @@ -39,3 +40,8 @@ applications: num_units: 1 to: - '2' + ubuntu-test-host: + charm: cs:~ubuntu + num_unit: 1 + to: + - '3' \ No newline at end of file diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index e4fde64..962f30e 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -3,9 +3,9 @@ smoke_bundles: - bionic-train gate_bundles: - bionic-queens - - bionic-rocky - - bionic-stein - - bionic-train + #- bionic-rocky + #- bionic-stein + #- bionic-train dev_bundles: - bionic-ussuri - focal-ussuri From 23d0c320ef1e92b2bf7cfd338e933b84ba8ef2b2 Mon Sep 17 00:00:00 2001 From: Camille Rodriguez Date: Wed, 25 Mar 2020 14:09:43 -0500 Subject: [PATCH 15/27] add a test server in which the kerberos client will be configured --- src/tests/bundles/bionic-queens.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/bundles/bionic-queens.yaml b/src/tests/bundles/bionic-queens.yaml index cb0b906..fa5f1ca 100644 --- a/src/tests/bundles/bionic-queens.yaml +++ b/src/tests/bundles/bionic-queens.yaml @@ -42,6 +42,6 @@ applications: - '2' ubuntu-test-host: charm: cs:~ubuntu - num_unit: 1 + num_units: 1 to: - '3' \ No newline at end of file From 16736a891d1a8feaa6cdcaa8593f6bdfa5d385b2 Mon Sep 17 00:00:00 2001 From: Camille Rodriguez Date: Wed, 25 Mar 2020 15:33:05 -0500 Subject: [PATCH 16/27] add a test server in which the kerberos client will be configured --- src/tests/bundles/bionic-queens.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/bundles/bionic-queens.yaml b/src/tests/bundles/bionic-queens.yaml index fa5f1ca..4a4d45b 100644 --- a/src/tests/bundles/bionic-queens.yaml +++ b/src/tests/bundles/bionic-queens.yaml @@ -41,7 +41,7 @@ applications: to: - '2' ubuntu-test-host: - charm: cs:~ubuntu + charm: cs:ubuntu num_units: 1 to: - '3' \ No newline at end of file From be6e286f67c612993bd24e81163b8e74ed6c4f22 Mon Sep 17 00:00:00 2001 From: Camille Rodriguez Date: Thu, 26 Mar 2020 14:37:33 -0500 Subject: [PATCH 17/27] uncomment bundles --- src/tests/tests.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 962f30e..e4fde64 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -3,9 +3,9 @@ smoke_bundles: - bionic-train gate_bundles: - bionic-queens - #- bionic-rocky - #- bionic-stein - #- bionic-train + - bionic-rocky + - bionic-stein + - bionic-train dev_bundles: - bionic-ussuri - focal-ussuri From d42b4bcec5d2c7e30671576dbb25dd4d97846eee Mon Sep 17 00:00:00 2001 From: Camille Rodriguez Date: Thu, 26 Mar 2020 15:26:55 -0500 Subject: [PATCH 18/27] add ubuntu test host unit --- src/tests/bundles/bionic-rocky.yaml | 6 ++++++ src/tests/bundles/bionic-stein.yaml | 6 ++++++ src/tests/bundles/bionic-train.yaml | 6 ++++++ src/tests/bundles/bionic-ussuri.yaml | 6 ++++++ src/tests/bundles/focal-ussuri.yaml | 6 ++++++ 5 files changed, 30 insertions(+) diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml index 3588252..4a4d45b 100644 --- a/src/tests/bundles/bionic-rocky.yaml +++ b/src/tests/bundles/bionic-rocky.yaml @@ -6,6 +6,7 @@ machines: constraints: mem=3072M '1': '2': + '3': relations: - - keystone:shared-db - mysql:shared-db @@ -39,3 +40,8 @@ applications: num_units: 1 to: - '2' + ubuntu-test-host: + charm: cs:ubuntu + num_units: 1 + to: + - '3' \ No newline at end of file diff --git a/src/tests/bundles/bionic-stein.yaml b/src/tests/bundles/bionic-stein.yaml index 3588252..4a4d45b 100644 --- a/src/tests/bundles/bionic-stein.yaml +++ b/src/tests/bundles/bionic-stein.yaml @@ -6,6 +6,7 @@ machines: constraints: mem=3072M '1': '2': + '3': relations: - - keystone:shared-db - mysql:shared-db @@ -39,3 +40,8 @@ applications: num_units: 1 to: - '2' + ubuntu-test-host: + charm: cs:ubuntu + num_units: 1 + to: + - '3' \ No newline at end of file diff --git a/src/tests/bundles/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml index 3588252..4a4d45b 100644 --- a/src/tests/bundles/bionic-train.yaml +++ b/src/tests/bundles/bionic-train.yaml @@ -6,6 +6,7 @@ machines: constraints: mem=3072M '1': '2': + '3': relations: - - keystone:shared-db - mysql:shared-db @@ -39,3 +40,8 @@ applications: num_units: 1 to: - '2' + ubuntu-test-host: + charm: cs:ubuntu + num_units: 1 + to: + - '3' \ No newline at end of file diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml index 3588252..4a4d45b 100644 --- a/src/tests/bundles/bionic-ussuri.yaml +++ b/src/tests/bundles/bionic-ussuri.yaml @@ -6,6 +6,7 @@ machines: constraints: mem=3072M '1': '2': + '3': relations: - - keystone:shared-db - mysql:shared-db @@ -39,3 +40,8 @@ applications: num_units: 1 to: - '2' + ubuntu-test-host: + charm: cs:ubuntu + num_units: 1 + to: + - '3' \ No newline at end of file diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml index d8507bd..a47d2b8 100644 --- a/src/tests/bundles/focal-ussuri.yaml +++ b/src/tests/bundles/focal-ussuri.yaml @@ -6,6 +6,7 @@ machines: constraints: mem=3072M '1': '2': + '3': relations: - - keystone:shared-db - mysql:shared-db @@ -39,3 +40,8 @@ applications: num_units: 1 to: - '2' + ubuntu-test-host: + charm: cs:ubuntu + num_units: 1 + to: + - '3' \ No newline at end of file From 90264dbeb96abe3420e3088dc8f2f094ee81abc5 Mon Sep 17 00:00:00 2001 From: Camille Rodriguez Date: Thu, 26 Mar 2020 17:03:15 -0500 Subject: [PATCH 19/27] force-deploy option for focal-ussuri --- src/tests/tests.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index e4fde64..6f1b447 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -13,7 +13,10 @@ configure: - zaza.openstack.charm_tests.kerberos.setup.run_all_tests tests: - zaza.openstack.charm_tests.kerberos.tests.CharmKeystoneKerberosTest +tests_options: + force_deploy: + - focal-ussuri target_deploy_status: keystone-kerberos: workload-status: blocked - workload-status-message: "Kerberos configuration incomplete" \ No newline at end of file + workload-status-message: "Kerberos configuration incomplete" From ccf9b0d5caccd063a3b11db5c588e3d2a1784614 Mon Sep 17 00:00:00 2001 From: Camille Rodriguez Date: Thu, 26 Mar 2020 17:31:56 -0500 Subject: [PATCH 20/27] revert to upstream tests --- src/test-requirements.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/test-requirements.txt b/src/test-requirements.txt index ee2ece5..d3c9be8 100644 --- a/src/test-requirements.txt +++ b/src/test-requirements.txt @@ -5,6 +5,4 @@ # # 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 -git+https://github.com/camille-rodriguez/zaza-openstack-tests.git#egg=zaza.openstack -keystoneauth1[kerberos] +git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack From 84af3bd409933f2633dd50a63ddb7db6c670f372 Mon Sep 17 00:00:00 2001 From: Camille Rodriguez Date: Thu, 26 Mar 2020 17:33:07 -0500 Subject: [PATCH 21/27] newlines --- src/tests/bundles/bionic-queens.yaml | 2 +- src/tests/bundles/bionic-rocky.yaml | 2 +- src/tests/bundles/bionic-stein.yaml | 2 +- src/tests/bundles/bionic-train.yaml | 2 +- src/tests/bundles/bionic-ussuri.yaml | 2 +- src/tests/bundles/focal-ussuri.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/tests/bundles/bionic-queens.yaml b/src/tests/bundles/bionic-queens.yaml index 4a4d45b..573f70e 100644 --- a/src/tests/bundles/bionic-queens.yaml +++ b/src/tests/bundles/bionic-queens.yaml @@ -44,4 +44,4 @@ applications: charm: cs:ubuntu num_units: 1 to: - - '3' \ No newline at end of file + - '3' diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml index 4a4d45b..573f70e 100644 --- a/src/tests/bundles/bionic-rocky.yaml +++ b/src/tests/bundles/bionic-rocky.yaml @@ -44,4 +44,4 @@ applications: charm: cs:ubuntu num_units: 1 to: - - '3' \ No newline at end of file + - '3' diff --git a/src/tests/bundles/bionic-stein.yaml b/src/tests/bundles/bionic-stein.yaml index 4a4d45b..573f70e 100644 --- a/src/tests/bundles/bionic-stein.yaml +++ b/src/tests/bundles/bionic-stein.yaml @@ -44,4 +44,4 @@ applications: charm: cs:ubuntu num_units: 1 to: - - '3' \ No newline at end of file + - '3' diff --git a/src/tests/bundles/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml index 4a4d45b..573f70e 100644 --- a/src/tests/bundles/bionic-train.yaml +++ b/src/tests/bundles/bionic-train.yaml @@ -44,4 +44,4 @@ applications: charm: cs:ubuntu num_units: 1 to: - - '3' \ No newline at end of file + - '3' diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml index 4a4d45b..573f70e 100644 --- a/src/tests/bundles/bionic-ussuri.yaml +++ b/src/tests/bundles/bionic-ussuri.yaml @@ -44,4 +44,4 @@ applications: charm: cs:ubuntu num_units: 1 to: - - '3' \ No newline at end of file + - '3' diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml index a47d2b8..fe77e17 100644 --- a/src/tests/bundles/focal-ussuri.yaml +++ b/src/tests/bundles/focal-ussuri.yaml @@ -44,4 +44,4 @@ applications: charm: cs:ubuntu num_units: 1 to: - - '3' \ No newline at end of file + - '3' From 17ef9578edadb396b752e73c290b2286de460185 Mon Sep 17 00:00:00 2001 From: Camille Rodriguez Date: Thu, 26 Mar 2020 17:35:02 -0500 Subject: [PATCH 22/27] add focal for tests --- src/metadata.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/metadata.yaml b/src/metadata.yaml index 5a6adc2..05a32b3 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -11,7 +11,7 @@ tags: - ldap series: - bionic - - eoan + - focal subordinate: true provides: keystone-fid-service-provider: From 5d5c331e96ebe811522daa0493c23c10849cc8d2 Mon Sep 17 00:00:00 2001 From: Camille Rodriguez Date: Mon, 30 Mar 2020 10:31:34 -0500 Subject: [PATCH 23/27] rename configuration tests --- src/tests/tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 6f1b447..2c6c240 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -10,7 +10,7 @@ dev_bundles: - bionic-ussuri - focal-ussuri configure: -- zaza.openstack.charm_tests.kerberos.setup.run_all_tests +- zaza.openstack.charm_tests.kerberos.setup.run_all_configuration_steps tests: - zaza.openstack.charm_tests.kerberos.tests.CharmKeystoneKerberosTest tests_options: From a33460b916f43e5e71ebb48adcc9ab93c6d437b2 Mon Sep 17 00:00:00 2001 From: Camille Rodriguez Date: Mon, 30 Mar 2020 10:31:58 -0500 Subject: [PATCH 24/27] keep all indents the same --- src/tests/tests.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 2c6c240..57a0760 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -10,9 +10,9 @@ dev_bundles: - bionic-ussuri - focal-ussuri configure: -- zaza.openstack.charm_tests.kerberos.setup.run_all_configuration_steps + - zaza.openstack.charm_tests.kerberos.setup.run_all_configuration_steps tests: -- zaza.openstack.charm_tests.kerberos.tests.CharmKeystoneKerberosTest + - zaza.openstack.charm_tests.kerberos.tests.CharmKeystoneKerberosTest tests_options: force_deploy: - focal-ussuri From 26420d005e831bcd149f811888da94c8b6dbc139 Mon Sep 17 00:00:00 2001 From: Camille Rodriguez Date: Mon, 30 Mar 2020 14:53:04 -0500 Subject: [PATCH 25/27] updating the readme to use python3 packages --- src/README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/README.md b/src/README.md index 4ec4fcd..9b140f4 100644 --- a/src/README.md +++ b/src/README.md @@ -47,8 +47,7 @@ In a bundle: To authenticate against Keystone and Kerberos from a host, the following librairies need to be installed : -- sudo apt install krb5-user gcc python-dev libkrb5-dev python-pip -- pip install keystoneauth1[kerberos] +- sudo apt install krb5-user python3-openstackclient python3-requests-kerberos # Configuration From c6e5ddc6e78b1f726aa78864f40163e2942b8dfd Mon Sep 17 00:00:00 2001 From: Camille Rodriguez Date: Mon, 30 Mar 2020 15:23:18 -0500 Subject: [PATCH 26/27] update readme with openstack versions --- src/README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/README.md b/src/README.md index 9b140f4..7999b60 100644 --- a/src/README.md +++ b/src/README.md @@ -4,22 +4,22 @@ This subordinate charm provides a way to authenticate in Openstack for a specific domain with a Kerberos ticket. This provides an additional security layer. An external Kerberos server is necessary. -The following documentation is useful to understand better the charm -implementation: - -* https://www.objectif-libre.com/fr/blog/2018/02/26/kerberos-authentication-for-keystone/ -* https://jaosorior.dev/2018/keberos-for-keystone-with-mod_auth_gssapi/ +This kerberos subordinate charm is supported on Ubuntu Bionic (18.04 LTS) with the following versions of +Openstack: +- Queens +- Rocky +- Stein +- Train +- Ussuri # Usage -Use this charm with the Keystone and Keystone-LDAP charms: +Use this charm with the Keystone charm: juju deploy keystone - juju deploy keystone-ldap juju deploy openstack-dashboard juju deploy keystone-kerberos - juju add-relation keystone keystone-ldap juju add-relation keystone openstack-dashboard juju add-relation keystone keystone-kerberos From 68eefb0758e22bb61a6289d64b7bc6774b22aaed Mon Sep 17 00:00:00 2001 From: Camille Rodriguez Date: Mon, 30 Mar 2020 16:07:33 -0500 Subject: [PATCH 27/27] update readme with openstack versions --- src/README.md | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/README.md b/src/README.md index 7999b60..181b70d 100644 --- a/src/README.md +++ b/src/README.md @@ -4,13 +4,8 @@ This subordinate charm provides a way to authenticate in Openstack for a specific domain with a Kerberos ticket. This provides an additional security layer. An external Kerberos server is necessary. -This kerberos subordinate charm is supported on Ubuntu Bionic (18.04 LTS) with the following versions of -Openstack: -- Queens -- Rocky -- Stein -- Train -- Ussuri +This kerberos subordinate charm is supported on Ubuntu Bionic (18.04 LTS) with +the Openstack versions Queens and later. # Usage