summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
Diffstat (limited to 'ci')
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml4
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/designate.yaml1
-rwxr-xr-xci/nosdn/fetch-charms.sh4
3 files changed, 5 insertions, 4 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml b/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
index 33247f70..9e03affe 100644
--- a/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
@@ -36,8 +36,8 @@
options:
allow-ufw-ip6-softfail: True
to:
- - "designate-bind/0"
- - "designate-bind/1"
+ - "lxd:nodes/0"
+ - "lxd:nodes/1"
ceilometer:
charm: "./{{ ubuntu.release }}/ceilometer"
num_units: {{ unit_qty() }}
diff --git a/ci/config_tpl/juju2/bundle_tpl/designate.yaml b/ci/config_tpl/juju2/bundle_tpl/designate.yaml
index 23840a0c..f58baefa 100644
--- a/ci/config_tpl/juju2/bundle_tpl/designate.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/designate.yaml
@@ -41,6 +41,7 @@
num_units: 2
bindings:
"": *internal-space
+ series: {{ ubuntu.release }}
to:
- "lxd:nodes/0"
- "lxd:nodes/1"
diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh
index c2dc48af..c8d60ec7 100755
--- a/ci/nosdn/fetch-charms.sh
+++ b/ci/nosdn/fetch-charms.sh
@@ -34,8 +34,8 @@ git clone -b stable/18.02 https://github.com/openstack/charm-heat.git $distro/he
git clone -b stable/18.02 https://github.com/openstack/charm-lxd.git $distro/lxd
git clone https://github.com/openbaton/juju-charm.git $distro/openbaton
-+charm pull cs:designate $distro/designate
-+charm pull cs:designate-bind $distro/designate-bind
+charm pull cs:designate $distro/designate
+charm pull cs:designate-bind $distro/designate-bind
charm pull cs:memcached $distro/memcached
charm pull cs:gnocchi $distro/gnocchi
charm pull cs:$distro/aodh $distro/aodh