Testing updates

Change-Id: I34b0c71be24db90255d5a8866b81444589b57507
This commit is contained in:
David Ames 2019-10-25 13:24:50 -07:00
parent e15346f46a
commit 91f80513db
6 changed files with 90 additions and 3 deletions

View File

@ -0,0 +1 @@
eoan-full.yaml

View File

@ -0,0 +1,69 @@
series: eoan
relations:
- ["cinder:shared-db", "cinder-mysql-router:shared-db"]
- ["cinder-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
- ["keystone:shared-db", "keystone-mysql-router:shared-db"]
- ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
- ["glance:shared-db", "glance-mysql-router:shared-db"]
- ["glance-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
- ["nova-cloud-controller:shared-db", "nova-mysql-router:shared-db"]
- ["nova-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
- ["neutron-api:shared-db", "neutron-mysql-router:shared-db"]
- ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
- ["cinder:identity-service", "keystone:identity-service"]
- ["cinder:amqp", "rabbitmq-server:amqp" ]
- ["glance:identity-service", "keystone:identity-service"]
- ["memcached:cache", "nova-cloud-controller:memcache"]
- ["neutron-api:identity-service", "keystone:identity-service"]
- ["neutron-api:amqp", "rabbitmq-server:amqp" ]
- ["nova-cloud-controller:amqp", "rabbitmq-server:amqp" ]
- ["nova-cloud-controller:cloud-compute", "nova-compute:cloud-compute" ]
- ["nova-cloud-controller:identity-service", "keystone:identity-service" ]
- ["nova-cloud-controller:image-service", "glance:image-service" ]
- ["nova-compute:amqp", "rabbitmq-server:amqp" ]
- ["nova-compute:image-service", "glance:image-service" ]
- ["placement:placement", "nova-cloud-controller:placement"]
- ["placement:identity-service", "keystone:identity-service"]
- ["placement:shared-db", "mysql-innodb-cluster:shared-db"]
applications:
cinder-mysql-router:
charm: ../../../mysql-router
keystone-mysql-router:
charm: ../../../mysql-router
glance-mysql-router:
charm: ../../../mysql-router
nova-mysql-router:
charm: ../../../mysql-router
neutron-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
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
cinder:
charm: cs:~openstack-charmers-next/cinder
num_units: 1
memcached:
charm: cs:memcached
num_units: 1
series: bionic
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
num_units: 1
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
num_units: 1
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
num_units: 1
placement:
charm: cs:~openstack-charmers-next/placement
num_units: 1
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1

View File

@ -9,8 +9,6 @@ applications:
series: eoan
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: distro-proposed
keystone:
series: eoan
charm: cs:~openstack-charmers-next/keystone

View File

@ -0,0 +1 @@
eoan-ha.yaml.j2

View File

@ -0,0 +1,16 @@
applications:
keystone:
num_units: 3
options:
vip: {{TEST_VIP00}}
nova-cloud-controller:
num_units: 3
options:
vip: {{TEST_VIP01}}
keystone-hacluster:
charm: cs:~openstack-charmers-next/hacluster
nova-hacluster:
charm: cs:~openstack-charmers-next/hacluster
relations:
- ["keystone:ha", "keystone-hacluster:ha"]
- ["nova-cloud-controller:ha", "nova-hacluster:ha"]

View File

@ -1,11 +1,13 @@
charm_name: mysql-router
configure:
- zaza.openstack.charm_tests.keystone.setup.add_demo_user
- full_model:
- zaza.openstack.charm_tests.glance.setup.add_lts_image
tests:
# Validates DB connectivity
- zaza.openstack.charm_tests.keystone.tests.AuthenticationAuthorizationTest
dev_bundles:
gate_bundles:
- eoan
- full_model: eoan-full-ha
smoke_bundles:
- eoan