openstack
/
charm-masakari-monitors
Code Issues Proposed changes

Merge "Add upstream testing and review"

This commit is contained in:
Zuul 2019-08-20 19:25:01 +00:00 committed by Gerrit Code Review
parent 9040600a6d 2e214d66c6
commit cbdd7ad3d2
6 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/test-requirements.txt
View File

@ -1,2 +1,3 @@
# zaza
git+https://github.com/openstack-charmers/zaza.git#egg=zaza
git+https://github.com/openstack-charmers/zaza.git#egg=zaza;python_version>='3.0'
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack

2
src/tests/bundles/bionic-rocky-pacemaker-remote-ssl.yaml
View File

@ -165,7 +165,7 @@ applications:
num_units: 3
options:
openstack-origin: cloud:bionic-rocky/proposed
vip: 10.5.110.1
evacuation-delay: 60
ceph-mon:
charm: ceph-mon
num_units: 3

1
src/tests/bundles/bionic-rocky-pacemaker-remote.yaml
View File

@ -151,7 +151,6 @@ applications:
num_units: 3
options:
openstack-origin: cloud:bionic-rocky/proposed
vip: 10.5.110.1
ceph-mon:
charm: ceph-mon
num_units: 3

4
src/tests/bundles/overlays/bionic-rocky-pacemaker-remote-ssl.yaml.j2 Normal file
View File

@ -0,0 +1,4 @@
applications:
masakari:
options:
vip: '{{ OS_VIP00 }}'

1
src/tests/bundles/overlays/bionic-rocky-pacemaker-remote.yaml.j2 Symbolic link
View File

@ -0,0 +1 @@
bionic-rocky-pacemaker-remote-ssl.yaml.j2

16
src/tests/tests.yaml
View File

@ -1,14 +1,14 @@
charm_name: masakari-monitors
tests:
- zaza.charm_tests.masakari.tests.MasakariTest
- zaza.openstack.charm_tests.masakari.tests.MasakariTest
configure:
- zaza.charm_tests.vault.setup.auto_inititialize
- zaza.charm_tests.glance.setup.add_cirros_image
- zaza.charm_tests.glance.setup.add_lts_image
- zaza.charm_tests.neutron.setup.basic_overcloud_network
- zaza.charm_tests.nova.setup.create_flavors
- zaza.charm_tests.nova.setup.manage_ssh_key
- zaza.charm_tests.masakari.setup.create_segments
- zaza.openstack.charm_tests.vault.setup.auto_initialize
- zaza.openstack.charm_tests.glance.setup.add_cirros_image
- zaza.openstack.charm_tests.glance.setup.add_lts_image
- zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
- zaza.openstack.charm_tests.nova.setup.create_flavors
- zaza.openstack.charm_tests.nova.setup.manage_ssh_key
- zaza.openstack.charm_tests.masakari.setup.create_segments
gate_bundles:
- bionic-rocky-pacemaker-remote-ssl
smoke_bundles: