diff --git a/.zuul.yaml b/.zuul.yaml index 0eed1965..7ffc71cb 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,4 +1,4 @@ - project: templates: - - openstack-python3-ussuri-jobs + - openstack-python3-charm-yoga-jobs - openstack-cover-jobs diff --git a/build-requirements.txt b/build-requirements.txt new file mode 100644 index 00000000..b6d2452f --- /dev/null +++ b/build-requirements.txt @@ -0,0 +1,7 @@ +# NOTES(lourot): +# * We don't install charmcraft via pip anymore because it anyway spins up a +# container and scp the system's charmcraft snap inside it. So the charmcraft +# snap is necessary on the system anyway. +# * `tox -e build` successfully validated with charmcraft 1.2.1 + +cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35. diff --git a/charmcraft.yaml b/charmcraft.yaml new file mode 100644 index 00000000..6ed5340a --- /dev/null +++ b/charmcraft.yaml @@ -0,0 +1,47 @@ +type: charm + +parts: + charm: + build-packages: + - tox + - git + - python3-dev + - libffi-dev + - libssl-dev + override-build: | + apt-get install ca-certificates -y + tox -e build-reactive + override-stage: | + echo "Copying charm to staging area: $CHARMCRAFT_STAGE" + NAME=$(ls $CHARMCRAFT_PART_BUILD/build/builds) + cp -r $CHARMCRAFT_PART_BUILD/build/builds/$NAME/* $CHARMCRAFT_STAGE/ + override-prime: | + # For some reason, the normal priming chokes on the fact that there's a + # hooks directory. + cp -r $CHARMCRAFT_STAGE/* . + +bases: + - name: ubuntu + channel: "20.04" + architectures: [amd64] + - name: ubuntu + channel: "20.04" + architectures: [arm64] + - name: ubuntu + channel: "20.04" + architectures: [ppc64el] + - name: ubuntu + channel: "20.04" + architectures: [s390x] + - name: ubuntu + channel: "22.04" + architectures: [amd64] + - name: ubuntu + channel: "22.04" + architectures: [arm64] + - name: ubuntu + channel: "22.04" + architectures: [ppc64el] + - name: ubuntu + channel: "22.04" + architectures: [s390x] diff --git a/metadata.yaml b/metadata.yaml new file mode 120000 index 00000000..07686838 --- /dev/null +++ b/metadata.yaml @@ -0,0 +1 @@ +src/metadata.yaml \ No newline at end of file diff --git a/osci.yaml b/osci.yaml index 7d82c4c8..d3f251f5 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,170 +1,84 @@ - project: templates: - - charm-yoga-unit-jobs + - charm-unit-jobs-py38 + - charm-unit-jobs-py39 check: jobs: - - charm-build - - bionic-stein-ha - - bionic-train-ha-ovn - - bionic-train-ha - - bionic-ussuri-ha-ovn - - bionic-ussuri-ha - - focal-ussuri-ha-ovn - - focal-ussuri-ha - - focal-victoria-ha-ovn - - focal-victoria-ha - - focal-victoria-no-amphora - - 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-xena-ha + - focal-xena-ha-ovn + - focal-yoga-ha: voting: false - - focal-wallaby-ha - - focal-xena-ha: + - focal-yoga-ha-ovn: voting: false - - focal-xena-ha-ovn: - voting: false - # LP: #1913024 is fixed for bionic and focal, but not for hirsute/wallaby - - hirsute-wallaby-ha-ovn: - voting: false - - hirsute-wallaby-ha - impish-xena-ha: voting: false - impish-xena-ha-ovn: voting: false + - jammy-yoga-ha: + voting: false + - jammy-yoga-ha-ovn: + voting: false vars: needs_charm_build: true charm_build_name: octavia + build_type: charmcraft -- job: - name: bionic-stein-ha - parent: func-target - 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: &lint-jobs - - osci-lint - - tox-py36 - - tox-py38 - - tox-py39 - - charm-build - vars: - tox_extra_args: bionic-train-ha-ovn -- job: - name: bionic-train-ha - parent: func-target - dependencies: *smoke-jobs - vars: - tox_extra_args: bionic-train-ha -- job: - name: bionic-ussuri-ha-ovn - parent: func-target - dependencies: *lint-jobs - vars: - tox_extra_args: bionic-ussuri-ha-ovn -- job: - name: bionic-ussuri-ha - parent: func-target - dependencies: *smoke-jobs - vars: - tox_extra_args: bionic-ussuri-ha -- job: - name: focal-ussuri-ha-ovn - parent: func-target - dependencies: *lint-jobs - vars: - tox_extra_args: focal-ussuri-ha-ovn -- job: - name: focal-ussuri-ha - parent: func-target - dependencies: *smoke-jobs - vars: - tox_extra_args: focal-ussuri-ha -- job: - name: focal-victoria-ha-ovn - parent: func-target - dependencies: *lint-jobs - vars: - tox_extra_args: focal-victoria-ha-ovn -- job: - name: focal-victoria-ha - parent: func-target - dependencies: *smoke-jobs - vars: - tox_extra_args: focal-victoria-ha -- job: - name: focal-victoria-no-amphora - parent: func-target - dependencies: *lint-jobs - vars: - tox_extra_args: focal-victoria-no-amphora -- job: - name: groovy-victoria-ha-ovn - parent: func-target - dependencies: *lint-jobs - vars: - tox_extra_args: groovy-victoria-ha-ovn -- job: - name: groovy-victoria-ha - parent: func-target - 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-xena-ha-ovn - parent: func-target - dependencies: *lint-jobs - vars: - tox_extra_args: focal-xena-ha-ovn -- job: - name: focal-wallaby-ha - parent: func-target - dependencies: *smoke-jobs - vars: - tox_extra_args: focal-wallaby-ha - job: name: focal-xena-ha parent: func-target - dependencies: *smoke-jobs + dependencies: + - osci-lint + - tox-py38 + - tox-py39 + - charm-build vars: tox_extra_args: focal-xena-ha - job: - name: hirsute-wallaby-ha-ovn + name: focal-xena-ha-ovn parent: func-target - dependencies: *lint-jobs + dependencies: + - focal-xena-ha vars: - tox_extra_args: hirsute-wallaby-ha-ovn + tox_extra_args: focal-xena-ha-ovn - job: - name: hirsute-wallaby-ha + name: focal-yoga-ha parent: func-target - dependencies: *smoke-jobs + dependencies: + - focal-xena-ha vars: - tox_extra_args: hirsute-wallaby-ha + tox_extra_args: focal-yoga-ha +- job: + name: focal-yoga-ha-ovn + parent: func-target + dependencies: + - focal-xena-ha + vars: + tox_extra_args: focal-yoga-ha-ovn - job: name: impish-xena-ha-ovn parent: func-target - dependencies: *lint-jobs + dependencies: + - focal-xena-ha vars: tox_extra_args: impish-xena-ha-ovn - job: name: impish-xena-ha parent: func-target - dependencies: *smoke-jobs + dependencies: + - focal-xena-ha vars: tox_extra_args: impish-xena-ha +- job: + name: jammy-yoga-ha-ovn + parent: func-target + dependencies: + - focal-xena-ha + vars: + tox_extra_args: jammy-yoga-ha-ovn +- job: + name: jammy-yoga-ha + parent: func-target + dependencies: + - focal-xena-ha + vars: + tox_extra_args: jammy-yoga-ha diff --git a/rename.sh b/rename.sh new file mode 100755 index 00000000..d0c35c97 --- /dev/null +++ b/rename.sh @@ -0,0 +1,13 @@ +#!/bin/bash +charm=$(grep "charm_build_name" osci.yaml | awk '{print $2}') +echo "renaming ${charm}_*.charm to ${charm}.charm" +echo -n "pwd: " +pwd +ls -al +echo "Removing bad downloaded charm maybe?" +if [[ -e "${charm}.charm" ]]; +then + rm "${charm}.charm" +fi +echo "Renaming charm here." +mv ${charm}_*.charm ${charm}.charm diff --git a/requirements.txt b/requirements.txt index e4502ebd..bfad2562 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,12 +6,12 @@ # NOTE(lourot): This might look like a duplication of test-requirements.txt but # some tox targets use only test-requirements.txt whereas charm-build uses only # requirements.txt -pyparsing<3.0.0 # aodhclient is pinned in zaza and needs pyparsing < 3.0.0, but cffi also needs it, so pin here. -cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35. setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85 # Build requirements -charm-tools==2.8.3 +cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35. +cryptography<3.4 +git+https://github.com/juju/charm-tools#egg=charm-tools simplejson diff --git a/src/metadata.yaml b/src/metadata.yaml index c892edbb..c9eca7d3 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -18,10 +18,7 @@ description: | tags: - openstack series: -- bionic - focal -- groovy -- hirsute - impish subordinate: false provides: diff --git a/src/reactive/octavia_handlers.py b/src/reactive/octavia_handlers.py index 5724df64..091b7abe 100644 --- a/src/reactive/octavia_handlers.py +++ b/src/reactive/octavia_handlers.py @@ -90,7 +90,8 @@ def setup_endpoint_connection(keystone): instance.public_url, instance.internal_url, instance.admin_url, - requested_roles=octavia.OCTAVIA_ROLES) + requested_roles=octavia.OCTAVIA_ROLES, + add_role_to_admin=octavia.OCTAVIA_ROLES) instance.assess_status() diff --git a/src/test-requirements.txt b/src/test-requirements.txt index e7710236..8ca46de3 100644 --- a/src/test-requirements.txt +++ b/src/test-requirements.txt @@ -4,6 +4,10 @@ # https://github.com/openstack-charmers/release-tools # +# Need tox to be available from tox... inception yes, but its a workaround for now +tox + # 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 +# XXX Remove me before landing +git+https://github.com/gnuoy/zaza.git@add-additional-machine-error-info#egg=zaza +git+https://github.com/gnuoy/zaza-openstack-tests.git@change-zaza-dep#egg=zaza.openstack diff --git a/src/tests/bundles/bionic-rocky-ha.yaml b/src/tests/bundles/bionic-rocky-ha.yaml deleted file mode 100644 index 11ac7e3f..00000000 --- a/src/tests/bundles/bionic-rocky-ha.yaml +++ /dev/null @@ -1,166 +0,0 @@ -series: bionic -relations: -- - glance:image-service - - nova-cloud-controller:image-service -- - glance:image-service - - nova-compute:image-service -- - mysql:shared-db - - glance:shared-db -- - mysql:shared-db - - keystone:shared-db -- - mysql:shared-db - - neutron-api:shared-db -- - mysql:shared-db - - nova-cloud-controller:shared-db -- - mysql: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 -- - vault:shared-db - - mysql: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 - - glance-simplestreams-sync:certificates -- - vault:certificates - - octavia-diskimage-retrofit:certificates -applications: - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - mysql: - constraints: mem=3072M - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - debug: True - flat-network-providers: physnet1 - enable-ml2-port-security: True - neutron-security-groups: True - enable-dvr: True - neutron-openvswitch: - series: bionic - 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: bionic - 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: cloud:bionic-rocky - debug: True - network-manager: Neutron - nova-compute: - constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-compute - num_units: 2 - options: - openstack-origin: cloud:bionic-rocky - debug: True - hacluster-octavia: - charm: cs:~openstack-charmers-next/hacluster - num_units: 0 - octavia: - constraints: cores=8 - series: bionic - charm: ../../../octavia - num_units: 3 - options: - openstack-origin: cloud:bionic-rocky - 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: - source: ppa:simplestreams-dev/trunk - use_swift: False - octavia-diskimage-retrofit: - charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit - options: - amp-image-tag: 'octavia-amphora' - retrofit-uca-pocket: rocky - retrofit-series: bionic - vault: - charm: cs:~openstack-charmers-next/vault - num_units: 1 diff --git a/src/tests/bundles/bionic-rocky-lxd.yaml b/src/tests/bundles/bionic-rocky-lxd.yaml deleted file mode 100644 index 00e38dab..00000000 --- a/src/tests/bundles/bionic-rocky-lxd.yaml +++ /dev/null @@ -1,188 +0,0 @@ -series: bionic -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - constraints: mem=3072M -relations: -- - glance:image-service - - nova-cloud-controller:image-service -- - glance:image-service - - nova-compute:image-service -- - mysql:shared-db - - glance:shared-db -- - mysql:shared-db - - keystone:shared-db -- - mysql:shared-db - - neutron-api:shared-db -- - mysql:shared-db - - nova-cloud-controller:shared-db -- - mysql: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 - - neutron-gateway: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 -- - neutron-gateway:quantum-network-service - - nova-cloud-controller:quantum-network-service -- - rabbitmq-server:amqp - - neutron-openvswitch:amqp -- - neutron-api:neutron-plugin-api - - neutron-openvswitch:neutron-plugin-api -- - neutron-openvswitch:neutron-plugin - - nova-compute:neutron-plugin -- - neutron-openvswitch:neutron-plugin - - octavia:neutron-openvswitch -- - 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 -- - vault:shared-db - - mysql: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 - - glance-simplestreams-sync:certificates -- - vault:certificates - - octavia-diskimage-retrofit:certificates -applications: - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - to: - - lxd:1 - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - to: - - lxd:0 - mysql: - constraints: mem=3072M - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - to: - - lxd:0 - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - debug: True - flat-network-providers: physnet1 - enable-ml2-port-security: True - neutron-security-groups: True - to: - - lxd:1 - neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - bridge-mappings: physnet1:br-ex - os-data-network: 252.0.0.0/8 - instance-mtu: 1300 - debug: True - to: - - 3 - neutron-openvswitch: - series: bionic - charm: cs:~openstack-charmers-next/neutron-openvswitch - num_units: 0 - options: - debug: True - os-data-network: 252.0.0.0/8 - instance-mtu: 1300 - 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: cloud:bionic-rocky - debug: True - network-manager: Neutron - to: - - lxd:1 - nova-compute: - constraints: mem=10240M - charm: cs:~openstack-charmers-next/nova-compute - num_units: 2 - options: - openstack-origin: cloud:bionic-rocky - debug: True - to: - - 2 - octavia: - constraints: cores=8 - series: bionic - charm: ../../../octavia - num_units: 3 - options: - debug: True - openstack-origin: cloud:bionic-rocky - spare-pool-size: 2 - loadbalancer-topology: 'ACTIVE_STANDBY' - to: - - lxd:0 - - lxd:1 - - lxd:2 - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - lxd:0 - glance-simplestreams-sync: - charm: cs:~openstack-charmers-next/glance-simplestreams-sync - num_units: 1 - options: - source: ppa:simplestreams-dev/trunk - use_swift: False - octavia-diskimage-retrofit: - charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit - options: - amp-image-tag: 'octavia-amphora' - retrofit-series: bionic - vault: - charm: cs:~openstack-charmers-next/vault - num_units: 1 diff --git a/src/tests/bundles/bionic-stein-ha.yaml b/src/tests/bundles/bionic-stein-ha.yaml deleted file mode 100644 index 6267e4dc..00000000 --- a/src/tests/bundles/bionic-stein-ha.yaml +++ /dev/null @@ -1,166 +0,0 @@ -series: bionic -relations: -- - glance:image-service - - nova-cloud-controller:image-service -- - glance:image-service - - nova-compute:image-service -- - mysql:shared-db - - glance:shared-db -- - mysql:shared-db - - keystone:shared-db -- - mysql:shared-db - - neutron-api:shared-db -- - mysql:shared-db - - nova-cloud-controller:shared-db -- - mysql: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 -- - vault:shared-db - - mysql: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 - - glance-simplestreams-sync:certificates -- - vault:certificates - - octavia-diskimage-retrofit:certificates -applications: - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-stein - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-stein - mysql: - constraints: mem=3072M - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - openstack-origin: cloud:bionic-stein - debug: True - flat-network-providers: physnet1 - enable-ml2-port-security: True - neutron-security-groups: True - enable-dvr: True - neutron-openvswitch: - series: bionic - 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: bionic - 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: cloud:bionic-stein - debug: True - network-manager: Neutron - nova-compute: - constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-compute - num_units: 2 - options: - openstack-origin: cloud:bionic-stein - debug: True - hacluster-octavia: - charm: cs:~openstack-charmers-next/hacluster - num_units: 0 - octavia: - constraints: cores=8 - series: bionic - charm: ../../../octavia - num_units: 3 - options: - openstack-origin: cloud:bionic-stein - 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: - source: ppa:simplestreams-dev/trunk - use_swift: False - octavia-diskimage-retrofit: - charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit - options: - amp-image-tag: 'octavia-amphora' - retrofit-uca-pocket: stein - retrofit-series: bionic - vault: - charm: cs:~openstack-charmers-next/vault - num_units: 1 diff --git a/src/tests/bundles/bionic-train-ha-ovn.yaml b/src/tests/bundles/bionic-train-ha-ovn.yaml deleted file mode 100644 index 9a0c05ec..00000000 --- a/src/tests/bundles/bionic-train-ha-ovn.yaml +++ /dev/null @@ -1,179 +0,0 @@ -series: bionic -relations: -- - glance:image-service - - nova-cloud-controller:image-service -- - glance:image-service - - nova-compute:image-service -- - mysql:shared-db - - glance:shared-db -- - mysql:shared-db - - keystone:shared-db -- - mysql:shared-db - - neutron-api:shared-db -- - mysql:shared-db - - nova-cloud-controller:shared-db -- - mysql: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, mysql ] -- [ placement, keystone ] -- [ placement, nova-cloud-controller ] -- - neutron-api-plugin-ovn:neutron-plugin - - neutron-api:neutron-plugin-api-subordinate -- - vault:shared-db - - mysql: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 -applications: - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-train - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-train - mysql: - constraints: mem=3072M - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - neutron-api: - constraints: cores=4 - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - openstack-origin: cloud:bionic-train - debug: True - flat-network-providers: physnet1 - enable-ml2-port-security: True - neutron-security-groups: True - manage-neutron-plugin-legacy-mode: False - nova-cloud-controller: - constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: cloud:bionic-train - debug: True - network-manager: Neutron - nova-compute: - constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-compute - num_units: 2 - options: - openstack-origin: cloud:bionic-train - debug: True - hacluster-octavia: - series: bionic - charm: cs:~openstack-charmers-next/hacluster - ovn-chassis-octavia: - charm: cs:~openstack-charmers-next/ovn-chassis - octavia: - constraints: cores=8 - series: bionic - charm: ../../../octavia - num_units: 3 - options: - openstack-origin: cloud:bionic-train - 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: - source: ppa:simplestreams-dev/trunk - use_swift: False - octavia-diskimage-retrofit: - charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit - options: - amp-image-tag: 'octavia-amphora' - retrofit-uca-pocket: train - retrofit-series: bionic - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: cloud:bionic-train - 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: cloud:bionic-train - 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/bionic-train-ha.yaml b/src/tests/bundles/bionic-train-ha.yaml deleted file mode 100644 index d41db5c9..00000000 --- a/src/tests/bundles/bionic-train-ha.yaml +++ /dev/null @@ -1,178 +0,0 @@ -series: bionic -relations: -- - glance:image-service - - nova-cloud-controller:image-service -- - glance:image-service - - nova-compute:image-service -- - mysql:shared-db - - glance:shared-db -- - mysql:shared-db - - keystone:shared-db -- - mysql:shared-db - - neutron-api:shared-db -- - mysql:shared-db - - nova-cloud-controller:shared-db -- - mysql: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, mysql ] -- [ placement, keystone ] -- [ placement, nova-cloud-controller ] -- - vault:shared-db - - mysql: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 -applications: - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-train - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-train - mysql: - constraints: mem=3072M - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - openstack-origin: cloud:bionic-train - debug: True - flat-network-providers: physnet1 - enable-ml2-port-security: True - neutron-security-groups: True - enable-dvr: True - neutron-openvswitch: - series: bionic - 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: bionic - 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: cloud:bionic-train - debug: True - network-manager: Neutron - nova-compute: - constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-compute - num_units: 2 - options: - openstack-origin: cloud:bionic-train - debug: True - hacluster-octavia: - charm: cs:~openstack-charmers-next/hacluster - num_units: 0 - octavia: - constraints: cores=8 - series: bionic - charm: ../../../octavia - num_units: 3 - options: - openstack-origin: cloud:bionic-train - 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: - source: ppa:simplestreams-dev/trunk - use_swift: False - octavia-diskimage-retrofit: - charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit - options: - amp-image-tag: 'octavia-amphora' - retrofit-uca-pocket: train - retrofit-series: bionic - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: cloud:bionic-train - debug: true - vault: - charm: cs:~openstack-charmers-next/vault - num_units: 1 diff --git a/src/tests/bundles/bionic-ussuri-ha-ovn.yaml b/src/tests/bundles/bionic-ussuri-ha-ovn.yaml deleted file mode 100644 index 03d1f3bf..00000000 --- a/src/tests/bundles/bionic-ussuri-ha-ovn.yaml +++ /dev/null @@ -1,178 +0,0 @@ -series: bionic -relations: -- - glance:image-service - - nova-cloud-controller:image-service -- - glance:image-service - - nova-compute:image-service -- - mysql:shared-db - - glance:shared-db -- - mysql:shared-db - - keystone:shared-db -- - mysql:shared-db - - neutron-api:shared-db -- - mysql:shared-db - - nova-cloud-controller:shared-db -- - mysql: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, mysql ] -- [ placement, keystone ] -- [ placement, nova-cloud-controller ] -- - neutron-api-plugin-ovn:neutron-plugin - - neutron-api:neutron-plugin-api-subordinate -- - vault:shared-db - - mysql: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 -applications: - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-ussuri - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-ussuri - mysql: - constraints: mem=3072M - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - neutron-api: - constraints: cores=4 - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - openstack-origin: cloud:bionic-ussuri - 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: cloud:bionic-ussuri - debug: True - network-manager: Neutron - nova-compute: - constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-compute - num_units: 2 - options: - openstack-origin: cloud:bionic-ussuri - debug: True - hacluster-octavia: - series: bionic - charm: cs:~openstack-charmers-next/hacluster - ovn-chassis-octavia: - charm: cs:~openstack-charmers-next/ovn-chassis - octavia: - constraints: cores=8 - series: bionic - charm: ../../../octavia - num_units: 3 - options: - openstack-origin: cloud:bionic-ussuri - 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: - source: ppa:simplestreams-dev/trunk - use_swift: False - octavia-diskimage-retrofit: - charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit - options: - amp-image-tag: 'octavia-amphora' - retrofit-uca-pocket: ussuri - retrofit-series: bionic - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: cloud:bionic-ussuri - 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: cloud:bionic-ussuri - 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/bionic-ussuri-ha.yaml b/src/tests/bundles/bionic-ussuri-ha.yaml deleted file mode 100644 index eb8b0089..00000000 --- a/src/tests/bundles/bionic-ussuri-ha.yaml +++ /dev/null @@ -1,179 +0,0 @@ -series: bionic -relations: -- - glance:image-service - - nova-cloud-controller:image-service -- - glance:image-service - - nova-compute:image-service -- - mysql:shared-db - - glance:shared-db -- - mysql:shared-db - - keystone:shared-db -- - mysql:shared-db - - neutron-api:shared-db -- - mysql:shared-db - - nova-cloud-controller:shared-db -- - mysql: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, mysql ] -- [ placement, keystone ] -- [ placement, nova-cloud-controller ] -- - vault:shared-db - - mysql: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 -applications: - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-ussuri - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-ussuri - mysql: - constraints: mem=3072M - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - openstack-origin: cloud:bionic-ussuri - 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: bionic - 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: bionic - 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: cloud:bionic-ussuri - debug: True - network-manager: Neutron - nova-compute: - constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-compute - num_units: 2 - options: - openstack-origin: cloud:bionic-ussuri - debug: True - hacluster-octavia: - charm: cs:~openstack-charmers-next/hacluster - num_units: 0 - octavia: - constraints: cores=8 - series: bionic - charm: ../../../octavia - num_units: 3 - options: - openstack-origin: cloud:bionic-ussuri - 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: - source: ppa:simplestreams-dev/trunk - use_swift: False - octavia-diskimage-retrofit: - charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit - options: - amp-image-tag: 'octavia-amphora' - retrofit-uca-pocket: ussuri - retrofit-series: bionic - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: cloud:bionic-ussuri - debug: true - vault: - charm: cs:~openstack-charmers-next/vault - num_units: 1 diff --git a/src/tests/bundles/focal-ussuri-ha-ovn.yaml b/src/tests/bundles/focal-ussuri-ha-ovn.yaml deleted file mode 100644 index 58315620..00000000 --- a/src/tests/bundles/focal-ussuri-ha-ovn.yaml +++ /dev/null @@ -1,200 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -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 - 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-ussuri-ha.yaml b/src/tests/bundles/focal-ussuri-ha.yaml deleted file mode 100644 index 82ebde82..00000000 --- a/src/tests/bundles/focal-ussuri-ha.yaml +++ /dev/null @@ -1,201 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -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 - 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/focal-victoria-ha-ovn.yaml b/src/tests/bundles/focal-victoria-ha-ovn.yaml deleted file mode 100644 index e365ad1f..00000000 --- a/src/tests/bundles/focal-victoria-ha-ovn.yaml +++ /dev/null @@ -1,201 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-victoria - -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: victoria - 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-victoria-ha.yaml b/src/tests/bundles/focal-victoria-ha.yaml deleted file mode 100644 index fbd848fa..00000000 --- a/src/tests/bundles/focal-victoria-ha.yaml +++ /dev/null @@ -1,202 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-victoria - -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: victoria - 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/focal-victoria-no-amphora.yaml b/src/tests/bundles/focal-victoria-no-amphora.yaml deleted file mode 100644 index 0caf7270..00000000 --- a/src/tests/bundles/focal-victoria-no-amphora.yaml +++ /dev/null @@ -1,178 +0,0 @@ -local_overlay_enabled: False -variables: - openstack-origin: &openstack-origin cloud:focal-victoria - -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 -- [ 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 -- ["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 - ovn-chassis-octavia: - charm: cs:~openstack-charmers-next/ovn-chassis - octavia: - constraints: cores=8 - series: *series - charm: ../../../octavia - num_units: 1 - options: - openstack-origin: *openstack-origin - debug: True - enable-amphora: False - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - 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-xena-ha-ovn.yaml b/src/tests/bundles/focal-xena-ha-ovn.yaml index 38f207cd..06f90f62 100644 --- a/src/tests/bundles/focal-xena-ha-ovn.yaml +++ b/src/tests/bundles/focal-xena-ha-ovn.yaml @@ -1,6 +1,8 @@ variables: openstack-origin: &openstack-origin cloud:focal-xena +local_overlay_enabled: False + series: &series focal relations: - - glance:image-service @@ -99,36 +101,46 @@ relations: - ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"] applications: glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin + channel: yoga/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin + channel: yoga/edge octavia-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge nova-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge neutron-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge mysql-innodb-cluster: constraints: mem=3072M - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 + channel: 8.0.19/edge neutron-api: constraints: cores=4 - charm: cs:~openstack-charmers-next/neutron-api + charm: ch:neutron-api num_units: 1 options: openstack-origin: *openstack-origin @@ -136,66 +148,79 @@ applications: flat-network-providers: physnet1 enable-ml2-port-security: True neutron-security-groups: True + channel: yoga/edge nova-cloud-controller: constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: ch:nova-cloud-controller num_units: 1 options: openstack-origin: *openstack-origin debug: True network-manager: Neutron + channel: yoga/edge nova-compute: constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 2 options: openstack-origin: *openstack-origin debug: True + channel: yoga/edge hacluster-octavia: series: *series - charm: cs:~openstack-charmers-next/hacluster + charm: ch:hacluster + channel: 2.0.3/edge ovn-chassis-octavia: - charm: cs:~openstack-charmers-next/ovn-chassis + charm: ch:ovn-chassis + channel: latest/edge octavia: constraints: cores=8 series: *series - charm: ../../../octavia + charm: ../../../octavia.charm num_units: 3 options: openstack-origin: *openstack-origin debug: True loadbalancer-topology: 'ACTIVE_STANDBY' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 + channel: 3.8/edge glance-simplestreams-sync: - charm: cs:~openstack-charmers-next/glance-simplestreams-sync + charm: ch:glance-simplestreams-sync num_units: 1 options: use_swift: False + channel: yoga/edge octavia-diskimage-retrofit: - charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit + charm: ch:octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-series: *series retrofit-uca-pocket: wallaby + channel: yoga/edge placement: - charm: cs:~openstack-charmers-next/placement + charm: ch:placement num_units: 1 constraints: mem=1G options: openstack-origin: *openstack-origin debug: true + channel: yoga/edge neutron-api-plugin-ovn: - charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn + charm: ch:neutron-api-plugin-ovn + channel: yoga/edge ovn-central: constraints: mem=3072M - charm: cs:~openstack-charmers-next/ovn-central + charm: ch:ovn-central num_units: 3 options: source: *openstack-origin + channel: latest/edge ovn-chassis: - charm: cs:~openstack-charmers-next/ovn-chassis + charm: ch:ovn-chassis + channel: latest/edge vault: - charm: cs:~openstack-charmers-next/vault + charm: ch:vault num_units: 1 + channel: 1.7/edge diff --git a/src/tests/bundles/focal-xena-ha.yaml b/src/tests/bundles/focal-xena-ha.yaml index a5c948f6..be72eedd 100644 --- a/src/tests/bundles/focal-xena-ha.yaml +++ b/src/tests/bundles/focal-xena-ha.yaml @@ -1,6 +1,8 @@ variables: openstack-origin: &openstack-origin cloud:focal-xena +local_overlay_enabled: False + series: &series focal relations: - - glance:image-service @@ -91,35 +93,56 @@ relations: - ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"] applications: glance: - charm: cs:~openstack-charmers-next/glance + series: *series + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin + channel: yoga/edge keystone: - charm: cs:~openstack-charmers-next/keystone + series: *series + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin + channel: yoga/edge octavia-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + series: *series + charm: ch:mysql-router + channel: 8.0.19/edge keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + series: *series + charm: ch:mysql-router + channel: 8.0.19/edge nova-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + series: *series + charm: ch:mysql-router + channel: 8.0.19/edge glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + series: *series + charm: ch:mysql-router + channel: 8.0.19/edge neutron-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + series: *series + charm: ch:mysql-router + channel: 8.0.19/edge placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + series: *series + charm: ch:mysql-router + channel: 8.0.19/edge vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + series: *series + charm: ch:mysql-router + channel: 8.0.19/edge mysql-innodb-cluster: + series: *series constraints: mem=3072M - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 + channel: 8.0.19/edge neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + series: *series + charm: ch:neutron-api num_units: 1 options: openstack-origin: *openstack-origin @@ -129,9 +152,10 @@ applications: neutron-security-groups: True enable-dvr: True manage-neutron-plugin-legacy-mode: True + channel: yoga/edge neutron-openvswitch: series: *series - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: ch:neutron-openvswitch num_units: 0 options: debug: True @@ -140,36 +164,44 @@ applications: prevent-arp-spoofing: False firewall-driver: openvswitch bridge-mappings: physnet1:br-ex + channel: yoga/edge neutron-openvswitch-octavia: series: *series - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: ch:neutron-openvswitch num_units: 0 options: debug: True prevent-arp-spoofing: False firewall-driver: openvswitch + channel: yoga/edge nova-cloud-controller: + series: *series constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: ch:nova-cloud-controller num_units: 1 options: openstack-origin: *openstack-origin debug: True network-manager: Neutron + channel: yoga/edge nova-compute: + series: *series constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 2 options: openstack-origin: *openstack-origin debug: True + channel: yoga/edge hacluster-octavia: - charm: cs:~openstack-charmers-next/hacluster + series: *series + charm: ch:hacluster num_units: 0 + channel: 2.0.3/edge octavia: constraints: cores=8 series: *series - charm: ../../../octavia + charm: ../../../octavia.charm num_units: 3 options: openstack-origin: *openstack-origin @@ -177,26 +209,36 @@ applications: loadbalancer-topology: 'ACTIVE_STANDBY' vip: 'ADD YOUR VIP HERE' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + series: *series + charm: ch:rabbitmq-server num_units: 1 + channel: 3.8/edge glance-simplestreams-sync: - charm: cs:~openstack-charmers-next/glance-simplestreams-sync + series: *series + charm: ch:glance-simplestreams-sync num_units: 1 options: use_swift: False + channel: yoga/edge octavia-diskimage-retrofit: - charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit + series: *series + charm: ch:octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-series: *series retrofit-uca-pocket: wallaby + channel: yoga/edge placement: - charm: cs:~openstack-charmers-next/placement + series: *series + charm: ch:placement num_units: 1 constraints: mem=1G options: openstack-origin: *openstack-origin debug: true + channel: yoga/edge vault: - charm: cs:~openstack-charmers-next/vault + series: *series + charm: ch:vault num_units: 1 + channel: 1.7/edge diff --git a/src/tests/bundles/focal-wallaby-ha-ovn.yaml b/src/tests/bundles/focal-yoga-ha-ovn.yaml similarity index 78% rename from src/tests/bundles/focal-wallaby-ha-ovn.yaml rename to src/tests/bundles/focal-yoga-ha-ovn.yaml index 3c654711..22629cde 100644 --- a/src/tests/bundles/focal-wallaby-ha-ovn.yaml +++ b/src/tests/bundles/focal-yoga-ha-ovn.yaml @@ -1,5 +1,7 @@ variables: - openstack-origin: &openstack-origin cloud:focal-wallaby + openstack-origin: &openstack-origin cloud:focal-yoga + +local_overlay_enabled: False series: &series focal relations: @@ -99,36 +101,46 @@ relations: - ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"] applications: glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin + channel: yoga/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin + channel: yoga/edge octavia-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge nova-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge neutron-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge mysql-innodb-cluster: constraints: mem=3072M - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 + channel: 8.0.19/edge neutron-api: constraints: cores=4 - charm: cs:~openstack-charmers-next/neutron-api + charm: ch:neutron-api num_units: 1 options: openstack-origin: *openstack-origin @@ -136,66 +148,79 @@ applications: flat-network-providers: physnet1 enable-ml2-port-security: True neutron-security-groups: True + channel: yoga/edge nova-cloud-controller: constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: ch:nova-cloud-controller num_units: 1 options: openstack-origin: *openstack-origin debug: True network-manager: Neutron + channel: yoga/edge nova-compute: constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 2 options: openstack-origin: *openstack-origin debug: True + channel: yoga/edge hacluster-octavia: series: *series - charm: cs:~openstack-charmers-next/hacluster + charm: ch:hacluster + channel: 2.0.3/edge ovn-chassis-octavia: - charm: cs:~openstack-charmers-next/ovn-chassis + charm: ch:ovn-chassis + channel: latest/edge octavia: constraints: cores=8 series: *series - charm: ../../../octavia + charm: ../../../octavia.charm num_units: 3 options: openstack-origin: *openstack-origin debug: True loadbalancer-topology: 'ACTIVE_STANDBY' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 + channel: 3.8/edge glance-simplestreams-sync: - charm: cs:~openstack-charmers-next/glance-simplestreams-sync + charm: ch:glance-simplestreams-sync num_units: 1 options: use_swift: False + channel: yoga/edge octavia-diskimage-retrofit: - charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit + charm: ch:octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-series: *series retrofit-uca-pocket: wallaby + channel: yoga/edge placement: - charm: cs:~openstack-charmers-next/placement + charm: ch:placement num_units: 1 constraints: mem=1G options: openstack-origin: *openstack-origin debug: true + channel: yoga/edge neutron-api-plugin-ovn: - charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn + charm: ch:neutron-api-plugin-ovn + channel: yoga/edge ovn-central: constraints: mem=3072M - charm: cs:~openstack-charmers-next/ovn-central + charm: ch:ovn-central num_units: 3 options: source: *openstack-origin + channel: latest/edge ovn-chassis: - charm: cs:~openstack-charmers-next/ovn-chassis + charm: ch:ovn-chassis + channel: latest/edge vault: - charm: cs:~openstack-charmers-next/vault + charm: ch:vault num_units: 1 + channel: 1.7/edge diff --git a/src/tests/bundles/focal-wallaby-ha.yaml b/src/tests/bundles/focal-yoga-ha.yaml similarity index 80% rename from src/tests/bundles/focal-wallaby-ha.yaml rename to src/tests/bundles/focal-yoga-ha.yaml index 172a654d..52891a03 100644 --- a/src/tests/bundles/focal-wallaby-ha.yaml +++ b/src/tests/bundles/focal-yoga-ha.yaml @@ -1,5 +1,7 @@ variables: - openstack-origin: &openstack-origin cloud:focal-wallaby + openstack-origin: &openstack-origin cloud:focal-yoga + +local_overlay_enabled: False series: &series focal relations: @@ -91,35 +93,45 @@ relations: - ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"] applications: glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin + channel: yoga/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin + channel: yoga/edge octavia-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge nova-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge neutron-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge mysql-innodb-cluster: constraints: mem=3072M - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 + channel: 8.0.19/edge neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: ch:neutron-api num_units: 1 options: openstack-origin: *openstack-origin @@ -129,9 +141,10 @@ applications: neutron-security-groups: True enable-dvr: True manage-neutron-plugin-legacy-mode: True + channel: yoga/edge neutron-openvswitch: series: *series - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: ch:neutron-openvswitch num_units: 0 options: debug: True @@ -140,36 +153,41 @@ applications: prevent-arp-spoofing: False firewall-driver: openvswitch bridge-mappings: physnet1:br-ex + channel: yoga/edge neutron-openvswitch-octavia: series: *series - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: ch:neutron-openvswitch num_units: 0 options: debug: True prevent-arp-spoofing: False firewall-driver: openvswitch + channel: yoga/edge nova-cloud-controller: constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: ch:nova-cloud-controller num_units: 1 options: openstack-origin: *openstack-origin debug: True network-manager: Neutron + channel: yoga/edge nova-compute: constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 2 options: openstack-origin: *openstack-origin debug: True + channel: yoga/edge hacluster-octavia: - charm: cs:~openstack-charmers-next/hacluster + charm: ch:hacluster num_units: 0 + channel: 2.0.3/edge octavia: constraints: cores=8 series: *series - charm: ../../../octavia + charm: ../../../octavia.charm num_units: 3 options: openstack-origin: *openstack-origin @@ -177,26 +195,31 @@ applications: loadbalancer-topology: 'ACTIVE_STANDBY' vip: 'ADD YOUR VIP HERE' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 + channel: 3.8/edge glance-simplestreams-sync: - charm: cs:~openstack-charmers-next/glance-simplestreams-sync + charm: ch:glance-simplestreams-sync num_units: 1 options: use_swift: False + channel: yoga/edge octavia-diskimage-retrofit: - charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit + charm: ch:octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-series: *series retrofit-uca-pocket: wallaby + channel: yoga/edge placement: - charm: cs:~openstack-charmers-next/placement + charm: ch:placement num_units: 1 constraints: mem=1G options: openstack-origin: *openstack-origin debug: true + channel: yoga/edge vault: - charm: cs:~openstack-charmers-next/vault + charm: ch:vault num_units: 1 + channel: 1.7/edge diff --git a/src/tests/bundles/groovy-victoria-ha-ovn.yaml b/src/tests/bundles/groovy-victoria-ha-ovn.yaml deleted file mode 100644 index acac9049..00000000 --- a/src/tests/bundles/groovy-victoria-ha-ovn.yaml +++ /dev/null @@ -1,207 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: &series groovy -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|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' - 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/groovy-victoria-ha.yaml b/src/tests/bundles/groovy-victoria-ha.yaml deleted file mode 100644 index 05cd36da..00000000 --- a/src/tests/bundles/groovy-victoria-ha.yaml +++ /dev/null @@ -1,208 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: &series groovy -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|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' - 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/impish-xena-ha-ovn.yaml b/src/tests/bundles/impish-xena-ha-ovn.yaml index 65853e50..654a4555 100644 --- a/src/tests/bundles/impish-xena-ha-ovn.yaml +++ b/src/tests/bundles/impish-xena-ha-ovn.yaml @@ -1,6 +1,8 @@ variables: openstack-origin: &openstack-origin distro +local_overlay_enabled: False + series: &series impish relations: - - glance:image-service @@ -99,36 +101,46 @@ relations: - ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"] applications: glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin + channel: yoga/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin + channel: yoga/edge octavia-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge nova-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge neutron-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge mysql-innodb-cluster: constraints: mem=3072M - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 + channel: 8.0.19/edge neutron-api: constraints: cores=4 - charm: cs:~openstack-charmers-next/neutron-api + charm: ch:neutron-api num_units: 1 options: openstack-origin: *openstack-origin @@ -136,40 +148,46 @@ applications: flat-network-providers: physnet1 enable-ml2-port-security: True neutron-security-groups: True + channel: yoga/edge nova-cloud-controller: constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: ch:nova-cloud-controller num_units: 1 options: openstack-origin: *openstack-origin debug: True network-manager: Neutron + channel: yoga/edge nova-compute: constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 2 options: openstack-origin: *openstack-origin debug: True + channel: yoga/edge hacluster-octavia: series: *series - charm: cs:~openstack-charmers-next/hacluster + charm: ch:hacluster + channel: 2.0.3/edge ovn-chassis-octavia: - charm: cs:~openstack-charmers-next/ovn-chassis + charm: ch:ovn-chassis + channel: latest/edge octavia: constraints: cores=8 series: *series - charm: ../../../octavia + charm: ../../../octavia.charm num_units: 3 options: openstack-origin: *openstack-origin debug: True loadbalancer-topology: 'ACTIVE_STANDBY' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 + channel: 3.8/edge glance-simplestreams-sync: - charm: cs:~openstack-charmers-next/glance-simplestreams-sync + charm: ch:glance-simplestreams-sync num_units: 1 options: use_swift: False @@ -180,28 +198,35 @@ applications: 'release~(bionic|focal|hirsute)', 'arch~(x86_64|amd64)', 'ftype~(disk1.img|disk.img)']}]" + channel: yoga/edge octavia-diskimage-retrofit: - charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit + charm: ch:octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-series: *series + channel: yoga/edge placement: - charm: cs:~openstack-charmers-next/placement + charm: ch:placement num_units: 1 constraints: mem=1G options: openstack-origin: *openstack-origin debug: true + channel: yoga/edge neutron-api-plugin-ovn: - charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn + charm: ch:neutron-api-plugin-ovn + channel: yoga/edge ovn-central: constraints: mem=3072M - charm: cs:~openstack-charmers-next/ovn-central + charm: ch:ovn-central num_units: 3 options: source: *openstack-origin + channel: latest/edge ovn-chassis: - charm: cs:~openstack-charmers-next/ovn-chassis + charm: ch:ovn-chassis + channel: latest/edge vault: - charm: cs:~openstack-charmers-next/vault + charm: ch:vault num_units: 1 + channel: 1.7/edge diff --git a/src/tests/bundles/impish-xena-ha.yaml b/src/tests/bundles/impish-xena-ha.yaml index 38f20f7a..33df9fde 100644 --- a/src/tests/bundles/impish-xena-ha.yaml +++ b/src/tests/bundles/impish-xena-ha.yaml @@ -1,6 +1,8 @@ variables: openstack-origin: &openstack-origin distro +local_overlay_enabled: False + series: &series impish relations: - - glance:image-service @@ -91,35 +93,45 @@ relations: - ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"] applications: glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin + channel: yoga/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin + channel: yoga/edge octavia-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge nova-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge neutron-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge mysql-innodb-cluster: constraints: mem=3072M - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 + channel: 8.0.19/edge neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: ch:neutron-api num_units: 1 options: openstack-origin: *openstack-origin @@ -129,9 +141,10 @@ applications: neutron-security-groups: True enable-dvr: True manage-neutron-plugin-legacy-mode: True + channel: yoga/edge neutron-openvswitch: series: *series - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: ch:neutron-openvswitch num_units: 0 options: debug: True @@ -140,36 +153,41 @@ applications: prevent-arp-spoofing: False firewall-driver: openvswitch bridge-mappings: physnet1:br-ex + channel: yoga/edge neutron-openvswitch-octavia: series: *series - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: ch:neutron-openvswitch num_units: 0 options: debug: True prevent-arp-spoofing: False firewall-driver: openvswitch + channel: yoga/edge nova-cloud-controller: constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: ch:nova-cloud-controller num_units: 1 options: openstack-origin: *openstack-origin debug: True network-manager: Neutron + channel: yoga/edge nova-compute: constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 2 options: openstack-origin: *openstack-origin debug: True + channel: yoga/edge hacluster-octavia: - charm: cs:~openstack-charmers-next/hacluster + charm: ch:hacluster num_units: 0 + channel: 2.0.3/edge octavia: constraints: cores=8 series: *series - charm: ../../../octavia + charm: ../../../octavia.charm num_units: 3 options: openstack-origin: *openstack-origin @@ -177,10 +195,11 @@ applications: loadbalancer-topology: 'ACTIVE_STANDBY' vip: 'ADD YOUR VIP HERE' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 + channel: 3.8/edge glance-simplestreams-sync: - charm: cs:~openstack-charmers-next/glance-simplestreams-sync + charm: ch:glance-simplestreams-sync num_units: 1 options: use_swift: False @@ -191,18 +210,22 @@ applications: 'release~(bionic|focal|hirsute)', 'arch~(x86_64|amd64)', 'ftype~(disk1.img|disk.img)']}]" + channel: yoga/edge octavia-diskimage-retrofit: - charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit + charm: ch:octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-series: *series + channel: yoga/edge placement: - charm: cs:~openstack-charmers-next/placement + charm: ch:placement num_units: 1 constraints: mem=1G options: openstack-origin: *openstack-origin debug: true + channel: yoga/edge vault: - charm: cs:~openstack-charmers-next/vault + charm: ch:vault num_units: 1 + channel: 1.7/edge diff --git a/src/tests/bundles/hirsute-wallaby-ha-ovn.yaml b/src/tests/bundles/jammy-yoga-ha-ovn.yaml similarity index 80% rename from src/tests/bundles/hirsute-wallaby-ha-ovn.yaml rename to src/tests/bundles/jammy-yoga-ha-ovn.yaml index 42b4d1a6..dffd767b 100644 --- a/src/tests/bundles/hirsute-wallaby-ha-ovn.yaml +++ b/src/tests/bundles/jammy-yoga-ha-ovn.yaml @@ -1,7 +1,9 @@ variables: openstack-origin: &openstack-origin distro -series: &series hirsute +local_overlay_enabled: False + +series: &series jammy relations: - - glance:image-service - nova-cloud-controller:image-service @@ -99,36 +101,46 @@ relations: - ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"] applications: glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin + channel: yoga/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin + channel: yoga/edge octavia-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge nova-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge neutron-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge mysql-innodb-cluster: constraints: mem=3072M - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 + channel: 8.0.19/edge neutron-api: constraints: cores=4 - charm: cs:~openstack-charmers-next/neutron-api + charm: ch:neutron-api num_units: 1 options: openstack-origin: *openstack-origin @@ -136,40 +148,46 @@ applications: flat-network-providers: physnet1 enable-ml2-port-security: True neutron-security-groups: True + channel: yoga/edge nova-cloud-controller: constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: ch:nova-cloud-controller num_units: 1 options: openstack-origin: *openstack-origin debug: True network-manager: Neutron + channel: yoga/edge nova-compute: constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 2 options: openstack-origin: *openstack-origin debug: True + channel: yoga/edge hacluster-octavia: series: *series - charm: cs:~openstack-charmers-next/hacluster + charm: ch:hacluster + channel: 2.0.3/edge ovn-chassis-octavia: - charm: cs:~openstack-charmers-next/ovn-chassis + charm: ch:ovn-chassis + channel: latest/edge octavia: constraints: cores=8 series: *series - charm: ../../../octavia + charm: ../../../octavia.charm num_units: 3 options: openstack-origin: *openstack-origin debug: True loadbalancer-topology: 'ACTIVE_STANDBY' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 + channel: 3.8/edge glance-simplestreams-sync: - charm: cs:~openstack-charmers-next/glance-simplestreams-sync + charm: ch:glance-simplestreams-sync num_units: 1 options: use_swift: False @@ -180,28 +198,35 @@ applications: 'release~(bionic|focal|hirsute)', 'arch~(x86_64|amd64)', 'ftype~(disk1.img|disk.img)']}]" + channel: yoga/edge octavia-diskimage-retrofit: - charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit + charm: ch:octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-series: *series + channel: yoga/edge placement: - charm: cs:~openstack-charmers-next/placement + charm: ch:placement num_units: 1 constraints: mem=1G options: openstack-origin: *openstack-origin debug: true + channel: yoga/edge neutron-api-plugin-ovn: - charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn + charm: ch:neutron-api-plugin-ovn + channel: yoga/edge ovn-central: constraints: mem=3072M - charm: cs:~openstack-charmers-next/ovn-central + charm: ch:ovn-central num_units: 3 options: source: *openstack-origin + channel: latest/edge ovn-chassis: - charm: cs:~openstack-charmers-next/ovn-chassis + charm: ch:ovn-chassis + channel: latest/edge vault: - charm: cs:~openstack-charmers-next/vault + charm: ch:vault num_units: 1 + channel: 1.7/edge diff --git a/src/tests/bundles/hirsute-wallaby-ha.yaml b/src/tests/bundles/jammy-yoga-ha.yaml similarity index 82% rename from src/tests/bundles/hirsute-wallaby-ha.yaml rename to src/tests/bundles/jammy-yoga-ha.yaml index 05f2d17f..0c681c4d 100644 --- a/src/tests/bundles/hirsute-wallaby-ha.yaml +++ b/src/tests/bundles/jammy-yoga-ha.yaml @@ -1,7 +1,9 @@ variables: openstack-origin: &openstack-origin distro -series: &series hirsute +local_overlay_enabled: False + +series: &series jammy relations: - - glance:image-service - nova-cloud-controller:image-service @@ -91,35 +93,45 @@ relations: - ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"] applications: glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin + channel: yoga/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin + channel: yoga/edge octavia-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge nova-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge neutron-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge mysql-innodb-cluster: constraints: mem=3072M - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 + channel: 8.0.19/edge neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: ch:neutron-api num_units: 1 options: openstack-origin: *openstack-origin @@ -129,9 +141,10 @@ applications: neutron-security-groups: True enable-dvr: True manage-neutron-plugin-legacy-mode: True + channel: yoga/edge neutron-openvswitch: series: *series - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: ch:neutron-openvswitch num_units: 0 options: debug: True @@ -140,36 +153,41 @@ applications: prevent-arp-spoofing: False firewall-driver: openvswitch bridge-mappings: physnet1:br-ex + channel: yoga/edge neutron-openvswitch-octavia: series: *series - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: ch:neutron-openvswitch num_units: 0 options: debug: True prevent-arp-spoofing: False firewall-driver: openvswitch + channel: yoga/edge nova-cloud-controller: constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: ch:nova-cloud-controller num_units: 1 options: openstack-origin: *openstack-origin debug: True network-manager: Neutron + channel: yoga/edge nova-compute: constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 2 options: openstack-origin: *openstack-origin debug: True + channel: yoga/edge hacluster-octavia: - charm: cs:~openstack-charmers-next/hacluster + charm: ch:hacluster num_units: 0 + channel: 2.0.3/edge octavia: constraints: cores=8 series: *series - charm: ../../../octavia + charm: ../../../octavia.charm num_units: 3 options: openstack-origin: *openstack-origin @@ -177,10 +195,11 @@ applications: loadbalancer-topology: 'ACTIVE_STANDBY' vip: 'ADD YOUR VIP HERE' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 + channel: 3.8/edge glance-simplestreams-sync: - charm: cs:~openstack-charmers-next/glance-simplestreams-sync + charm: ch:glance-simplestreams-sync num_units: 1 options: use_swift: False @@ -191,18 +210,22 @@ applications: 'release~(bionic|focal|hirsute)', 'arch~(x86_64|amd64)', 'ftype~(disk1.img|disk.img)']}]" + channel: yoga/edge octavia-diskimage-retrofit: - charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit + charm: ch:octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-series: *series + channel: yoga/edge placement: - charm: cs:~openstack-charmers-next/placement + charm: ch:placement num_units: 1 constraints: mem=1G options: openstack-origin: *openstack-origin debug: true + channel: yoga/edge vault: - charm: cs:~openstack-charmers-next/vault + charm: ch:vault num_units: 1 + channel: 1.7/edge diff --git a/src/tests/bundles/overlays/focal-xena-ha-ovn.yaml.j2 b/src/tests/bundles/overlays/focal-xena-ha-ovn.yaml.j2 new file mode 100644 index 00000000..89f61268 --- /dev/null +++ b/src/tests/bundles/overlays/focal-xena-ha-ovn.yaml.j2 @@ -0,0 +1,4 @@ +applications: + octavia: + options: + vip: '{{ OS_VIP00 }}' diff --git a/src/tests/bundles/overlays/focal-xena-ha.yaml.j2 b/src/tests/bundles/overlays/focal-xena-ha.yaml.j2 new file mode 100644 index 00000000..89f61268 --- /dev/null +++ b/src/tests/bundles/overlays/focal-xena-ha.yaml.j2 @@ -0,0 +1,4 @@ +applications: + octavia: + options: + vip: '{{ OS_VIP00 }}' diff --git a/src/tests/bundles/overlays/focal-yoga-ha-ovn.yaml.j2 b/src/tests/bundles/overlays/focal-yoga-ha-ovn.yaml.j2 new file mode 100644 index 00000000..89f61268 --- /dev/null +++ b/src/tests/bundles/overlays/focal-yoga-ha-ovn.yaml.j2 @@ -0,0 +1,4 @@ +applications: + octavia: + options: + vip: '{{ OS_VIP00 }}' diff --git a/src/tests/bundles/overlays/focal-yoga-ha.yaml.j2 b/src/tests/bundles/overlays/focal-yoga-ha.yaml.j2 new file mode 100644 index 00000000..89f61268 --- /dev/null +++ b/src/tests/bundles/overlays/focal-yoga-ha.yaml.j2 @@ -0,0 +1,4 @@ +applications: + octavia: + options: + vip: '{{ OS_VIP00 }}' diff --git a/src/tests/bundles/overlays/impish-xena-ha-ovn.yaml.j2 b/src/tests/bundles/overlays/impish-xena-ha-ovn.yaml.j2 new file mode 100644 index 00000000..89f61268 --- /dev/null +++ b/src/tests/bundles/overlays/impish-xena-ha-ovn.yaml.j2 @@ -0,0 +1,4 @@ +applications: + octavia: + options: + vip: '{{ OS_VIP00 }}' diff --git a/src/tests/bundles/overlays/impish-xena-ha.yaml.j2 b/src/tests/bundles/overlays/impish-xena-ha.yaml.j2 new file mode 100644 index 00000000..89f61268 --- /dev/null +++ b/src/tests/bundles/overlays/impish-xena-ha.yaml.j2 @@ -0,0 +1,4 @@ +applications: + octavia: + options: + vip: '{{ OS_VIP00 }}' diff --git a/src/tests/bundles/overlays/jammy-yoga-ha-ovn.yaml.j2 b/src/tests/bundles/overlays/jammy-yoga-ha-ovn.yaml.j2 new file mode 100644 index 00000000..89f61268 --- /dev/null +++ b/src/tests/bundles/overlays/jammy-yoga-ha-ovn.yaml.j2 @@ -0,0 +1,4 @@ +applications: + octavia: + options: + vip: '{{ OS_VIP00 }}' diff --git a/src/tests/bundles/overlays/jammy-yoga-ha.yaml.j2 b/src/tests/bundles/overlays/jammy-yoga-ha.yaml.j2 new file mode 100644 index 00000000..89f61268 --- /dev/null +++ b/src/tests/bundles/overlays/jammy-yoga-ha.yaml.j2 @@ -0,0 +1,4 @@ +applications: + octavia: + options: + vip: '{{ OS_VIP00 }}' diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 43b3a73d..bcdad09b 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,35 +1,20 @@ charm_name: octavia gate_bundles: -- bionic-rocky-ha -- bionic-stein-ha -- bionic-train-ha-ovn -- bionic-train-ha -- bionic-ussuri-ha-ovn -- bionic-ussuri-ha -- focal-ussuri-ha-ovn -- focal-ussuri-ha -- focal-victoria-ha-ovn -- focal-victoria-ha -- no-amphora: focal-victoria-no-amphora -- focal-wallaby-ha-ovn -- focal-wallaby-ha -- groovy-victoria-ha-ovn -- groovy-victoria-ha -- hirsute-wallaby-ha-ovn -- hirsute-wallaby-ha - -smoke_bundles: -- focal-ussuri-ha-ovn -- focal-ussuri-ha - -dev_bundles: -- bionic-rocky-ha -- bionic-rocky-lxd - focal-xena-ha-ovn - focal-xena-ha + +smoke_bundles: +- focal-xena-ha + +dev_bundles: +- focal-yoga-ha-ovn +- focal-yoga-ha - impish-xena-ha-ovn - impish-xena-ha +- jammy-yoga-ha-ovn +- jammy-yoga-ha + comment: | The `bionic-rocky-lxd` bundle currently fails due to a bug in LXD. @@ -38,25 +23,25 @@ comment: | target_deploy_status: octavia: workload-status: blocked - workload-status-message: Awaiting + workload-status-message-prefix: Awaiting glance-simplestreams-sync: workload-status: unknown - workload-status-message: "" + workload-status-message-prefix: "" vault: workload-status: blocked - workload-status-message: Vault needs to be initialized + workload-status-message-prefix: Vault needs to be initialized neutron-api-plugin-ovn: workload-status: waiting - workload-status-message: "'certificates' awaiting server certificate data, 'ovsdb-cms' incomplete" + workload-status-message-prefix: "'certificates' awaiting server certificate data, 'ovsdb-cms' incomplete" ovn-central: workload-status: waiting - workload-status-message: "'ovsdb-peer' incomplete, 'certificates' awaiting server certificate data" + workload-status-message-prefix: "'ovsdb-peer' incomplete, 'certificates' awaiting server certificate data" ovn-chassis: workload-status: waiting - workload-status-message: "'certificates' awaiting server certificate data" + workload-status-message-prefix: "'certificates' awaiting server certificate data" ovn-chassis-octavia: workload-status: waiting - workload-status-message: "'certificates' awaiting server certificate data" + workload-status-message-prefix: "'certificates' awaiting server certificate data" configure: - zaza.openstack.charm_tests.vault.setup.auto_initialize @@ -89,7 +74,7 @@ tests_options: policyd: service: octavia force_deploy: - - groovy-victoria-ha-ovn - - groovy-victoria-ha - impish-xena-ha-ovn - impish-xena-ha + - jammy-yoga-ha-ovn + - jammy-yoga-ha diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt index 391cc3fd..5d08ad9e 100644 --- a/src/wheelhouse.txt +++ b/src/wheelhouse.txt @@ -9,13 +9,27 @@ python-novaclient python-neutronclient # REMOVEME -- fix for https://github.com/pyparsing/pyparsing/issues/164 pyparsing==2.4.2 +poetry-core neutron_lib +# neutron-lib indirectly requires Tempits (neutron-lib -> oslo.db -> sqlalchemy-migrate -> Tempita) +# and Tempita is incompatible with setuptools 58+ +Tempita<0.5 pytest-runner # python-zipp 2.x introduces a requirement for setuptools 42.x which is not available. # resolve conflict: # layer-basic requires setuptools<42, zipp>=2.0.0 requires setuptools>42 # LP: #1862186 -zipp < 2.0.0 +zipp<2.0.0 +# Mako, importlib_metadata, importlib_resources, cmd2, pytest-runner, soupsieve, cliff all pinned +# for compat with setuptools<42 +importlib_metadata<3.1.0 +importlib_resources<4.1.0 +cmd2<1.5.0 +pytest-runner<5.3.0 +soupsieve<2.2 +Mako<1.2.0 +cliff<3.9.0 # cliff 3.9 includes dep on autopage which is dep on setuptools>42 + tenacity # cryptography 3.4 introduces a requirement for rust code in the module. As it has to be compiled # on the machine during install, this breaks installs. Instead pin to <3.4 until a solution can be diff --git a/test-requirements.txt b/test-requirements.txt index 208032f0..a11a7d07 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -28,6 +28,11 @@ oslo.utils<=3.41.0;python_version<'3.6' requests>=2.18.4 charms.reactive +# Newer mock seems to have some syntax which is newer than python3.5 (e.g. +# f'{something}' +mock>=1.2,<4.0.0; python_version < '3.6' +mock>=1.2; python_version >= '3.6' + nose>=1.3.7 coverage>=3.6 git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack @@ -46,3 +51,4 @@ pbr==5.6.0 # vault cryptography<3.4 # vault, keystone-saml-mellon lxml # keystone-saml-mellon hvac # vault, barbican-vault +psutil # cinder-lvm diff --git a/tox.ini b/tox.ini index 22159df2..df64a42b 100644 --- a/tox.ini +++ b/tox.ini @@ -37,11 +37,24 @@ setenv = VIRTUAL_ENV={envdir} passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY install_command = {toxinidir}/pip.sh install {opts} {packages} +allowlist_externals = + charmcraft + bash + tox + rename.sh deps = -r{toxinidir}/requirements.txt [testenv:build] basepython = python3 +deps = -r{toxinidir}/build-requirements.txt +commands = + charmcraft clean + charmcraft -v build + {toxinidir}/rename.sh + +[testenv:build-reactive] +basepython = python3 commands = charm-build --log-level DEBUG --use-lock-file-branches -o {toxinidir}/build/builds src {posargs} @@ -60,13 +73,13 @@ basepython = python3.5 deps = -r{toxinidir}/test-requirements.txt commands = stestr run --slowest {posargs} -[testenv:py36] -basepython = python3.6 +[testenv:py37] +basepython = python3.7 deps = -r{toxinidir}/test-requirements.txt commands = stestr run --slowest {posargs} -[testenv:py37] -basepython = python3.7 +[testenv:py36] +basepython = python3.6 deps = -r{toxinidir}/test-requirements.txt commands = stestr run --slowest {posargs} @@ -75,12 +88,29 @@ basepython = python3.8 deps = -r{toxinidir}/test-requirements.txt commands = stestr run --slowest {posargs} +[testenv:py39] +basepython = python3.9 +deps = -r{toxinidir}/test-requirements.txt +commands = stestr run --slowest {posargs} + [testenv:pep8] basepython = python3 deps = flake8==3.9.2 charm-tools==2.8.3 commands = flake8 {posargs} src unit_tests +[testenv:func-target] +# Hack to get functional tests working in the charmcraft +# world. We should fix this. +basepython = python3 +passenv = HOME TERM CS_* OS_* TEST_* +deps = -r{toxinidir}/src/test-requirements.txt +changedir = {toxinidir}/src +commands = + bash -c "if [ ! -f ../*.charm ]; then echo 'Charm does not exist. Run tox -e build'; exit 1; fi" + tox --version + tox -e func-target {posargs} + [testenv:cover] # Technique based heavily upon # https://github.com/openstack/nova/blob/master/tox.ini diff --git a/unit_tests/test_octavia_handlers.py b/unit_tests/test_octavia_handlers.py index 25f657e8..b9afefdb 100644 --- a/unit_tests/test_octavia_handlers.py +++ b/unit_tests/test_octavia_handlers.py @@ -127,7 +127,8 @@ class TestOctaviaHandlers(test_utils.PatchHelper): self.octavia_charm.public_url, self.octavia_charm.internal_url, self.octavia_charm.admin_url, - requested_roles=octavia.OCTAVIA_ROLES) + requested_roles=octavia.OCTAVIA_ROLES, + add_role_to_admin=octavia.OCTAVIA_ROLES) self.octavia_charm.assess_status.assert_called_once_with() def test_generate_heartbeat_key(self):