diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..b9e8646 --- /dev/null +++ b/.gitreview @@ -0,0 +1,4 @@ +[gerrit] +host=review.opendev.org +port=29418 +project=x/charm-ovn-chassis.git diff --git a/.zuul.yaml b/.zuul.yaml new file mode 100644 index 0000000..7cb4023 --- /dev/null +++ b/.zuul.yaml @@ -0,0 +1,4 @@ +- project: + templates: + - openstack-python3-train-jobs + - openstack-cover-jobs diff --git a/src/lib/charm/openstack/ovn_chassis.py b/src/lib/charm/openstack/ovn_chassis.py index dbf015c..91aafb1 100644 --- a/src/lib/charm/openstack/ovn_chassis.py +++ b/src/lib/charm/openstack/ovn_chassis.py @@ -1,3 +1,4 @@ +import collections import os import subprocess @@ -42,7 +43,14 @@ class OVNChassisCharmRelationAdapters( class OVNChassisCharm(charms_openstack.charm.OpenStackCharm): - release = 'stein' + # OpenvSwitch and OVN is distributed as part of the Ubuntu Cloud Archive + # Pockets get their name from OpenStack releases + release = 'train' + package_codenames = { + 'ovn-host': collections.OrderedDict([ + ('2.12', 'train'), + ]), + } name = 'ovn-chassis' packages = ['ovn-host'] services = ['ovn-host'] diff --git a/src/tests/bundles/bionic.yaml b/src/tests/bundles/bionic.yaml index 9b9821b..3ffcbf2 100644 --- a/src/tests/bundles/bionic.yaml +++ b/src/tests/bundles/bionic.yaml @@ -21,7 +21,7 @@ applications: charm: cs:~openstack-charmers-next/ovn-central num_units: 3 options: - source: cloud:bionic-stein + source: cloud:bionic-train ubuntu: charm: cs:ubuntu num_units: 1 diff --git a/src/tests/bundles/disco.yaml b/src/tests/bundles/eoan.yaml similarity index 82% rename from src/tests/bundles/disco.yaml rename to src/tests/bundles/eoan.yaml index 1298f18..2bb68c4 100644 --- a/src/tests/bundles/disco.yaml +++ b/src/tests/bundles/eoan.yaml @@ -1,4 +1,4 @@ -series: disco +series: eoan relations: - - vault:shared-db - mysql:shared-db @@ -12,8 +12,8 @@ relations: - vault:certificates applications: mysql: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 + charm: cs:~openstack-charmers-next/mysql-innodb-cluster + num_units: 3 vault: charm: cs:~openstack-charmers-next/vault num_units: 1 @@ -24,5 +24,5 @@ applications: charm: cs:ubuntu num_units: 1 ovn-chassis: - series: disco + series: eoan charm: cs:~openstack-charmers-next/ovn-chassis diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 2611f40..b08e6cc 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,6 +1,6 @@ charm_name: ovn-chassis gate_bundles: -- disco +- eoan - bionic smoke_bundles: - bionic