From c30f2982d5d27c77d4ce0d3e096585b75af5461c Mon Sep 17 00:00:00 2001 From: Frode Nordahl Date: Tue, 15 Jun 2021 07:23:45 +0200 Subject: [PATCH] Test bundles for focal-wallaby and hirsute-wallaby These are the test bundles (and any associated changes) for focal-wallaby and hirsute-wallaby support. Re-enable testing with Victora Amphora. Re-enable bionic-ussuri-ha-ovn now that the ovn 20.03.2 SRU is complete. Replace overlay symlinks with local-charm-overlay template. Group jobs in two stages to avoid CI resource depletion. Func-Test-Pr: https://github.com/openstack-charmers/zaza-openstack-tests/pull/592 Change-Id: Id8a71ad90da98f6330328663478a948f4b134c0d Co-authored-by: Aurelien Lourot --- osci.yaml | 82 ++++--- src/tests/bundles/focal-ussuri-ha-ovn.yaml | 27 ++- src/tests/bundles/focal-ussuri-ha.yaml | 27 ++- src/tests/bundles/focal-victoria-ha-ovn.yaml | 30 +-- src/tests/bundles/focal-victoria-ha.yaml | 30 +-- src/tests/bundles/focal-wallaby-ha-ovn.yaml | 201 +++++++++++++++++ src/tests/bundles/focal-wallaby-ha.yaml | 202 +++++++++++++++++ src/tests/bundles/groovy-victoria-ha-ovn.yaml | 36 +-- src/tests/bundles/groovy-victoria-ha.yaml | 36 +-- src/tests/bundles/hirsute-wallaby-ha-ovn.yaml | 207 +++++++++++++++++ src/tests/bundles/hirsute-wallaby-ha.yaml | 208 ++++++++++++++++++ .../bundles/overlays/bionic-rocky-ha.yaml.j2 | 1 - .../bundles/overlays/bionic-rocky-lxd.yaml.j2 | 1 - .../bundles/overlays/bionic-stein-ha.yaml.j2 | 1 - .../overlays/bionic-train-ha-ovn.yaml.j2 | 1 - .../bundles/overlays/bionic-train-ha.yaml.j2 | 1 - .../overlays/bionic-ussuri-ha-ovn.yaml.j2 | 1 - .../bundles/overlays/bionic-ussuri-ha.yaml.j2 | 1 - .../overlays/focal-ussuri-ha-ovn.yaml.j2 | 1 - .../bundles/overlays/focal-ussuri-ha.yaml.j2 | 1 - .../overlays/focal-victoria-ha-ovn.yaml.j2 | 1 - .../overlays/focal-victoria-ha.yaml.j2 | 1 - .../overlays/groovy-victoria-ha-ovn.yaml.j2 | 1 - .../overlays/groovy-victoria-ha.yaml.j2 | 1 - .../{ha.j2 => local-charm-overlay.yaml.j2} | 0 src/tests/tests.yaml | 16 +- 26 files changed, 989 insertions(+), 126 deletions(-) create mode 100644 src/tests/bundles/focal-wallaby-ha-ovn.yaml create mode 100644 src/tests/bundles/focal-wallaby-ha.yaml create mode 100644 src/tests/bundles/hirsute-wallaby-ha-ovn.yaml create mode 100644 src/tests/bundles/hirsute-wallaby-ha.yaml delete mode 120000 src/tests/bundles/overlays/bionic-rocky-ha.yaml.j2 delete mode 120000 src/tests/bundles/overlays/bionic-rocky-lxd.yaml.j2 delete mode 120000 src/tests/bundles/overlays/bionic-stein-ha.yaml.j2 delete mode 120000 src/tests/bundles/overlays/bionic-train-ha-ovn.yaml.j2 delete mode 120000 src/tests/bundles/overlays/bionic-train-ha.yaml.j2 delete mode 120000 src/tests/bundles/overlays/bionic-ussuri-ha-ovn.yaml.j2 delete mode 120000 src/tests/bundles/overlays/bionic-ussuri-ha.yaml.j2 delete mode 120000 src/tests/bundles/overlays/focal-ussuri-ha-ovn.yaml.j2 delete mode 120000 src/tests/bundles/overlays/focal-ussuri-ha.yaml.j2 delete mode 120000 src/tests/bundles/overlays/focal-victoria-ha-ovn.yaml.j2 delete mode 120000 src/tests/bundles/overlays/focal-victoria-ha.yaml.j2 delete mode 120000 src/tests/bundles/overlays/groovy-victoria-ha-ovn.yaml.j2 delete mode 120000 src/tests/bundles/overlays/groovy-victoria-ha.yaml.j2 rename src/tests/bundles/overlays/{ha.j2 => local-charm-overlay.yaml.j2} (100%) diff --git a/osci.yaml b/osci.yaml index 9bf112f9..81ac2014 100644 --- a/osci.yaml +++ b/osci.yaml @@ -7,8 +7,7 @@ - bionic-stein-ha - bionic-train-ha-ovn - bionic-train-ha - # Awaiting SRU in LP: #1924981 to complete - #- bionic-ussuri-ha-ovn + - bionic-ussuri-ha-ovn - bionic-ussuri-ha - focal-ussuri-ha-ovn - focal-ussuri-ha @@ -16,36 +15,39 @@ - focal-victoria-ha - groovy-victoria-ha-ovn - groovy-victoria-ha + # LP: #1913024 is fixed for bionic and focal, but not for hirsute/wallaby + # - focal-wallaby-ha-ovn + - focal-wallaby-ha + # LP: #1913024 is fixed for bionic and focal, but not for hirsute/wallaby + # - hirsute-wallaby-ha-ovn + - hirsute-wallaby-ha vars: needs_charm_build: true charm_build_name: octavia -- job: - name: bionic-rocky-ha - parent: func-target - dependencies: &smoke-jobs - - focal-ussuri-ha - - focal-ussuri-ha-ovn - vars: - needs_charm_build: true - charm_build_name: octavia - -- job: - name: bionic-rocky-ha - parent: func-target - dependencies: *smoke-jobs - vars: - tox_extra_args: bionic-rocky-ha - job: name: bionic-stein-ha parent: func-target - dependencies: *smoke-jobs + dependencies: &smoke-jobs + - bionic-train-ha-ovn + - bionic-ussuri-ha-ovn + - focal-ussuri-ha-ovn + - focal-victoria-ha-ovn + - groovy-victoria-ha-ovn + # - focal-wallaby-ha-ovn + # - hirsute-wallaby-ha-ovn vars: tox_extra_args: bionic-stein-ha - job: name: bionic-train-ha-ovn parent: func-target - dependencies: *smoke-jobs + dependencies: &lint-jobs + - osci-lint + - tox-py35 + - tox-py36 + - tox-py37 + - tox-py38 + - charm-build vars: tox_extra_args: bionic-train-ha-ovn - job: @@ -57,7 +59,7 @@ - job: name: bionic-ussuri-ha-ovn parent: func-target - dependencies: *smoke-jobs + dependencies: *lint-jobs vars: tox_extra_args: bionic-ussuri-ha-ovn - job: @@ -69,25 +71,19 @@ - job: name: focal-ussuri-ha-ovn parent: func-target - dependencies: &lint-jobs - - osci-lint - - tox-py35 - - tox-py36 - - tox-py37 - - tox-py38 - - charm-build + dependencies: *lint-jobs vars: tox_extra_args: focal-ussuri-ha-ovn - job: name: focal-ussuri-ha parent: func-target - dependencies: *lint-jobs + dependencies: *smoke-jobs vars: tox_extra_args: focal-ussuri-ha - job: name: focal-victoria-ha-ovn parent: func-target - dependencies: *smoke-jobs + dependencies: *lint-jobs vars: tox_extra_args: focal-victoria-ha-ovn - job: @@ -99,7 +95,7 @@ - job: name: groovy-victoria-ha-ovn parent: func-target - dependencies: *smoke-jobs + dependencies: *lint-jobs vars: tox_extra_args: groovy-victoria-ha-ovn - job: @@ -108,3 +104,27 @@ dependencies: *smoke-jobs vars: tox_extra_args: groovy-victoria-ha +- job: + name: focal-wallaby-ha-ovn + parent: func-target + dependencies: *lint-jobs + vars: + tox_extra_args: focal-wallaby-ha-ovn +- job: + name: focal-wallaby-ha + parent: func-target + dependencies: *smoke-jobs + vars: + tox_extra_args: focal-wallaby-ha +- job: + name: hirsute-wallaby-ha-ovn + parent: func-target + dependencies: *lint-jobs + vars: + tox_extra_args: hirsute-wallaby-ha-ovn +- job: + name: hirsute-wallaby-ha + parent: func-target + dependencies: *smoke-jobs + vars: + tox_extra_args: hirsute-wallaby-ha diff --git a/src/tests/bundles/focal-ussuri-ha-ovn.yaml b/src/tests/bundles/focal-ussuri-ha-ovn.yaml index e1b72e4a..58315620 100644 --- a/src/tests/bundles/focal-ussuri-ha-ovn.yaml +++ b/src/tests/bundles/focal-ussuri-ha-ovn.yaml @@ -1,4 +1,7 @@ -series: focal +variables: + openstack-origin: &openstack-origin distro + +series: &series focal relations: - - glance:image-service - nova-cloud-controller:image-service @@ -99,12 +102,12 @@ applications: charm: cs:~openstack-charmers-next/glance num_units: 1 options: - openstack-origin: distro + openstack-origin: *openstack-origin keystone: charm: cs:~openstack-charmers-next/keystone num_units: 1 options: - openstack-origin: distro + openstack-origin: *openstack-origin octavia-mysql-router: charm: cs:~openstack-charmers-next/mysql-router keystone-mysql-router: @@ -128,7 +131,7 @@ applications: charm: cs:~openstack-charmers-next/neutron-api num_units: 1 options: - openstack-origin: distro + openstack-origin: *openstack-origin debug: True flat-network-providers: physnet1 enable-ml2-port-security: True @@ -138,7 +141,7 @@ applications: charm: cs:~openstack-charmers-next/nova-cloud-controller num_units: 1 options: - openstack-origin: distro + openstack-origin: *openstack-origin debug: True network-manager: Neutron nova-compute: @@ -146,20 +149,20 @@ applications: charm: cs:~openstack-charmers-next/nova-compute num_units: 2 options: - openstack-origin: distro + openstack-origin: *openstack-origin debug: True hacluster-octavia: - series: focal + series: *series charm: cs:~openstack-charmers-next/hacluster ovn-chassis-octavia: charm: cs:~openstack-charmers-next/ovn-chassis octavia: constraints: cores=8 - series: focal + series: *series charm: ../../../octavia num_units: 3 options: - openstack-origin: distro + openstack-origin: *openstack-origin debug: True loadbalancer-topology: 'ACTIVE_STANDBY' rabbitmq-server: @@ -174,13 +177,13 @@ applications: charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' - retrofit-series: focal + retrofit-series: *series placement: charm: cs:~openstack-charmers-next/placement num_units: 1 constraints: mem=1G options: - openstack-origin: distro + openstack-origin: *openstack-origin debug: true neutron-api-plugin-ovn: charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn @@ -189,7 +192,7 @@ applications: charm: cs:~openstack-charmers-next/ovn-central num_units: 3 options: - source: distro + source: *openstack-origin ovn-chassis: charm: cs:~openstack-charmers-next/ovn-chassis vault: diff --git a/src/tests/bundles/focal-ussuri-ha.yaml b/src/tests/bundles/focal-ussuri-ha.yaml index 2706ac21..82ebde82 100644 --- a/src/tests/bundles/focal-ussuri-ha.yaml +++ b/src/tests/bundles/focal-ussuri-ha.yaml @@ -1,4 +1,7 @@ -series: focal +variables: + openstack-origin: &openstack-origin distro + +series: &series focal relations: - - glance:image-service - nova-cloud-controller:image-service @@ -91,12 +94,12 @@ applications: charm: cs:~openstack-charmers-next/glance num_units: 1 options: - openstack-origin: distro + openstack-origin: *openstack-origin keystone: charm: cs:~openstack-charmers-next/keystone num_units: 1 options: - openstack-origin: distro + openstack-origin: *openstack-origin octavia-mysql-router: charm: cs:~openstack-charmers-next/mysql-router keystone-mysql-router: @@ -119,7 +122,7 @@ applications: charm: cs:~openstack-charmers-next/neutron-api num_units: 1 options: - openstack-origin: distro + openstack-origin: *openstack-origin debug: True flat-network-providers: physnet1 enable-ml2-port-security: True @@ -127,7 +130,7 @@ applications: enable-dvr: True manage-neutron-plugin-legacy-mode: True neutron-openvswitch: - series: focal + series: *series charm: cs:~openstack-charmers-next/neutron-openvswitch num_units: 0 options: @@ -138,7 +141,7 @@ applications: firewall-driver: openvswitch bridge-mappings: physnet1:br-ex neutron-openvswitch-octavia: - series: focal + series: *series charm: cs:~openstack-charmers-next/neutron-openvswitch num_units: 0 options: @@ -150,7 +153,7 @@ applications: charm: cs:~openstack-charmers-next/nova-cloud-controller num_units: 1 options: - openstack-origin: distro + openstack-origin: *openstack-origin debug: True network-manager: Neutron nova-compute: @@ -158,18 +161,18 @@ applications: charm: cs:~openstack-charmers-next/nova-compute num_units: 2 options: - openstack-origin: distro + openstack-origin: *openstack-origin debug: True hacluster-octavia: charm: cs:~openstack-charmers-next/hacluster num_units: 0 octavia: constraints: cores=8 - series: focal + series: *series charm: ../../../octavia num_units: 3 options: - openstack-origin: distro + openstack-origin: *openstack-origin debug: True loadbalancer-topology: 'ACTIVE_STANDBY' vip: 'ADD YOUR VIP HERE' @@ -185,13 +188,13 @@ applications: charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' - retrofit-series: focal + retrofit-series: *series placement: charm: cs:~openstack-charmers-next/placement num_units: 1 constraints: mem=1G options: - openstack-origin: distro + openstack-origin: *openstack-origin debug: true vault: charm: cs:~openstack-charmers-next/vault diff --git a/src/tests/bundles/focal-victoria-ha-ovn.yaml b/src/tests/bundles/focal-victoria-ha-ovn.yaml index ac98cdb7..e365ad1f 100644 --- a/src/tests/bundles/focal-victoria-ha-ovn.yaml +++ b/src/tests/bundles/focal-victoria-ha-ovn.yaml @@ -1,4 +1,7 @@ -series: focal +variables: + openstack-origin: &openstack-origin cloud:focal-victoria + +series: &series focal relations: - - glance:image-service - nova-cloud-controller:image-service @@ -99,12 +102,12 @@ applications: charm: cs:~openstack-charmers-next/glance num_units: 1 options: - openstack-origin: cloud:focal-victoria + openstack-origin: *openstack-origin keystone: charm: cs:~openstack-charmers-next/keystone num_units: 1 options: - openstack-origin: cloud:focal-victoria + openstack-origin: *openstack-origin octavia-mysql-router: charm: cs:~openstack-charmers-next/mysql-router keystone-mysql-router: @@ -128,7 +131,7 @@ applications: charm: cs:~openstack-charmers-next/neutron-api num_units: 1 options: - openstack-origin: cloud:focal-victoria + openstack-origin: *openstack-origin debug: True flat-network-providers: physnet1 enable-ml2-port-security: True @@ -138,7 +141,7 @@ applications: charm: cs:~openstack-charmers-next/nova-cloud-controller num_units: 1 options: - openstack-origin: cloud:focal-victoria + openstack-origin: *openstack-origin debug: True network-manager: Neutron nova-compute: @@ -146,20 +149,20 @@ applications: charm: cs:~openstack-charmers-next/nova-compute num_units: 2 options: - openstack-origin: cloud:focal-victoria + openstack-origin: *openstack-origin debug: True hacluster-octavia: - series: focal + series: *series charm: cs:~openstack-charmers-next/hacluster ovn-chassis-octavia: charm: cs:~openstack-charmers-next/ovn-chassis octavia: constraints: cores=8 - series: focal + series: *series charm: ../../../octavia num_units: 3 options: - openstack-origin: cloud:focal-victoria + openstack-origin: *openstack-origin debug: True loadbalancer-topology: 'ACTIVE_STANDBY' rabbitmq-server: @@ -174,15 +177,14 @@ applications: charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' - retrofit-series: focal - # LP: #1928179 - # retrofit-uca-pocket: victoria + retrofit-series: *series + retrofit-uca-pocket: victoria placement: charm: cs:~openstack-charmers-next/placement num_units: 1 constraints: mem=1G options: - openstack-origin: cloud:focal-victoria + openstack-origin: *openstack-origin debug: true neutron-api-plugin-ovn: charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn @@ -191,7 +193,7 @@ applications: charm: cs:~openstack-charmers-next/ovn-central num_units: 3 options: - source: cloud:focal-victoria + source: *openstack-origin ovn-chassis: charm: cs:~openstack-charmers-next/ovn-chassis vault: diff --git a/src/tests/bundles/focal-victoria-ha.yaml b/src/tests/bundles/focal-victoria-ha.yaml index e5ad4197..fbd848fa 100644 --- a/src/tests/bundles/focal-victoria-ha.yaml +++ b/src/tests/bundles/focal-victoria-ha.yaml @@ -1,4 +1,7 @@ -series: focal +variables: + openstack-origin: &openstack-origin cloud:focal-victoria + +series: &series focal relations: - - glance:image-service - nova-cloud-controller:image-service @@ -91,12 +94,12 @@ applications: charm: cs:~openstack-charmers-next/glance num_units: 1 options: - openstack-origin: cloud:focal-victoria + openstack-origin: *openstack-origin keystone: charm: cs:~openstack-charmers-next/keystone num_units: 1 options: - openstack-origin: cloud:focal-victoria + openstack-origin: *openstack-origin octavia-mysql-router: charm: cs:~openstack-charmers-next/mysql-router keystone-mysql-router: @@ -119,7 +122,7 @@ applications: charm: cs:~openstack-charmers-next/neutron-api num_units: 1 options: - openstack-origin: cloud:focal-victoria + openstack-origin: *openstack-origin debug: True flat-network-providers: physnet1 enable-ml2-port-security: True @@ -127,7 +130,7 @@ applications: enable-dvr: True manage-neutron-plugin-legacy-mode: True neutron-openvswitch: - series: focal + series: *series charm: cs:~openstack-charmers-next/neutron-openvswitch num_units: 0 options: @@ -138,7 +141,7 @@ applications: firewall-driver: openvswitch bridge-mappings: physnet1:br-ex neutron-openvswitch-octavia: - series: focal + series: *series charm: cs:~openstack-charmers-next/neutron-openvswitch num_units: 0 options: @@ -150,7 +153,7 @@ applications: charm: cs:~openstack-charmers-next/nova-cloud-controller num_units: 1 options: - openstack-origin: cloud:focal-victoria + openstack-origin: *openstack-origin debug: True network-manager: Neutron nova-compute: @@ -158,18 +161,18 @@ applications: charm: cs:~openstack-charmers-next/nova-compute num_units: 2 options: - openstack-origin: cloud:focal-victoria + openstack-origin: *openstack-origin debug: True hacluster-octavia: charm: cs:~openstack-charmers-next/hacluster num_units: 0 octavia: constraints: cores=8 - series: focal + series: *series charm: ../../../octavia num_units: 3 options: - openstack-origin: cloud:focal-victoria + openstack-origin: *openstack-origin debug: True loadbalancer-topology: 'ACTIVE_STANDBY' vip: 'ADD YOUR VIP HERE' @@ -185,15 +188,14 @@ applications: charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' - retrofit-series: focal - # LP: #1928179 - # retrofit-uca-pocket: victoria + retrofit-series: *series + retrofit-uca-pocket: victoria placement: charm: cs:~openstack-charmers-next/placement num_units: 1 constraints: mem=1G options: - openstack-origin: cloud:focal-victoria + openstack-origin: *openstack-origin debug: true vault: charm: cs:~openstack-charmers-next/vault diff --git a/src/tests/bundles/focal-wallaby-ha-ovn.yaml b/src/tests/bundles/focal-wallaby-ha-ovn.yaml new file mode 100644 index 00000000..3c654711 --- /dev/null +++ b/src/tests/bundles/focal-wallaby-ha-ovn.yaml @@ -0,0 +1,201 @@ +variables: + openstack-origin: &openstack-origin cloud:focal-wallaby + +series: &series focal +relations: +- - glance:image-service + - nova-cloud-controller:image-service +- - glance:image-service + - nova-compute:image-service +- - glance-mysql-router:shared-db + - glance:shared-db +- - keystone-mysql-router:shared-db + - keystone:shared-db +- - neutron-mysql-router:shared-db + - neutron-api:shared-db +- - nova-mysql-router:shared-db + - nova-cloud-controller:shared-db +- - octavia-mysql-router:shared-db + - octavia:shared-db +- - keystone:identity-service + - glance:identity-service +- - keystone:identity-service + - nova-cloud-controller:identity-service +- - keystone:identity-service + - neutron-api:identity-service +- - keystone:identity-service + - octavia:identity-service +- - nova-compute:cloud-compute + - nova-cloud-controller:cloud-compute +- - rabbitmq-server:amqp + - neutron-api:amqp +- - rabbitmq-server:amqp + - glance:amqp +- - rabbitmq-server:amqp + - nova-cloud-controller:amqp +- - rabbitmq-server:amqp + - nova-compute:amqp +- - rabbitmq-server:amqp + - octavia:amqp +- - neutron-api:neutron-api + - nova-cloud-controller:neutron-api +- - neutron-api:neutron-load-balancer + - octavia:neutron-api +- - glance-simplestreams-sync:juju-info + - octavia-diskimage-retrofit:juju-info +- - keystone:identity-service + - glance-simplestreams-sync:identity-service +- - keystone:identity-credentials + - octavia-diskimage-retrofit:identity-credentials +- [ placement, placement-mysql-router ] +- [ placement, keystone ] +- [ placement, nova-cloud-controller ] +- - neutron-api-plugin-ovn:neutron-plugin + - neutron-api:neutron-plugin-api-subordinate +- - vault:shared-db + - vault-mysql-router:shared-db +- - ovn-central:certificates + - vault:certificates +- - ovn-central:ovsdb-cms + - neutron-api-plugin-ovn:ovsdb-cms +- - neutron-api:certificates + - vault:certificates +- - ovn-chassis:nova-compute + - nova-compute:neutron-plugin +- - ovn-chassis-octavia:ovsdb-subordinate + - octavia:ovsdb-subordinate +- - ovn-chassis-octavia:certificates + - vault:certificates +- - ovn-chassis-octavia:ovsdb + - ovn-central:ovsdb +- - ovn-central:ovsdb-cms + - octavia:ovsdb-cms +- - ovn-chassis:certificates + - vault:certificates +- - ovn-chassis:ovsdb + - ovn-central:ovsdb +- - vault:certificates + - neutron-api-plugin-ovn:certificates +- - vault:certificates + - glance:certificates +- - vault:certificates + - keystone:certificates +- - vault:certificates + - nova-cloud-controller:certificates +- - vault:certificates + - placement:certificates +- - vault:certificates + - octavia:certificates +- - vault:certificates + - glance-simplestreams-sync:certificates +- - hacluster-octavia:ha + - octavia:ha +- ["octavia-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["nova-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["glance-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["placement-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +applications: + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + options: + openstack-origin: *openstack-origin + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + octavia-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + nova-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + glance-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + neutron-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + placement-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + vault-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + mysql-innodb-cluster: + constraints: mem=3072M + charm: cs:~openstack-charmers-next/mysql-innodb-cluster + num_units: 3 + neutron-api: + constraints: cores=4 + charm: cs:~openstack-charmers-next/neutron-api + num_units: 1 + options: + openstack-origin: *openstack-origin + debug: True + flat-network-providers: physnet1 + enable-ml2-port-security: True + neutron-security-groups: True + nova-cloud-controller: + constraints: mem=7168M + charm: cs:~openstack-charmers-next/nova-cloud-controller + num_units: 1 + options: + openstack-origin: *openstack-origin + debug: True + network-manager: Neutron + nova-compute: + constraints: mem=7168M + charm: cs:~openstack-charmers-next/nova-compute + num_units: 2 + options: + openstack-origin: *openstack-origin + debug: True + hacluster-octavia: + series: *series + charm: cs:~openstack-charmers-next/hacluster + ovn-chassis-octavia: + charm: cs:~openstack-charmers-next/ovn-chassis + octavia: + constraints: cores=8 + series: *series + charm: ../../../octavia + num_units: 3 + options: + openstack-origin: *openstack-origin + debug: True + loadbalancer-topology: 'ACTIVE_STANDBY' + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + glance-simplestreams-sync: + charm: cs:~openstack-charmers-next/glance-simplestreams-sync + num_units: 1 + options: + use_swift: False + octavia-diskimage-retrofit: + charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit + options: + amp-image-tag: 'octavia-amphora' + retrofit-series: *series + retrofit-uca-pocket: wallaby + placement: + charm: cs:~openstack-charmers-next/placement + num_units: 1 + constraints: mem=1G + options: + openstack-origin: *openstack-origin + debug: true + neutron-api-plugin-ovn: + charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn + ovn-central: + constraints: mem=3072M + charm: cs:~openstack-charmers-next/ovn-central + num_units: 3 + options: + source: *openstack-origin + ovn-chassis: + charm: cs:~openstack-charmers-next/ovn-chassis + vault: + charm: cs:~openstack-charmers-next/vault + num_units: 1 diff --git a/src/tests/bundles/focal-wallaby-ha.yaml b/src/tests/bundles/focal-wallaby-ha.yaml new file mode 100644 index 00000000..172a654d --- /dev/null +++ b/src/tests/bundles/focal-wallaby-ha.yaml @@ -0,0 +1,202 @@ +variables: + openstack-origin: &openstack-origin cloud:focal-wallaby + +series: &series focal +relations: +- - glance:image-service + - nova-cloud-controller:image-service +- - glance:image-service + - nova-compute:image-service +- - glance-mysql-router:shared-db + - glance:shared-db +- - keystone-mysql-router:shared-db + - keystone:shared-db +- - neutron-mysql-router:shared-db + - neutron-api:shared-db +- - nova-mysql-router:shared-db + - nova-cloud-controller:shared-db +- - octavia-mysql-router:shared-db + - octavia:shared-db +- - keystone:identity-service + - glance:identity-service +- - keystone:identity-service + - nova-cloud-controller:identity-service +- - keystone:identity-service + - neutron-api:identity-service +- - keystone:identity-service + - octavia:identity-service +- - nova-compute:cloud-compute + - nova-cloud-controller:cloud-compute +- - rabbitmq-server:amqp + - neutron-api:amqp +- - rabbitmq-server:amqp + - glance:amqp +- - rabbitmq-server:amqp + - nova-cloud-controller:amqp +- - rabbitmq-server:amqp + - nova-compute:amqp +- - rabbitmq-server:amqp + - octavia:amqp +- - neutron-api:neutron-api + - nova-cloud-controller:neutron-api +- - neutron-api:neutron-load-balancer + - octavia:neutron-api +- - rabbitmq-server:amqp + - neutron-openvswitch:amqp +- - neutron-api:neutron-plugin-api + - neutron-openvswitch:neutron-plugin-api +- - neutron-openvswitch:neutron-plugin + - nova-compute:neutron-plugin +- - rabbitmq-server:amqp + - neutron-openvswitch-octavia:amqp +- - neutron-api:neutron-plugin-api + - neutron-openvswitch-octavia:neutron-plugin-api +- - neutron-openvswitch-octavia:neutron-plugin + - octavia:neutron-openvswitch +- - hacluster-octavia:ha + - octavia:ha +- - glance-simplestreams-sync:juju-info + - octavia-diskimage-retrofit:juju-info +- - keystone:identity-service + - glance-simplestreams-sync:identity-service +- - keystone:identity-credentials + - octavia-diskimage-retrofit:identity-credentials +- [ placement, placement-mysql-router ] +- [ placement, keystone ] +- [ placement, nova-cloud-controller ] +- - vault:shared-db + - vault-mysql-router:shared-db +- - vault:certificates + - glance:certificates +- - vault:certificates + - keystone:certificates +- - vault:certificates + - neutron-api:certificates +- - vault:certificates + - nova-cloud-controller:certificates +- - vault:certificates + - octavia:certificates +- - vault:certificates + - octavia-diskimage-retrofit:certificates +- - vault:certificates + - glance-simplestreams-sync:certificates +- - vault:certificates + - placement:certificates +- ["octavia-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["nova-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["glance-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["placement-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +applications: + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + options: + openstack-origin: *openstack-origin + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + octavia-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + nova-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + glance-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + neutron-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + placement-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + vault-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + mysql-innodb-cluster: + constraints: mem=3072M + charm: cs:~openstack-charmers-next/mysql-innodb-cluster + num_units: 3 + neutron-api: + charm: cs:~openstack-charmers-next/neutron-api + num_units: 1 + options: + openstack-origin: *openstack-origin + debug: True + flat-network-providers: physnet1 + enable-ml2-port-security: True + neutron-security-groups: True + enable-dvr: True + manage-neutron-plugin-legacy-mode: True + neutron-openvswitch: + series: *series + charm: cs:~openstack-charmers-next/neutron-openvswitch + num_units: 0 + options: + debug: True + enable-local-dhcp-and-metadata: True + use-dvr-snat: True + prevent-arp-spoofing: False + firewall-driver: openvswitch + bridge-mappings: physnet1:br-ex + neutron-openvswitch-octavia: + series: *series + charm: cs:~openstack-charmers-next/neutron-openvswitch + num_units: 0 + options: + debug: True + prevent-arp-spoofing: False + firewall-driver: openvswitch + nova-cloud-controller: + constraints: mem=7168M + charm: cs:~openstack-charmers-next/nova-cloud-controller + num_units: 1 + options: + openstack-origin: *openstack-origin + debug: True + network-manager: Neutron + nova-compute: + constraints: mem=7168M + charm: cs:~openstack-charmers-next/nova-compute + num_units: 2 + options: + openstack-origin: *openstack-origin + debug: True + hacluster-octavia: + charm: cs:~openstack-charmers-next/hacluster + num_units: 0 + octavia: + constraints: cores=8 + series: *series + charm: ../../../octavia + num_units: 3 + options: + openstack-origin: *openstack-origin + debug: True + loadbalancer-topology: 'ACTIVE_STANDBY' + vip: 'ADD YOUR VIP HERE' + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + glance-simplestreams-sync: + charm: cs:~openstack-charmers-next/glance-simplestreams-sync + num_units: 1 + options: + use_swift: False + octavia-diskimage-retrofit: + charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit + options: + amp-image-tag: 'octavia-amphora' + retrofit-series: *series + retrofit-uca-pocket: wallaby + placement: + charm: cs:~openstack-charmers-next/placement + num_units: 1 + constraints: mem=1G + options: + openstack-origin: *openstack-origin + debug: true + vault: + charm: cs:~openstack-charmers-next/vault + num_units: 1 diff --git a/src/tests/bundles/groovy-victoria-ha-ovn.yaml b/src/tests/bundles/groovy-victoria-ha-ovn.yaml index 25f9d317..acac9049 100644 --- a/src/tests/bundles/groovy-victoria-ha-ovn.yaml +++ b/src/tests/bundles/groovy-victoria-ha-ovn.yaml @@ -1,4 +1,7 @@ -series: groovy +variables: + openstack-origin: &openstack-origin distro + +series: &series groovy relations: - - glance:image-service - nova-cloud-controller:image-service @@ -99,12 +102,12 @@ applications: charm: cs:~openstack-charmers-next/glance num_units: 1 options: - openstack-origin: distro + openstack-origin: *openstack-origin keystone: charm: cs:~openstack-charmers-next/keystone num_units: 1 options: - openstack-origin: distro + openstack-origin: *openstack-origin octavia-mysql-router: charm: cs:~openstack-charmers-next/mysql-router keystone-mysql-router: @@ -128,7 +131,7 @@ applications: charm: cs:~openstack-charmers-next/neutron-api num_units: 1 options: - openstack-origin: distro + openstack-origin: *openstack-origin debug: True flat-network-providers: physnet1 enable-ml2-port-security: True @@ -138,7 +141,7 @@ applications: charm: cs:~openstack-charmers-next/nova-cloud-controller num_units: 1 options: - openstack-origin: distro + openstack-origin: *openstack-origin debug: True network-manager: Neutron nova-compute: @@ -146,20 +149,20 @@ applications: charm: cs:~openstack-charmers-next/nova-compute num_units: 2 options: - openstack-origin: distro + openstack-origin: *openstack-origin debug: True hacluster-octavia: - series: groovy + series: *series charm: cs:~openstack-charmers-next/hacluster ovn-chassis-octavia: charm: cs:~openstack-charmers-next/ovn-chassis octavia: constraints: cores=8 - series: groovy + series: *series charm: ../../../octavia num_units: 3 options: - openstack-origin: distro + openstack-origin: *openstack-origin debug: True loadbalancer-topology: 'ACTIVE_STANDBY' rabbitmq-server: @@ -170,19 +173,24 @@ applications: num_units: 1 options: use_swift: False + mirror_list: "[{url: 'http://cloud-images.ubuntu.com/releases/', + name_prefix: 'ubuntu:released', + path: 'streams/v1/index.sjson', max: 1, + item_filters: [ + 'release~(bionic|focal|groovy)', + 'arch~(x86_64|amd64)', + 'ftype~(disk1.img|disk.img)']}]" octavia-diskimage-retrofit: charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' - # LP: #1928179 - # retrofit-series: groovy - retrofit-series: focal + retrofit-series: *series placement: charm: cs:~openstack-charmers-next/placement num_units: 1 constraints: mem=1G options: - openstack-origin: distro + openstack-origin: *openstack-origin debug: true neutron-api-plugin-ovn: charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn @@ -191,7 +199,7 @@ applications: charm: cs:~openstack-charmers-next/ovn-central num_units: 3 options: - source: distro + source: *openstack-origin ovn-chassis: charm: cs:~openstack-charmers-next/ovn-chassis vault: diff --git a/src/tests/bundles/groovy-victoria-ha.yaml b/src/tests/bundles/groovy-victoria-ha.yaml index e6344377..05cd36da 100644 --- a/src/tests/bundles/groovy-victoria-ha.yaml +++ b/src/tests/bundles/groovy-victoria-ha.yaml @@ -1,4 +1,7 @@ -series: groovy +variables: + openstack-origin: &openstack-origin distro + +series: &series groovy relations: - - glance:image-service - nova-cloud-controller:image-service @@ -91,12 +94,12 @@ applications: charm: cs:~openstack-charmers-next/glance num_units: 1 options: - openstack-origin: distro + openstack-origin: *openstack-origin keystone: charm: cs:~openstack-charmers-next/keystone num_units: 1 options: - openstack-origin: distro + openstack-origin: *openstack-origin octavia-mysql-router: charm: cs:~openstack-charmers-next/mysql-router keystone-mysql-router: @@ -119,7 +122,7 @@ applications: charm: cs:~openstack-charmers-next/neutron-api num_units: 1 options: - openstack-origin: distro + openstack-origin: *openstack-origin debug: True flat-network-providers: physnet1 enable-ml2-port-security: True @@ -127,7 +130,7 @@ applications: enable-dvr: True manage-neutron-plugin-legacy-mode: True neutron-openvswitch: - series: groovy + series: *series charm: cs:~openstack-charmers-next/neutron-openvswitch num_units: 0 options: @@ -138,7 +141,7 @@ applications: firewall-driver: openvswitch bridge-mappings: physnet1:br-ex neutron-openvswitch-octavia: - series: groovy + series: *series charm: cs:~openstack-charmers-next/neutron-openvswitch num_units: 0 options: @@ -150,7 +153,7 @@ applications: charm: cs:~openstack-charmers-next/nova-cloud-controller num_units: 1 options: - openstack-origin: distro + openstack-origin: *openstack-origin debug: True network-manager: Neutron nova-compute: @@ -158,18 +161,18 @@ applications: charm: cs:~openstack-charmers-next/nova-compute num_units: 2 options: - openstack-origin: distro + openstack-origin: *openstack-origin debug: True hacluster-octavia: charm: cs:~openstack-charmers-next/hacluster num_units: 0 octavia: constraints: cores=8 - series: groovy + series: *series charm: ../../../octavia num_units: 3 options: - openstack-origin: distro + openstack-origin: *openstack-origin debug: True loadbalancer-topology: 'ACTIVE_STANDBY' vip: 'ADD YOUR VIP HERE' @@ -181,19 +184,24 @@ applications: num_units: 1 options: use_swift: False + mirror_list: "[{url: 'http://cloud-images.ubuntu.com/releases/', + name_prefix: 'ubuntu:released', + path: 'streams/v1/index.sjson', max: 1, + item_filters: [ + 'release~(bionic|focal|groovy)', + 'arch~(x86_64|amd64)', + 'ftype~(disk1.img|disk.img)']}]" octavia-diskimage-retrofit: charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' - # LP: #1928179 - # retrofit-series: groovy - retrofit-series: focal + retrofit-series: *series placement: charm: cs:~openstack-charmers-next/placement num_units: 1 constraints: mem=1G options: - openstack-origin: distro + openstack-origin: *openstack-origin debug: true vault: charm: cs:~openstack-charmers-next/vault diff --git a/src/tests/bundles/hirsute-wallaby-ha-ovn.yaml b/src/tests/bundles/hirsute-wallaby-ha-ovn.yaml new file mode 100644 index 00000000..42b4d1a6 --- /dev/null +++ b/src/tests/bundles/hirsute-wallaby-ha-ovn.yaml @@ -0,0 +1,207 @@ +variables: + openstack-origin: &openstack-origin distro + +series: &series hirsute +relations: +- - glance:image-service + - nova-cloud-controller:image-service +- - glance:image-service + - nova-compute:image-service +- - glance-mysql-router:shared-db + - glance:shared-db +- - keystone-mysql-router:shared-db + - keystone:shared-db +- - neutron-mysql-router:shared-db + - neutron-api:shared-db +- - nova-mysql-router:shared-db + - nova-cloud-controller:shared-db +- - octavia-mysql-router:shared-db + - octavia:shared-db +- - keystone:identity-service + - glance:identity-service +- - keystone:identity-service + - nova-cloud-controller:identity-service +- - keystone:identity-service + - neutron-api:identity-service +- - keystone:identity-service + - octavia:identity-service +- - nova-compute:cloud-compute + - nova-cloud-controller:cloud-compute +- - rabbitmq-server:amqp + - neutron-api:amqp +- - rabbitmq-server:amqp + - glance:amqp +- - rabbitmq-server:amqp + - nova-cloud-controller:amqp +- - rabbitmq-server:amqp + - nova-compute:amqp +- - rabbitmq-server:amqp + - octavia:amqp +- - neutron-api:neutron-api + - nova-cloud-controller:neutron-api +- - neutron-api:neutron-load-balancer + - octavia:neutron-api +- - glance-simplestreams-sync:juju-info + - octavia-diskimage-retrofit:juju-info +- - keystone:identity-service + - glance-simplestreams-sync:identity-service +- - keystone:identity-credentials + - octavia-diskimage-retrofit:identity-credentials +- [ placement, placement-mysql-router ] +- [ placement, keystone ] +- [ placement, nova-cloud-controller ] +- - neutron-api-plugin-ovn:neutron-plugin + - neutron-api:neutron-plugin-api-subordinate +- - vault:shared-db + - vault-mysql-router:shared-db +- - ovn-central:certificates + - vault:certificates +- - ovn-central:ovsdb-cms + - neutron-api-plugin-ovn:ovsdb-cms +- - neutron-api:certificates + - vault:certificates +- - ovn-chassis:nova-compute + - nova-compute:neutron-plugin +- - ovn-chassis-octavia:ovsdb-subordinate + - octavia:ovsdb-subordinate +- - ovn-chassis-octavia:certificates + - vault:certificates +- - ovn-chassis-octavia:ovsdb + - ovn-central:ovsdb +- - ovn-central:ovsdb-cms + - octavia:ovsdb-cms +- - ovn-chassis:certificates + - vault:certificates +- - ovn-chassis:ovsdb + - ovn-central:ovsdb +- - vault:certificates + - neutron-api-plugin-ovn:certificates +- - vault:certificates + - glance:certificates +- - vault:certificates + - keystone:certificates +- - vault:certificates + - nova-cloud-controller:certificates +- - vault:certificates + - placement:certificates +- - vault:certificates + - octavia:certificates +- - vault:certificates + - glance-simplestreams-sync:certificates +- - hacluster-octavia:ha + - octavia:ha +- ["octavia-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["nova-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["glance-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["placement-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +applications: + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + options: + openstack-origin: *openstack-origin + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + octavia-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + nova-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + glance-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + neutron-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + placement-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + vault-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + mysql-innodb-cluster: + constraints: mem=3072M + charm: cs:~openstack-charmers-next/mysql-innodb-cluster + num_units: 3 + neutron-api: + constraints: cores=4 + charm: cs:~openstack-charmers-next/neutron-api + num_units: 1 + options: + openstack-origin: *openstack-origin + debug: True + flat-network-providers: physnet1 + enable-ml2-port-security: True + neutron-security-groups: True + nova-cloud-controller: + constraints: mem=7168M + charm: cs:~openstack-charmers-next/nova-cloud-controller + num_units: 1 + options: + openstack-origin: *openstack-origin + debug: True + network-manager: Neutron + nova-compute: + constraints: mem=7168M + charm: cs:~openstack-charmers-next/nova-compute + num_units: 2 + options: + openstack-origin: *openstack-origin + debug: True + hacluster-octavia: + series: *series + charm: cs:~openstack-charmers-next/hacluster + ovn-chassis-octavia: + charm: cs:~openstack-charmers-next/ovn-chassis + octavia: + constraints: cores=8 + series: *series + charm: ../../../octavia + num_units: 3 + options: + openstack-origin: *openstack-origin + debug: True + loadbalancer-topology: 'ACTIVE_STANDBY' + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + glance-simplestreams-sync: + charm: cs:~openstack-charmers-next/glance-simplestreams-sync + num_units: 1 + options: + use_swift: False + mirror_list: "[{url: 'http://cloud-images.ubuntu.com/releases/', + name_prefix: 'ubuntu:released', + path: 'streams/v1/index.sjson', max: 1, + item_filters: [ + 'release~(bionic|focal|hirsute)', + 'arch~(x86_64|amd64)', + 'ftype~(disk1.img|disk.img)']}]" + octavia-diskimage-retrofit: + charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit + options: + amp-image-tag: 'octavia-amphora' + retrofit-series: *series + placement: + charm: cs:~openstack-charmers-next/placement + num_units: 1 + constraints: mem=1G + options: + openstack-origin: *openstack-origin + debug: true + neutron-api-plugin-ovn: + charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn + ovn-central: + constraints: mem=3072M + charm: cs:~openstack-charmers-next/ovn-central + num_units: 3 + options: + source: *openstack-origin + ovn-chassis: + charm: cs:~openstack-charmers-next/ovn-chassis + vault: + charm: cs:~openstack-charmers-next/vault + num_units: 1 diff --git a/src/tests/bundles/hirsute-wallaby-ha.yaml b/src/tests/bundles/hirsute-wallaby-ha.yaml new file mode 100644 index 00000000..05f2d17f --- /dev/null +++ b/src/tests/bundles/hirsute-wallaby-ha.yaml @@ -0,0 +1,208 @@ +variables: + openstack-origin: &openstack-origin distro + +series: &series hirsute +relations: +- - glance:image-service + - nova-cloud-controller:image-service +- - glance:image-service + - nova-compute:image-service +- - glance-mysql-router:shared-db + - glance:shared-db +- - keystone-mysql-router:shared-db + - keystone:shared-db +- - neutron-mysql-router:shared-db + - neutron-api:shared-db +- - nova-mysql-router:shared-db + - nova-cloud-controller:shared-db +- - octavia-mysql-router:shared-db + - octavia:shared-db +- - keystone:identity-service + - glance:identity-service +- - keystone:identity-service + - nova-cloud-controller:identity-service +- - keystone:identity-service + - neutron-api:identity-service +- - keystone:identity-service + - octavia:identity-service +- - nova-compute:cloud-compute + - nova-cloud-controller:cloud-compute +- - rabbitmq-server:amqp + - neutron-api:amqp +- - rabbitmq-server:amqp + - glance:amqp +- - rabbitmq-server:amqp + - nova-cloud-controller:amqp +- - rabbitmq-server:amqp + - nova-compute:amqp +- - rabbitmq-server:amqp + - octavia:amqp +- - neutron-api:neutron-api + - nova-cloud-controller:neutron-api +- - neutron-api:neutron-load-balancer + - octavia:neutron-api +- - rabbitmq-server:amqp + - neutron-openvswitch:amqp +- - neutron-api:neutron-plugin-api + - neutron-openvswitch:neutron-plugin-api +- - neutron-openvswitch:neutron-plugin + - nova-compute:neutron-plugin +- - rabbitmq-server:amqp + - neutron-openvswitch-octavia:amqp +- - neutron-api:neutron-plugin-api + - neutron-openvswitch-octavia:neutron-plugin-api +- - neutron-openvswitch-octavia:neutron-plugin + - octavia:neutron-openvswitch +- - hacluster-octavia:ha + - octavia:ha +- - glance-simplestreams-sync:juju-info + - octavia-diskimage-retrofit:juju-info +- - keystone:identity-service + - glance-simplestreams-sync:identity-service +- - keystone:identity-credentials + - octavia-diskimage-retrofit:identity-credentials +- [ placement, placement-mysql-router ] +- [ placement, keystone ] +- [ placement, nova-cloud-controller ] +- - vault:shared-db + - vault-mysql-router:shared-db +- - vault:certificates + - glance:certificates +- - vault:certificates + - keystone:certificates +- - vault:certificates + - neutron-api:certificates +- - vault:certificates + - nova-cloud-controller:certificates +- - vault:certificates + - octavia:certificates +- - vault:certificates + - octavia-diskimage-retrofit:certificates +- - vault:certificates + - glance-simplestreams-sync:certificates +- - vault:certificates + - placement:certificates +- ["octavia-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["nova-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["glance-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["placement-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +applications: + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + options: + openstack-origin: *openstack-origin + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + octavia-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + nova-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + glance-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + neutron-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + placement-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + vault-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + mysql-innodb-cluster: + constraints: mem=3072M + charm: cs:~openstack-charmers-next/mysql-innodb-cluster + num_units: 3 + neutron-api: + charm: cs:~openstack-charmers-next/neutron-api + num_units: 1 + options: + openstack-origin: *openstack-origin + debug: True + flat-network-providers: physnet1 + enable-ml2-port-security: True + neutron-security-groups: True + enable-dvr: True + manage-neutron-plugin-legacy-mode: True + neutron-openvswitch: + series: *series + charm: cs:~openstack-charmers-next/neutron-openvswitch + num_units: 0 + options: + debug: True + enable-local-dhcp-and-metadata: True + use-dvr-snat: True + prevent-arp-spoofing: False + firewall-driver: openvswitch + bridge-mappings: physnet1:br-ex + neutron-openvswitch-octavia: + series: *series + charm: cs:~openstack-charmers-next/neutron-openvswitch + num_units: 0 + options: + debug: True + prevent-arp-spoofing: False + firewall-driver: openvswitch + nova-cloud-controller: + constraints: mem=7168M + charm: cs:~openstack-charmers-next/nova-cloud-controller + num_units: 1 + options: + openstack-origin: *openstack-origin + debug: True + network-manager: Neutron + nova-compute: + constraints: mem=7168M + charm: cs:~openstack-charmers-next/nova-compute + num_units: 2 + options: + openstack-origin: *openstack-origin + debug: True + hacluster-octavia: + charm: cs:~openstack-charmers-next/hacluster + num_units: 0 + octavia: + constraints: cores=8 + series: *series + charm: ../../../octavia + num_units: 3 + options: + openstack-origin: *openstack-origin + debug: True + loadbalancer-topology: 'ACTIVE_STANDBY' + vip: 'ADD YOUR VIP HERE' + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + glance-simplestreams-sync: + charm: cs:~openstack-charmers-next/glance-simplestreams-sync + num_units: 1 + options: + use_swift: False + mirror_list: "[{url: 'http://cloud-images.ubuntu.com/releases/', + name_prefix: 'ubuntu:released', + path: 'streams/v1/index.sjson', max: 1, + item_filters: [ + 'release~(bionic|focal|hirsute)', + 'arch~(x86_64|amd64)', + 'ftype~(disk1.img|disk.img)']}]" + octavia-diskimage-retrofit: + charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit + options: + amp-image-tag: 'octavia-amphora' + retrofit-series: *series + placement: + charm: cs:~openstack-charmers-next/placement + num_units: 1 + constraints: mem=1G + options: + openstack-origin: *openstack-origin + debug: true + vault: + charm: cs:~openstack-charmers-next/vault + num_units: 1 diff --git a/src/tests/bundles/overlays/bionic-rocky-ha.yaml.j2 b/src/tests/bundles/overlays/bionic-rocky-ha.yaml.j2 deleted file mode 120000 index b6c086c1..00000000 --- a/src/tests/bundles/overlays/bionic-rocky-ha.yaml.j2 +++ /dev/null @@ -1 +0,0 @@ -ha.j2 \ No newline at end of file diff --git a/src/tests/bundles/overlays/bionic-rocky-lxd.yaml.j2 b/src/tests/bundles/overlays/bionic-rocky-lxd.yaml.j2 deleted file mode 120000 index b6c086c1..00000000 --- a/src/tests/bundles/overlays/bionic-rocky-lxd.yaml.j2 +++ /dev/null @@ -1 +0,0 @@ -ha.j2 \ No newline at end of file diff --git a/src/tests/bundles/overlays/bionic-stein-ha.yaml.j2 b/src/tests/bundles/overlays/bionic-stein-ha.yaml.j2 deleted file mode 120000 index b6c086c1..00000000 --- a/src/tests/bundles/overlays/bionic-stein-ha.yaml.j2 +++ /dev/null @@ -1 +0,0 @@ -ha.j2 \ No newline at end of file diff --git a/src/tests/bundles/overlays/bionic-train-ha-ovn.yaml.j2 b/src/tests/bundles/overlays/bionic-train-ha-ovn.yaml.j2 deleted file mode 120000 index b6c086c1..00000000 --- a/src/tests/bundles/overlays/bionic-train-ha-ovn.yaml.j2 +++ /dev/null @@ -1 +0,0 @@ -ha.j2 \ No newline at end of file diff --git a/src/tests/bundles/overlays/bionic-train-ha.yaml.j2 b/src/tests/bundles/overlays/bionic-train-ha.yaml.j2 deleted file mode 120000 index b6c086c1..00000000 --- a/src/tests/bundles/overlays/bionic-train-ha.yaml.j2 +++ /dev/null @@ -1 +0,0 @@ -ha.j2 \ No newline at end of file diff --git a/src/tests/bundles/overlays/bionic-ussuri-ha-ovn.yaml.j2 b/src/tests/bundles/overlays/bionic-ussuri-ha-ovn.yaml.j2 deleted file mode 120000 index b6c086c1..00000000 --- a/src/tests/bundles/overlays/bionic-ussuri-ha-ovn.yaml.j2 +++ /dev/null @@ -1 +0,0 @@ -ha.j2 \ No newline at end of file diff --git a/src/tests/bundles/overlays/bionic-ussuri-ha.yaml.j2 b/src/tests/bundles/overlays/bionic-ussuri-ha.yaml.j2 deleted file mode 120000 index b6c086c1..00000000 --- a/src/tests/bundles/overlays/bionic-ussuri-ha.yaml.j2 +++ /dev/null @@ -1 +0,0 @@ -ha.j2 \ No newline at end of file diff --git a/src/tests/bundles/overlays/focal-ussuri-ha-ovn.yaml.j2 b/src/tests/bundles/overlays/focal-ussuri-ha-ovn.yaml.j2 deleted file mode 120000 index b6c086c1..00000000 --- a/src/tests/bundles/overlays/focal-ussuri-ha-ovn.yaml.j2 +++ /dev/null @@ -1 +0,0 @@ -ha.j2 \ No newline at end of file diff --git a/src/tests/bundles/overlays/focal-ussuri-ha.yaml.j2 b/src/tests/bundles/overlays/focal-ussuri-ha.yaml.j2 deleted file mode 120000 index b6c086c1..00000000 --- a/src/tests/bundles/overlays/focal-ussuri-ha.yaml.j2 +++ /dev/null @@ -1 +0,0 @@ -ha.j2 \ No newline at end of file diff --git a/src/tests/bundles/overlays/focal-victoria-ha-ovn.yaml.j2 b/src/tests/bundles/overlays/focal-victoria-ha-ovn.yaml.j2 deleted file mode 120000 index b6c086c1..00000000 --- a/src/tests/bundles/overlays/focal-victoria-ha-ovn.yaml.j2 +++ /dev/null @@ -1 +0,0 @@ -ha.j2 \ No newline at end of file diff --git a/src/tests/bundles/overlays/focal-victoria-ha.yaml.j2 b/src/tests/bundles/overlays/focal-victoria-ha.yaml.j2 deleted file mode 120000 index b6c086c1..00000000 --- a/src/tests/bundles/overlays/focal-victoria-ha.yaml.j2 +++ /dev/null @@ -1 +0,0 @@ -ha.j2 \ No newline at end of file diff --git a/src/tests/bundles/overlays/groovy-victoria-ha-ovn.yaml.j2 b/src/tests/bundles/overlays/groovy-victoria-ha-ovn.yaml.j2 deleted file mode 120000 index b6c086c1..00000000 --- a/src/tests/bundles/overlays/groovy-victoria-ha-ovn.yaml.j2 +++ /dev/null @@ -1 +0,0 @@ -ha.j2 \ No newline at end of file diff --git a/src/tests/bundles/overlays/groovy-victoria-ha.yaml.j2 b/src/tests/bundles/overlays/groovy-victoria-ha.yaml.j2 deleted file mode 120000 index b6c086c1..00000000 --- a/src/tests/bundles/overlays/groovy-victoria-ha.yaml.j2 +++ /dev/null @@ -1 +0,0 @@ -ha.j2 \ No newline at end of file diff --git a/src/tests/bundles/overlays/ha.j2 b/src/tests/bundles/overlays/local-charm-overlay.yaml.j2 similarity index 100% rename from src/tests/bundles/overlays/ha.j2 rename to src/tests/bundles/overlays/local-charm-overlay.yaml.j2 diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 5890bf5a..4971fb45 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,11 +1,11 @@ charm_name: octavia + gate_bundles: - bionic-rocky-ha - bionic-stein-ha - bionic-train-ha-ovn - bionic-train-ha -# Awaiting SRU in LP: #1924981 to complete -# - bionic-ussuri-ha-ovn +- bionic-ussuri-ha-ovn - bionic-ussuri-ha - focal-ussuri-ha-ovn - focal-ussuri-ha @@ -13,15 +13,22 @@ gate_bundles: - focal-victoria-ha - groovy-victoria-ha-ovn - groovy-victoria-ha +- focal-wallaby-ha-ovn +- focal-wallaby-ha +- hirsute-wallaby-ha-ovn +- hirsute-wallaby-ha + smoke_bundles: - focal-ussuri-ha-ovn - focal-ussuri-ha + comment: | The `bionic-rocky-lxd` bundle currently fails due to a bug in LXD. https://github.com/lxc/lxd/issues/4947 dev_bundles: - bionic-rocky-ha - bionic-rocky-lxd + target_deploy_status: octavia: workload-status: blocked @@ -44,6 +51,7 @@ target_deploy_status: ovn-chassis-octavia: workload-status: waiting workload-status-message: "'certificates' awaiting server certificate data" + configure: - zaza.openstack.charm_tests.vault.setup.auto_initialize - zaza.openstack.charm_tests.glance_simplestreams_sync.setup.sync_images @@ -54,13 +62,17 @@ configure: - zaza.openstack.charm_tests.nova.setup.manage_ssh_key - zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network - zaza.openstack.charm_tests.octavia.setup.centralized_fip_network + tests: - zaza.openstack.charm_tests.octavia.tests.LBAASv2Test - zaza.openstack.charm_tests.octavia.tests.CharmOperationTest - zaza.openstack.charm_tests.policyd.tests.OctaviaTests + tests_options: policyd: service: octavia force_deploy: - groovy-victoria-ha-ovn - groovy-victoria-ha + - hirsute-wallaby-ha-ovn + - hirsute-wallaby-ha