Merge "Add xena bundles"
This commit is contained in:
Zuul
Gerrit Code Review
commit
505e00700b
38
osci.yaml
38
osci.yaml
|
|
@ -17,11 +17,21 @@
|
|||
- groovy-victoria-ha-ovn
|
||||
- groovy-victoria-ha
|
||||
# LP: #1913024 is fixed for bionic and focal, but not for hirsute/wallaby
|
||||
# - focal-wallaby-ha-ovn
|
||||
- focal-wallaby-ha-ovn:
|
||||
voting: false
|
||||
- focal-wallaby-ha
|
||||
- focal-xena-ha:
|
||||
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
|
||||
- hirsute-wallaby-ha-ovn:
|
||||
voting: false
|
||||
- hirsute-wallaby-ha
|
||||
- impish-xena-ha:
|
||||
voting: false
|
||||
- impish-xena-ha-ovn:
|
||||
voting: false
|
||||
vars:
|
||||
needs_charm_build: true
|
||||
charm_build_name: octavia
|
||||
|
|
@ -117,12 +127,24 @@
|
|||
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
|
||||
vars:
|
||||
tox_extra_args: focal-xena-ha
|
||||
- job:
|
||||
name: hirsute-wallaby-ha-ovn
|
||||
parent: func-target
|
||||
|
|
@ -135,3 +157,15 @@
|
|||
dependencies: *smoke-jobs
|
||||
vars:
|
||||
tox_extra_args: hirsute-wallaby-ha
|
||||
- job:
|
||||
name: impish-xena-ha-ovn
|
||||
parent: func-target
|
||||
dependencies: *lint-jobs
|
||||
vars:
|
||||
tox_extra_args: impish-xena-ha-ovn
|
||||
- job:
|
||||
name: impish-xena-ha
|
||||
parent: func-target
|
||||
dependencies: *smoke-jobs
|
||||
vars:
|
||||
tox_extra_args: impish-xena-ha
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
#!/usr/bin/env bash
|
||||
#
|
||||
# This file is managed centrally by release-tools and should not be modified
|
||||
# within individual charm repos. See the 'global' dir contents for available
|
||||
# choices of tox.ini for OpenStack Charms:
|
||||
# https://github.com/openstack-charmers/release-tools
|
||||
#
|
||||
# setuptools 58.0 dropped the support for use_2to3=true which is needed to
|
||||
# install blessings (an indirect dependency of charm-tools).
|
||||
#
|
||||
# More details on the beahvior of tox and virtualenv creation can be found at
|
||||
# https://github.com/tox-dev/tox/issues/448
|
||||
#
|
||||
# This script is wrapper to force the use of the pinned versions early in the
|
||||
# process when the virtualenv was created and upgraded before installing the
|
||||
# depedencies declared in the target.
|
||||
pip install 'pip<20.3' 'setuptools<50.0.0'
|
||||
pip "$@"
|
||||
2
rebuild
2
rebuild
|
|
@ -2,4 +2,4 @@
|
|||
# when dependencies of the charm change,
|
||||
# but nothing in the charm needs to.
|
||||
# simply change the uuid to something new
|
||||
fa3e3c30-b3eb-11eb-98a8-d75cfa370e8a
|
||||
53e7e788-1178-11ec-b98d-03bb3d032abd
|
||||
|
|
|
|||
|
|
@ -0,0 +1,201 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin cloud:focal-xena
|
||||
|
||||
series: &series focal
|
||||
relations:
|
||||
- - glance:image-service
|
||||
- nova-cloud-controller:image-service
|
||||
- - glance:image-service
|
||||
- nova-compute:image-service
|
||||
- - glance-mysql-router:shared-db
|
||||
- glance:shared-db
|
||||
- - keystone-mysql-router:shared-db
|
||||
- keystone:shared-db
|
||||
- - neutron-mysql-router:shared-db
|
||||
- neutron-api:shared-db
|
||||
- - nova-mysql-router:shared-db
|
||||
- nova-cloud-controller:shared-db
|
||||
- - octavia-mysql-router:shared-db
|
||||
- octavia:shared-db
|
||||
- - keystone:identity-service
|
||||
- glance:identity-service
|
||||
- - keystone:identity-service
|
||||
- nova-cloud-controller:identity-service
|
||||
- - keystone:identity-service
|
||||
- neutron-api:identity-service
|
||||
- - keystone:identity-service
|
||||
- octavia:identity-service
|
||||
- - nova-compute:cloud-compute
|
||||
- nova-cloud-controller:cloud-compute
|
||||
- - rabbitmq-server:amqp
|
||||
- neutron-api:amqp
|
||||
- - rabbitmq-server:amqp
|
||||
- glance:amqp
|
||||
- - rabbitmq-server:amqp
|
||||
- nova-cloud-controller:amqp
|
||||
- - rabbitmq-server:amqp
|
||||
- nova-compute:amqp
|
||||
- - rabbitmq-server:amqp
|
||||
- octavia:amqp
|
||||
- - neutron-api:neutron-api
|
||||
- nova-cloud-controller:neutron-api
|
||||
- - neutron-api:neutron-load-balancer
|
||||
- octavia:neutron-api
|
||||
- - glance-simplestreams-sync:juju-info
|
||||
- octavia-diskimage-retrofit:juju-info
|
||||
- - keystone:identity-service
|
||||
- glance-simplestreams-sync:identity-service
|
||||
- - keystone:identity-credentials
|
||||
- octavia-diskimage-retrofit:identity-credentials
|
||||
- [ placement, placement-mysql-router ]
|
||||
- [ placement, keystone ]
|
||||
- [ placement, nova-cloud-controller ]
|
||||
- - neutron-api-plugin-ovn:neutron-plugin
|
||||
- neutron-api:neutron-plugin-api-subordinate
|
||||
- - vault:shared-db
|
||||
- vault-mysql-router:shared-db
|
||||
- - ovn-central:certificates
|
||||
- vault:certificates
|
||||
- - ovn-central:ovsdb-cms
|
||||
- neutron-api-plugin-ovn:ovsdb-cms
|
||||
- - neutron-api:certificates
|
||||
- vault:certificates
|
||||
- - ovn-chassis:nova-compute
|
||||
- nova-compute:neutron-plugin
|
||||
- - ovn-chassis-octavia:ovsdb-subordinate
|
||||
- octavia:ovsdb-subordinate
|
||||
- - ovn-chassis-octavia:certificates
|
||||
- vault:certificates
|
||||
- - ovn-chassis-octavia:ovsdb
|
||||
- ovn-central:ovsdb
|
||||
- - ovn-central:ovsdb-cms
|
||||
- octavia:ovsdb-cms
|
||||
- - ovn-chassis:certificates
|
||||
- vault:certificates
|
||||
- - ovn-chassis:ovsdb
|
||||
- ovn-central:ovsdb
|
||||
- - vault:certificates
|
||||
- neutron-api-plugin-ovn:certificates
|
||||
- - vault:certificates
|
||||
- glance:certificates
|
||||
- - vault:certificates
|
||||
- keystone:certificates
|
||||
- - vault:certificates
|
||||
- nova-cloud-controller:certificates
|
||||
- - vault:certificates
|
||||
- placement:certificates
|
||||
- - vault:certificates
|
||||
- octavia:certificates
|
||||
- - vault:certificates
|
||||
- glance-simplestreams-sync:certificates
|
||||
- - hacluster-octavia:ha
|
||||
- octavia:ha
|
||||
- ["octavia-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["nova-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["glance-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["placement-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
applications:
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
octavia-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
nova-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
glance-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
neutron-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
placement-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
vault-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
mysql-innodb-cluster:
|
||||
constraints: mem=3072M
|
||||
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
|
||||
num_units: 3
|
||||
neutron-api:
|
||||
constraints: cores=4
|
||||
charm: cs:~openstack-charmers-next/neutron-api
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: True
|
||||
flat-network-providers: physnet1
|
||||
enable-ml2-port-security: True
|
||||
neutron-security-groups: True
|
||||
nova-cloud-controller:
|
||||
constraints: mem=7168M
|
||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: True
|
||||
network-manager: Neutron
|
||||
nova-compute:
|
||||
constraints: mem=7168M
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
num_units: 2
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: True
|
||||
hacluster-octavia:
|
||||
series: *series
|
||||
charm: cs:~openstack-charmers-next/hacluster
|
||||
ovn-chassis-octavia:
|
||||
charm: cs:~openstack-charmers-next/ovn-chassis
|
||||
octavia:
|
||||
constraints: cores=8
|
||||
series: *series
|
||||
charm: ../../../octavia
|
||||
num_units: 3
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: True
|
||||
loadbalancer-topology: 'ACTIVE_STANDBY'
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
num_units: 1
|
||||
glance-simplestreams-sync:
|
||||
charm: cs:~openstack-charmers-next/glance-simplestreams-sync
|
||||
num_units: 1
|
||||
options:
|
||||
use_swift: False
|
||||
octavia-diskimage-retrofit:
|
||||
charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit
|
||||
options:
|
||||
amp-image-tag: 'octavia-amphora'
|
||||
retrofit-series: *series
|
||||
retrofit-uca-pocket: wallaby
|
||||
placement:
|
||||
charm: cs:~openstack-charmers-next/placement
|
||||
num_units: 1
|
||||
constraints: mem=1G
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: true
|
||||
neutron-api-plugin-ovn:
|
||||
charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn
|
||||
ovn-central:
|
||||
constraints: mem=3072M
|
||||
charm: cs:~openstack-charmers-next/ovn-central
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
ovn-chassis:
|
||||
charm: cs:~openstack-charmers-next/ovn-chassis
|
||||
vault:
|
||||
charm: cs:~openstack-charmers-next/vault
|
||||
num_units: 1
|
||||
|
|
@ -0,0 +1,202 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin cloud:focal-xena
|
||||
|
||||
series: &series focal
|
||||
relations:
|
||||
- - glance:image-service
|
||||
- nova-cloud-controller:image-service
|
||||
- - glance:image-service
|
||||
- nova-compute:image-service
|
||||
- - glance-mysql-router:shared-db
|
||||
- glance:shared-db
|
||||
- - keystone-mysql-router:shared-db
|
||||
- keystone:shared-db
|
||||
- - neutron-mysql-router:shared-db
|
||||
- neutron-api:shared-db
|
||||
- - nova-mysql-router:shared-db
|
||||
- nova-cloud-controller:shared-db
|
||||
- - octavia-mysql-router:shared-db
|
||||
- octavia:shared-db
|
||||
- - keystone:identity-service
|
||||
- glance:identity-service
|
||||
- - keystone:identity-service
|
||||
- nova-cloud-controller:identity-service
|
||||
- - keystone:identity-service
|
||||
- neutron-api:identity-service
|
||||
- - keystone:identity-service
|
||||
- octavia:identity-service
|
||||
- - nova-compute:cloud-compute
|
||||
- nova-cloud-controller:cloud-compute
|
||||
- - rabbitmq-server:amqp
|
||||
- neutron-api:amqp
|
||||
- - rabbitmq-server:amqp
|
||||
- glance:amqp
|
||||
- - rabbitmq-server:amqp
|
||||
- nova-cloud-controller:amqp
|
||||
- - rabbitmq-server:amqp
|
||||
- nova-compute:amqp
|
||||
- - rabbitmq-server:amqp
|
||||
- octavia:amqp
|
||||
- - neutron-api:neutron-api
|
||||
- nova-cloud-controller:neutron-api
|
||||
- - neutron-api:neutron-load-balancer
|
||||
- octavia:neutron-api
|
||||
- - rabbitmq-server:amqp
|
||||
- neutron-openvswitch:amqp
|
||||
- - neutron-api:neutron-plugin-api
|
||||
- neutron-openvswitch:neutron-plugin-api
|
||||
- - neutron-openvswitch:neutron-plugin
|
||||
- nova-compute:neutron-plugin
|
||||
- - rabbitmq-server:amqp
|
||||
- neutron-openvswitch-octavia:amqp
|
||||
- - neutron-api:neutron-plugin-api
|
||||
- neutron-openvswitch-octavia:neutron-plugin-api
|
||||
- - neutron-openvswitch-octavia:neutron-plugin
|
||||
- octavia:neutron-openvswitch
|
||||
- - hacluster-octavia:ha
|
||||
- octavia:ha
|
||||
- - glance-simplestreams-sync:juju-info
|
||||
- octavia-diskimage-retrofit:juju-info
|
||||
- - keystone:identity-service
|
||||
- glance-simplestreams-sync:identity-service
|
||||
- - keystone:identity-credentials
|
||||
- octavia-diskimage-retrofit:identity-credentials
|
||||
- [ placement, placement-mysql-router ]
|
||||
- [ placement, keystone ]
|
||||
- [ placement, nova-cloud-controller ]
|
||||
- - vault:shared-db
|
||||
- vault-mysql-router:shared-db
|
||||
- - vault:certificates
|
||||
- glance:certificates
|
||||
- - vault:certificates
|
||||
- keystone:certificates
|
||||
- - vault:certificates
|
||||
- neutron-api:certificates
|
||||
- - vault:certificates
|
||||
- nova-cloud-controller:certificates
|
||||
- - vault:certificates
|
||||
- octavia:certificates
|
||||
- - vault:certificates
|
||||
- octavia-diskimage-retrofit:certificates
|
||||
- - vault:certificates
|
||||
- glance-simplestreams-sync:certificates
|
||||
- - vault:certificates
|
||||
- placement:certificates
|
||||
- ["octavia-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["nova-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["glance-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["placement-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
applications:
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
octavia-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
nova-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
glance-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
neutron-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
placement-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
vault-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
mysql-innodb-cluster:
|
||||
constraints: mem=3072M
|
||||
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
|
||||
num_units: 3
|
||||
neutron-api:
|
||||
charm: cs:~openstack-charmers-next/neutron-api
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: True
|
||||
flat-network-providers: physnet1
|
||||
enable-ml2-port-security: True
|
||||
neutron-security-groups: True
|
||||
enable-dvr: True
|
||||
manage-neutron-plugin-legacy-mode: True
|
||||
neutron-openvswitch:
|
||||
series: *series
|
||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||
num_units: 0
|
||||
options:
|
||||
debug: True
|
||||
enable-local-dhcp-and-metadata: True
|
||||
use-dvr-snat: True
|
||||
prevent-arp-spoofing: False
|
||||
firewall-driver: openvswitch
|
||||
bridge-mappings: physnet1:br-ex
|
||||
neutron-openvswitch-octavia:
|
||||
series: *series
|
||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||
num_units: 0
|
||||
options:
|
||||
debug: True
|
||||
prevent-arp-spoofing: False
|
||||
firewall-driver: openvswitch
|
||||
nova-cloud-controller:
|
||||
constraints: mem=7168M
|
||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: True
|
||||
network-manager: Neutron
|
||||
nova-compute:
|
||||
constraints: mem=7168M
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
num_units: 2
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: True
|
||||
hacluster-octavia:
|
||||
charm: cs:~openstack-charmers-next/hacluster
|
||||
num_units: 0
|
||||
octavia:
|
||||
constraints: cores=8
|
||||
series: *series
|
||||
charm: ../../../octavia
|
||||
num_units: 3
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: True
|
||||
loadbalancer-topology: 'ACTIVE_STANDBY'
|
||||
vip: 'ADD YOUR VIP HERE'
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
num_units: 1
|
||||
glance-simplestreams-sync:
|
||||
charm: cs:~openstack-charmers-next/glance-simplestreams-sync
|
||||
num_units: 1
|
||||
options:
|
||||
use_swift: False
|
||||
octavia-diskimage-retrofit:
|
||||
charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit
|
||||
options:
|
||||
amp-image-tag: 'octavia-amphora'
|
||||
retrofit-series: *series
|
||||
retrofit-uca-pocket: wallaby
|
||||
placement:
|
||||
charm: cs:~openstack-charmers-next/placement
|
||||
num_units: 1
|
||||
constraints: mem=1G
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: true
|
||||
vault:
|
||||
charm: cs:~openstack-charmers-next/vault
|
||||
num_units: 1
|
||||
|
|
@ -0,0 +1,207 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
series: &series impish
|
||||
relations:
|
||||
- - glance:image-service
|
||||
- nova-cloud-controller:image-service
|
||||
- - glance:image-service
|
||||
- nova-compute:image-service
|
||||
- - glance-mysql-router:shared-db
|
||||
- glance:shared-db
|
||||
- - keystone-mysql-router:shared-db
|
||||
- keystone:shared-db
|
||||
- - neutron-mysql-router:shared-db
|
||||
- neutron-api:shared-db
|
||||
- - nova-mysql-router:shared-db
|
||||
- nova-cloud-controller:shared-db
|
||||
- - octavia-mysql-router:shared-db
|
||||
- octavia:shared-db
|
||||
- - keystone:identity-service
|
||||
- glance:identity-service
|
||||
- - keystone:identity-service
|
||||
- nova-cloud-controller:identity-service
|
||||
- - keystone:identity-service
|
||||
- neutron-api:identity-service
|
||||
- - keystone:identity-service
|
||||
- octavia:identity-service
|
||||
- - nova-compute:cloud-compute
|
||||
- nova-cloud-controller:cloud-compute
|
||||
- - rabbitmq-server:amqp
|
||||
- neutron-api:amqp
|
||||
- - rabbitmq-server:amqp
|
||||
- glance:amqp
|
||||
- - rabbitmq-server:amqp
|
||||
- nova-cloud-controller:amqp
|
||||
- - rabbitmq-server:amqp
|
||||
- nova-compute:amqp
|
||||
- - rabbitmq-server:amqp
|
||||
- octavia:amqp
|
||||
- - neutron-api:neutron-api
|
||||
- nova-cloud-controller:neutron-api
|
||||
- - neutron-api:neutron-load-balancer
|
||||
- octavia:neutron-api
|
||||
- - glance-simplestreams-sync:juju-info
|
||||
- octavia-diskimage-retrofit:juju-info
|
||||
- - keystone:identity-service
|
||||
- glance-simplestreams-sync:identity-service
|
||||
- - keystone:identity-credentials
|
||||
- octavia-diskimage-retrofit:identity-credentials
|
||||
- [ placement, placement-mysql-router ]
|
||||
- [ placement, keystone ]
|
||||
- [ placement, nova-cloud-controller ]
|
||||
- - neutron-api-plugin-ovn:neutron-plugin
|
||||
- neutron-api:neutron-plugin-api-subordinate
|
||||
- - vault:shared-db
|
||||
- vault-mysql-router:shared-db
|
||||
- - ovn-central:certificates
|
||||
- vault:certificates
|
||||
- - ovn-central:ovsdb-cms
|
||||
- neutron-api-plugin-ovn:ovsdb-cms
|
||||
- - neutron-api:certificates
|
||||
- vault:certificates
|
||||
- - ovn-chassis:nova-compute
|
||||
- nova-compute:neutron-plugin
|
||||
- - ovn-chassis-octavia:ovsdb-subordinate
|
||||
- octavia:ovsdb-subordinate
|
||||
- - ovn-chassis-octavia:certificates
|
||||
- vault:certificates
|
||||
- - ovn-chassis-octavia:ovsdb
|
||||
- ovn-central:ovsdb
|
||||
- - ovn-central:ovsdb-cms
|
||||
- octavia:ovsdb-cms
|
||||
- - ovn-chassis:certificates
|
||||
- vault:certificates
|
||||
- - ovn-chassis:ovsdb
|
||||
- ovn-central:ovsdb
|
||||
- - vault:certificates
|
||||
- neutron-api-plugin-ovn:certificates
|
||||
- - vault:certificates
|
||||
- glance:certificates
|
||||
- - vault:certificates
|
||||
- keystone:certificates
|
||||
- - vault:certificates
|
||||
- nova-cloud-controller:certificates
|
||||
- - vault:certificates
|
||||
- placement:certificates
|
||||
- - vault:certificates
|
||||
- octavia:certificates
|
||||
- - vault:certificates
|
||||
- glance-simplestreams-sync:certificates
|
||||
- - hacluster-octavia:ha
|
||||
- octavia:ha
|
||||
- ["octavia-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["nova-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["glance-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["placement-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
applications:
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
octavia-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
nova-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
glance-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
neutron-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
placement-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
vault-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
mysql-innodb-cluster:
|
||||
constraints: mem=3072M
|
||||
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
|
||||
num_units: 3
|
||||
neutron-api:
|
||||
constraints: cores=4
|
||||
charm: cs:~openstack-charmers-next/neutron-api
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: True
|
||||
flat-network-providers: physnet1
|
||||
enable-ml2-port-security: True
|
||||
neutron-security-groups: True
|
||||
nova-cloud-controller:
|
||||
constraints: mem=7168M
|
||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: True
|
||||
network-manager: Neutron
|
||||
nova-compute:
|
||||
constraints: mem=7168M
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
num_units: 2
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: True
|
||||
hacluster-octavia:
|
||||
series: *series
|
||||
charm: cs:~openstack-charmers-next/hacluster
|
||||
ovn-chassis-octavia:
|
||||
charm: cs:~openstack-charmers-next/ovn-chassis
|
||||
octavia:
|
||||
constraints: cores=8
|
||||
series: *series
|
||||
charm: ../../../octavia
|
||||
num_units: 3
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: True
|
||||
loadbalancer-topology: 'ACTIVE_STANDBY'
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
num_units: 1
|
||||
glance-simplestreams-sync:
|
||||
charm: cs:~openstack-charmers-next/glance-simplestreams-sync
|
||||
num_units: 1
|
||||
options:
|
||||
use_swift: False
|
||||
mirror_list: "[{url: 'http://cloud-images.ubuntu.com/releases/',
|
||||
name_prefix: 'ubuntu:released',
|
||||
path: 'streams/v1/index.sjson', max: 1,
|
||||
item_filters: [
|
||||
'release~(bionic|focal|hirsute)',
|
||||
'arch~(x86_64|amd64)',
|
||||
'ftype~(disk1.img|disk.img)']}]"
|
||||
octavia-diskimage-retrofit:
|
||||
charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit
|
||||
options:
|
||||
amp-image-tag: 'octavia-amphora'
|
||||
retrofit-series: *series
|
||||
placement:
|
||||
charm: cs:~openstack-charmers-next/placement
|
||||
num_units: 1
|
||||
constraints: mem=1G
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: true
|
||||
neutron-api-plugin-ovn:
|
||||
charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn
|
||||
ovn-central:
|
||||
constraints: mem=3072M
|
||||
charm: cs:~openstack-charmers-next/ovn-central
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
ovn-chassis:
|
||||
charm: cs:~openstack-charmers-next/ovn-chassis
|
||||
vault:
|
||||
charm: cs:~openstack-charmers-next/vault
|
||||
num_units: 1
|
||||
|
|
@ -0,0 +1,208 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
series: &series impish
|
||||
relations:
|
||||
- - glance:image-service
|
||||
- nova-cloud-controller:image-service
|
||||
- - glance:image-service
|
||||
- nova-compute:image-service
|
||||
- - glance-mysql-router:shared-db
|
||||
- glance:shared-db
|
||||
- - keystone-mysql-router:shared-db
|
||||
- keystone:shared-db
|
||||
- - neutron-mysql-router:shared-db
|
||||
- neutron-api:shared-db
|
||||
- - nova-mysql-router:shared-db
|
||||
- nova-cloud-controller:shared-db
|
||||
- - octavia-mysql-router:shared-db
|
||||
- octavia:shared-db
|
||||
- - keystone:identity-service
|
||||
- glance:identity-service
|
||||
- - keystone:identity-service
|
||||
- nova-cloud-controller:identity-service
|
||||
- - keystone:identity-service
|
||||
- neutron-api:identity-service
|
||||
- - keystone:identity-service
|
||||
- octavia:identity-service
|
||||
- - nova-compute:cloud-compute
|
||||
- nova-cloud-controller:cloud-compute
|
||||
- - rabbitmq-server:amqp
|
||||
- neutron-api:amqp
|
||||
- - rabbitmq-server:amqp
|
||||
- glance:amqp
|
||||
- - rabbitmq-server:amqp
|
||||
- nova-cloud-controller:amqp
|
||||
- - rabbitmq-server:amqp
|
||||
- nova-compute:amqp
|
||||
- - rabbitmq-server:amqp
|
||||
- octavia:amqp
|
||||
- - neutron-api:neutron-api
|
||||
- nova-cloud-controller:neutron-api
|
||||
- - neutron-api:neutron-load-balancer
|
||||
- octavia:neutron-api
|
||||
- - rabbitmq-server:amqp
|
||||
- neutron-openvswitch:amqp
|
||||
- - neutron-api:neutron-plugin-api
|
||||
- neutron-openvswitch:neutron-plugin-api
|
||||
- - neutron-openvswitch:neutron-plugin
|
||||
- nova-compute:neutron-plugin
|
||||
- - rabbitmq-server:amqp
|
||||
- neutron-openvswitch-octavia:amqp
|
||||
- - neutron-api:neutron-plugin-api
|
||||
- neutron-openvswitch-octavia:neutron-plugin-api
|
||||
- - neutron-openvswitch-octavia:neutron-plugin
|
||||
- octavia:neutron-openvswitch
|
||||
- - hacluster-octavia:ha
|
||||
- octavia:ha
|
||||
- - glance-simplestreams-sync:juju-info
|
||||
- octavia-diskimage-retrofit:juju-info
|
||||
- - keystone:identity-service
|
||||
- glance-simplestreams-sync:identity-service
|
||||
- - keystone:identity-credentials
|
||||
- octavia-diskimage-retrofit:identity-credentials
|
||||
- [ placement, placement-mysql-router ]
|
||||
- [ placement, keystone ]
|
||||
- [ placement, nova-cloud-controller ]
|
||||
- - vault:shared-db
|
||||
- vault-mysql-router:shared-db
|
||||
- - vault:certificates
|
||||
- glance:certificates
|
||||
- - vault:certificates
|
||||
- keystone:certificates
|
||||
- - vault:certificates
|
||||
- neutron-api:certificates
|
||||
- - vault:certificates
|
||||
- nova-cloud-controller:certificates
|
||||
- - vault:certificates
|
||||
- octavia:certificates
|
||||
- - vault:certificates
|
||||
- octavia-diskimage-retrofit:certificates
|
||||
- - vault:certificates
|
||||
- glance-simplestreams-sync:certificates
|
||||
- - vault:certificates
|
||||
- placement:certificates
|
||||
- ["octavia-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["nova-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["glance-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["placement-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
- ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
|
||||
applications:
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
octavia-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
keystone-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
nova-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
glance-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
neutron-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
placement-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
vault-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
mysql-innodb-cluster:
|
||||
constraints: mem=3072M
|
||||
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
|
||||
num_units: 3
|
||||
neutron-api:
|
||||
charm: cs:~openstack-charmers-next/neutron-api
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: True
|
||||
flat-network-providers: physnet1
|
||||
enable-ml2-port-security: True
|
||||
neutron-security-groups: True
|
||||
enable-dvr: True
|
||||
manage-neutron-plugin-legacy-mode: True
|
||||
neutron-openvswitch:
|
||||
series: *series
|
||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||
num_units: 0
|
||||
options:
|
||||
debug: True
|
||||
enable-local-dhcp-and-metadata: True
|
||||
use-dvr-snat: True
|
||||
prevent-arp-spoofing: False
|
||||
firewall-driver: openvswitch
|
||||
bridge-mappings: physnet1:br-ex
|
||||
neutron-openvswitch-octavia:
|
||||
series: *series
|
||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||
num_units: 0
|
||||
options:
|
||||
debug: True
|
||||
prevent-arp-spoofing: False
|
||||
firewall-driver: openvswitch
|
||||
nova-cloud-controller:
|
||||
constraints: mem=7168M
|
||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: True
|
||||
network-manager: Neutron
|
||||
nova-compute:
|
||||
constraints: mem=7168M
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
num_units: 2
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: True
|
||||
hacluster-octavia:
|
||||
charm: cs:~openstack-charmers-next/hacluster
|
||||
num_units: 0
|
||||
octavia:
|
||||
constraints: cores=8
|
||||
series: *series
|
||||
charm: ../../../octavia
|
||||
num_units: 3
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: True
|
||||
loadbalancer-topology: 'ACTIVE_STANDBY'
|
||||
vip: 'ADD YOUR VIP HERE'
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
num_units: 1
|
||||
glance-simplestreams-sync:
|
||||
charm: cs:~openstack-charmers-next/glance-simplestreams-sync
|
||||
num_units: 1
|
||||
options:
|
||||
use_swift: False
|
||||
mirror_list: "[{url: 'http://cloud-images.ubuntu.com/releases/',
|
||||
name_prefix: 'ubuntu:released',
|
||||
path: 'streams/v1/index.sjson', max: 1,
|
||||
item_filters: [
|
||||
'release~(bionic|focal|hirsute)',
|
||||
'arch~(x86_64|amd64)',
|
||||
'ftype~(disk1.img|disk.img)']}]"
|
||||
octavia-diskimage-retrofit:
|
||||
charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit
|
||||
options:
|
||||
amp-image-tag: 'octavia-amphora'
|
||||
retrofit-series: *series
|
||||
placement:
|
||||
charm: cs:~openstack-charmers-next/placement
|
||||
num_units: 1
|
||||
constraints: mem=1G
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
debug: true
|
||||
vault:
|
||||
charm: cs:~openstack-charmers-next/vault
|
||||
num_units: 1
|
||||
|
|
@ -12,10 +12,10 @@ gate_bundles:
|
|||
- focal-victoria-ha-ovn
|
||||
- focal-victoria-ha
|
||||
- no-amphora: focal-victoria-no-amphora
|
||||
- groovy-victoria-ha-ovn
|
||||
- groovy-victoria-ha
|
||||
- focal-wallaby-ha-ovn
|
||||
- focal-wallaby-ha
|
||||
- groovy-victoria-ha-ovn
|
||||
- groovy-victoria-ha
|
||||
- hirsute-wallaby-ha-ovn
|
||||
- hirsute-wallaby-ha
|
||||
|
||||
|
|
@ -23,12 +23,17 @@ smoke_bundles:
|
|||
- focal-ussuri-ha-ovn
|
||||
- focal-ussuri-ha
|
||||
|
||||
comment: |
|
||||
The `bionic-rocky-lxd` bundle currently fails due to a bug in LXD.
|
||||
https://github.com/lxc/lxd/issues/4947
|
||||
dev_bundles:
|
||||
- bionic-rocky-ha
|
||||
- bionic-rocky-lxd
|
||||
- focal-xena-ha-ovn
|
||||
- focal-xena-ha
|
||||
- impish-xena-ha-ovn
|
||||
- impish-xena-ha
|
||||
|
||||
comment: |
|
||||
The `bionic-rocky-lxd` bundle currently fails due to a bug in LXD.
|
||||
https://github.com/lxc/lxd/issues/4947
|
||||
|
||||
target_deploy_status:
|
||||
octavia:
|
||||
|
|
@ -86,5 +91,5 @@ tests_options:
|
|||
force_deploy:
|
||||
- groovy-victoria-ha-ovn
|
||||
- groovy-victoria-ha
|
||||
- hirsute-wallaby-ha-ovn
|
||||
- hirsute-wallaby-ha
|
||||
- impish-xena-ha-ovn
|
||||
- impish-xena-ha
|
||||
|
|
|
|||
|
|
@ -22,12 +22,12 @@ skip_missing_interpreters = False
|
|||
requires = pip < 20.3
|
||||
virtualenv < 20.0
|
||||
# NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci
|
||||
minversion = 3.2.0
|
||||
minversion = 3.18.0
|
||||
|
||||
[testenv]
|
||||
setenv = VIRTUAL_ENV={envdir}
|
||||
PYTHONHASHSEED=0
|
||||
whitelist_externals = juju
|
||||
allowlist_externals = juju
|
||||
passenv = HOME TERM CS_* OS_* TEST_*
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
install_command =
|
||||
|
|
|
|||
17
tox.ini
17
tox.ini
|
|
@ -11,6 +11,21 @@ envlist = pep8,py3
|
|||
sitepackages = False
|
||||
# NOTE: Avoid false positives by not skipping missing interpreters.
|
||||
skip_missing_interpreters = False
|
||||
# NOTES:
|
||||
# * We avoid the new dependency resolver by pinning pip < 20.3, see
|
||||
# https://github.com/pypa/pip/issues/9187
|
||||
# * Pinning dependencies requires tox >= 3.2.0, see
|
||||
# https://tox.readthedocs.io/en/latest/config.html#conf-requires
|
||||
# * It is also necessary to pin virtualenv as a newer virtualenv would still
|
||||
# lead to fetching the latest pip in the func* tox targets, see
|
||||
# https://stackoverflow.com/a/38133283
|
||||
requires =
|
||||
pip < 20.3
|
||||
virtualenv < 20.0
|
||||
setuptools<50.0.0
|
||||
|
||||
# NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci
|
||||
minversion = 3.18.0
|
||||
|
||||
[testenv]
|
||||
setenv = VIRTUAL_ENV={envdir}
|
||||
|
|
@ -21,7 +36,7 @@ setenv = VIRTUAL_ENV={envdir}
|
|||
JUJU_REPOSITORY={toxinidir}/build
|
||||
passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY
|
||||
install_command =
|
||||
pip install {opts} {packages}
|
||||
{toxinidir}/pip.sh install {opts} {packages}
|
||||
deps =
|
||||
-r{toxinidir}/requirements.txt
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue