diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..7300cea --- /dev/null +++ b/.gitreview @@ -0,0 +1,4 @@ +[gerrit] +host=review.opendev.org +port=29418 +project=x/charm-ovn-central.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_central.py b/src/lib/charm/openstack/ovn_central.py index aa1a9b5..1119cd1 100644 --- a/src/lib/charm/openstack/ovn_central.py +++ b/src/lib/charm/openstack/ovn_central.py @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import collections import os import subprocess @@ -48,7 +49,14 @@ def ovn_ca_cert(cls): class OVNCentralCharm(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-central': collections.OrderedDict([ + ('2.12', 'train'), + ]), + } name = 'ovn-central' packages = ['ovn-central'] services = ['ovn-central'] diff --git a/src/metadata.yaml b/src/metadata.yaml index 16dea36..95e2425 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -25,7 +25,7 @@ tags: - networking series: - bionic - - disco + - eoan subordinate: false provides: ovsdb: diff --git a/src/test-requirements.txt b/src/test-requirements.txt index 5a78c3e..3640c8b 100644 --- a/src/test-requirements.txt +++ b/src/test-requirements.txt @@ -8,4 +8,4 @@ flake8>=2.2.4,<=2.4.1 stestr>=2.2.0 requests>=2.18.4 git+https://github.com/openstack-charmers/zaza.git#egg=zaza -git+https://github.com/openstack-charmers/zaza-openstack-tests.git@add-ovn#egg=zaza.openstack +git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack diff --git a/src/tests/bundles/bionic.yaml b/src/tests/bundles/bionic.yaml index 508ed8b..eee8811 100644 --- a/src/tests/bundles/bionic.yaml +++ b/src/tests/bundles/bionic.yaml @@ -16,4 +16,4 @@ applications: charm: cs:~openstack-charmers-next/ovn-central num_units: 3 options: - source: cloud:bionic-stein + source: cloud:bionic-train diff --git a/src/tests/bundles/disco.yaml b/src/tests/bundles/eoan.yaml similarity index 72% rename from src/tests/bundles/disco.yaml rename to src/tests/bundles/eoan.yaml index 90efff6..0418aa4 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 @@ -6,12 +6,12 @@ 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 ovn-central: - series: disco + series: eoan charm: cs:~openstack-charmers-next/ovn-central num_units: 3 diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index cacf3b5..2942112 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,6 +1,6 @@ charm_name: ovn-central gate_bundles: -- disco +- eoan - bionic smoke_bundles: - bionic