Add impish bundles
- add non-voting impish bundles - remove groovy bundles - Fix series bugs in groovy, hirsute bundles - rebuild to pick up charm-helpers changes - update tox/pip.sh to ensure setuptools<50.0.0 Change-Id: I6276fda2ea879d4dbec61d4ed2597cc5a8b48cf2
This commit is contained in:
parent
9cc7f6f13a
commit
bff22b4d73
13
osci.yaml
13
osci.yaml
|
@ -4,11 +4,13 @@
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- focal
|
- focal
|
||||||
- groovy
|
|
||||||
- hirsute
|
- hirsute
|
||||||
|
- impish:
|
||||||
|
voting: false
|
||||||
- full_model_ha-focal-full-ha
|
- full_model_ha-focal-full-ha
|
||||||
- full_model_ha-groovy-full-ha
|
|
||||||
- full_model_ha-hirsute-full-ha
|
- full_model_ha-hirsute-full-ha
|
||||||
|
- full_model_ha-impish-full-ha:
|
||||||
|
voting: false
|
||||||
vars:
|
vars:
|
||||||
needs_charm_build: true
|
needs_charm_build: true
|
||||||
charm_build_name: mysql-router
|
charm_build_name: mysql-router
|
||||||
|
@ -34,3 +36,10 @@
|
||||||
- focal
|
- focal
|
||||||
vars:
|
vars:
|
||||||
tox_extra_args: full_model_ha:hirsute-full-ha
|
tox_extra_args: full_model_ha:hirsute-full-ha
|
||||||
|
- job:
|
||||||
|
name: full_model_ha-impish-full-ha
|
||||||
|
parent: func-target
|
||||||
|
dependencies:
|
||||||
|
- focal
|
||||||
|
vars:
|
||||||
|
tox_extra_args: full_model_ha:impish-full-ha
|
||||||
|
|
2
rebuild
2
rebuild
|
@ -2,4 +2,4 @@
|
||||||
# when dependencies of the charm change,
|
# when dependencies of the charm change,
|
||||||
# but nothing in the charm needs to.
|
# but nothing in the charm needs to.
|
||||||
# simply change the uuid to something new
|
# simply change the uuid to something new
|
||||||
fa205314-b3eb-11eb-b8a1-770a5c5f3f83
|
53d82992-1178-11ec-8ad5-83e160732aab
|
||||||
|
|
|
@ -79,7 +79,7 @@ applications:
|
||||||
memcached:
|
memcached:
|
||||||
charm: cs:memcached
|
charm: cs:memcached
|
||||||
num_units: 1
|
num_units: 1
|
||||||
series: bionic
|
series: focal
|
||||||
relations:
|
relations:
|
||||||
- - neutron-api:amqp
|
- - neutron-api:amqp
|
||||||
- rabbitmq-server:amqp
|
- rabbitmq-server:amqp
|
||||||
|
|
|
@ -1,10 +1,8 @@
|
||||||
series: groovy
|
series: groovy
|
||||||
applications:
|
applications:
|
||||||
keystone-mysql-router:
|
keystone-mysql-router:
|
||||||
series: groovy
|
|
||||||
charm: ../../../mysql-router
|
charm: ../../../mysql-router
|
||||||
vault-mysql-router:
|
vault-mysql-router:
|
||||||
series: groovy
|
|
||||||
charm: ../../../mysql-router
|
charm: ../../../mysql-router
|
||||||
mysql-innodb-cluster:
|
mysql-innodb-cluster:
|
||||||
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
|
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
|
||||||
|
|
|
@ -79,7 +79,7 @@ applications:
|
||||||
memcached:
|
memcached:
|
||||||
charm: cs:memcached
|
charm: cs:memcached
|
||||||
num_units: 1
|
num_units: 1
|
||||||
series: bionic
|
series: focal
|
||||||
relations:
|
relations:
|
||||||
- - neutron-api:amqp
|
- - neutron-api:amqp
|
||||||
- rabbitmq-server:amqp
|
- rabbitmq-server:amqp
|
||||||
|
|
|
@ -1,10 +1,8 @@
|
||||||
series: hirsute
|
series: hirsute
|
||||||
applications:
|
applications:
|
||||||
keystone-mysql-router:
|
keystone-mysql-router:
|
||||||
series: groovy
|
|
||||||
charm: ../../../mysql-router
|
charm: ../../../mysql-router
|
||||||
vault-mysql-router:
|
vault-mysql-router:
|
||||||
series: groovy
|
|
||||||
charm: ../../../mysql-router
|
charm: ../../../mysql-router
|
||||||
mysql-innodb-cluster:
|
mysql-innodb-cluster:
|
||||||
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
|
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
impish-full.yaml
|
|
@ -0,0 +1,159 @@
|
||||||
|
variables:
|
||||||
|
openstack-origin: &openstack-origin distro
|
||||||
|
|
||||||
|
series: &series impish
|
||||||
|
|
||||||
|
applications:
|
||||||
|
keystone-mysql-router:
|
||||||
|
charm: ../../../mysql-router
|
||||||
|
nova-mysql-router:
|
||||||
|
charm: ../../../mysql-router
|
||||||
|
glance-mysql-router:
|
||||||
|
charm: ../../../mysql-router
|
||||||
|
neutron-mysql-router:
|
||||||
|
charm: ../../../mysql-router
|
||||||
|
placement-mysql-router:
|
||||||
|
charm: ../../../mysql-router
|
||||||
|
vault-mysql-router:
|
||||||
|
charm: ../../../mysql-router
|
||||||
|
mysql-innodb-cluster:
|
||||||
|
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
|
||||||
|
num_units: 3
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
keystone:
|
||||||
|
charm: cs:~openstack-charmers-next/keystone
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
rabbitmq-server:
|
||||||
|
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
vault:
|
||||||
|
charm: cs:~openstack-charmers-next/vault
|
||||||
|
num_units: 1
|
||||||
|
ovn-central:
|
||||||
|
charm: cs:~openstack-charmers-next/ovn-central
|
||||||
|
num_units: 3
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
neutron-api-plugin-ovn:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn
|
||||||
|
neutron-api:
|
||||||
|
charm: cs:~openstack-charmers-next/neutron-api
|
||||||
|
series: *series
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
flat-network-providers: physnet1
|
||||||
|
neutron-security-groups: true
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
glance:
|
||||||
|
charm: cs:~openstack-charmers-next/glance
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
nova-cloud-controller:
|
||||||
|
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
network-manager: Neutron
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
ovn-chassis:
|
||||||
|
charm: cs:~openstack-charmers-next/ovn-chassis
|
||||||
|
nova-compute:
|
||||||
|
charm: cs:~openstack-charmers-next/nova-compute
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
config-flags: default_ephemeral_format=ext4
|
||||||
|
enable-live-migration: true
|
||||||
|
enable-resize: true
|
||||||
|
migration-auth-type: ssh
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
placement:
|
||||||
|
charm: cs:~openstack-charmers-next/placement
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
memcached:
|
||||||
|
charm: cs:memcached
|
||||||
|
num_units: 1
|
||||||
|
series: focal
|
||||||
|
relations:
|
||||||
|
- - neutron-api:amqp
|
||||||
|
- rabbitmq-server:amqp
|
||||||
|
- - neutron-api:neutron-api
|
||||||
|
- nova-cloud-controller:neutron-api
|
||||||
|
- - neutron-api:identity-service
|
||||||
|
- keystone:identity-service
|
||||||
|
- - nova-cloud-controller:amqp
|
||||||
|
- rabbitmq-server:amqp
|
||||||
|
- - nova-compute:amqp
|
||||||
|
- rabbitmq-server:amqp
|
||||||
|
- - nova-cloud-controller:identity-service
|
||||||
|
- keystone:identity-service
|
||||||
|
- - nova-cloud-controller:cloud-compute
|
||||||
|
- nova-compute:cloud-compute
|
||||||
|
- - glance:identity-service
|
||||||
|
- keystone:identity-service
|
||||||
|
- - glance:amqp
|
||||||
|
- rabbitmq-server:amqp
|
||||||
|
- - nova-compute:image-service
|
||||||
|
- glance:image-service
|
||||||
|
- - nova-cloud-controller:image-service
|
||||||
|
- glance:image-service
|
||||||
|
- - placement:identity-service
|
||||||
|
- keystone:identity-service
|
||||||
|
- - placement:placement
|
||||||
|
- nova-cloud-controller:placement
|
||||||
|
- - neutron-api-plugin-ovn:neutron-plugin
|
||||||
|
- neutron-api:neutron-plugin-api-subordinate
|
||||||
|
- - 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: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
|
||||||
|
- - memcached:cache
|
||||||
|
- nova-cloud-controller:memcache
|
||||||
|
- - keystone:shared-db
|
||||||
|
- keystone-mysql-router:shared-db
|
||||||
|
- - glance:shared-db
|
||||||
|
- glance-mysql-router:shared-db
|
||||||
|
- - nova-cloud-controller:shared-db
|
||||||
|
- nova-mysql-router:shared-db
|
||||||
|
- - neutron-api:shared-db
|
||||||
|
- neutron-mysql-router:shared-db
|
||||||
|
- - placement:shared-db
|
||||||
|
- placement-mysql-router:shared-db
|
||||||
|
- - vault:shared-db
|
||||||
|
- vault-mysql-router:shared-db
|
||||||
|
- - 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
|
|
@ -0,0 +1,28 @@
|
||||||
|
series: impish
|
||||||
|
applications:
|
||||||
|
keystone-mysql-router:
|
||||||
|
charm: ../../../mysql-router
|
||||||
|
vault-mysql-router:
|
||||||
|
charm: ../../../mysql-router
|
||||||
|
mysql-innodb-cluster:
|
||||||
|
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
|
||||||
|
num_units: 3
|
||||||
|
keystone:
|
||||||
|
charm: cs:~openstack-charmers-next/keystone
|
||||||
|
num_units: 1
|
||||||
|
vault:
|
||||||
|
charm: cs:~openstack-charmers-next/vault
|
||||||
|
num_units: 1
|
||||||
|
relations:
|
||||||
|
- - vault:certificates
|
||||||
|
- mysql-innodb-cluster:certificates
|
||||||
|
- - vault:certificates
|
||||||
|
- keystone:certificates
|
||||||
|
- - keystone:shared-db
|
||||||
|
- keystone-mysql-router:shared-db
|
||||||
|
- - vault:shared-db
|
||||||
|
- vault-mysql-router:shared-db
|
||||||
|
- - keystone-mysql-router:db-router
|
||||||
|
- mysql-innodb-cluster:db-router
|
||||||
|
- - vault-mysql-router:db-router
|
||||||
|
- mysql-innodb-cluster:db-router
|
|
@ -0,0 +1 @@
|
||||||
|
full-ha.yaml.j2
|
|
@ -23,12 +23,14 @@ tests:
|
||||||
|
|
||||||
gate_bundles:
|
gate_bundles:
|
||||||
- full_model_ha: focal-full-ha
|
- full_model_ha: focal-full-ha
|
||||||
- groovy
|
|
||||||
- full_model_ha: groovy-full-ha
|
|
||||||
|
|
||||||
dev_bundles:
|
dev_bundles:
|
||||||
|
- groovy
|
||||||
|
- full_model_ha: groovy-full-ha
|
||||||
- hirsute
|
- hirsute
|
||||||
- full_model_ha: hirsute-full-ha
|
- full_model_ha: hirsute-full-ha
|
||||||
|
- impish
|
||||||
|
- full_model_ha: impish-full-ha
|
||||||
|
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- focal
|
- focal
|
||||||
|
@ -38,8 +40,10 @@ tests_options:
|
||||||
principle-app-name: keystone
|
principle-app-name: keystone
|
||||||
hacluster-charm-name: hacluster
|
hacluster-charm-name: hacluster
|
||||||
force_deploy:
|
force_deploy:
|
||||||
- hirsute
|
- groovy
|
||||||
- hirsute-full-ha
|
- groovy-full-ha
|
||||||
|
- impish
|
||||||
|
- impish-full-ha
|
||||||
|
|
||||||
target_deploy_status:
|
target_deploy_status:
|
||||||
neutron-api-plugin-ovn:
|
neutron-api-plugin-ovn:
|
||||||
|
|
Loading…
Reference in New Issue