summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/glance.yaml2
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/spaces.yaml4
2 files changed, 1 insertions, 5 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/glance.yaml b/ci/config_tpl/juju2/bundle_tpl/glance.yaml
index fe991f0a..725c436e 100644
--- a/ci/config_tpl/juju2/bundle_tpl/glance.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/glance.yaml
@@ -2,7 +2,7 @@
charm: "./{{ ubuntu.release }}/glance"
num_units: {{ unit_qty() }}
{% if os.service.bindings %}
- constraints: *ceph-access-constr
+ constraints: *ceph-access-constr
bindings:
"": *oam-space
public: *public-space
diff --git a/ci/config_tpl/juju2/bundle_tpl/spaces.yaml b/ci/config_tpl/juju2/bundle_tpl/spaces.yaml
index acf2204b..3023dfc0 100644
--- a/ci/config_tpl/juju2/bundle_tpl/spaces.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/spaces.yaml
@@ -1,11 +1,8 @@
-
-
{% if os.release == 'mitaka' %}
openstack-origin: &openstack-origin distro
{% else %}
openstack-origin: &openstack-origin cloud:{{ ubuntu.release }}-{{ os.release }}
{% endif %}
-
openstack-region: &openstack-region {{ os.region }}
worker-multiplier: &worker-multiplier {{ os.api.worker_multiplier }}
data-port: &data-port br-data:{{ opnfv.ext_port }}
@@ -23,7 +20,6 @@
admin-space: &admin-space internal-api
{% endif %}
-
# This is OpenStack Public network; for publicURL endpoints
{% if opnfv.spaces_dict.public is defined %}
public-space: &public-space public-api