summaryrefslogtreecommitdiffstats
path: root/ci/config_tpl/juju2
diff options
context:
space:
mode:
Diffstat (limited to 'ci/config_tpl/juju2')
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/ceph.yaml4
-rw-r--r--ci/config_tpl/juju2/deployconfig.yaml4
2 files changed, 5 insertions, 3 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
index dc4e101b..6b20d986 100644
--- a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
@@ -39,8 +39,8 @@
{% endfor %}
{% else %}
- "lxd:nodes/0"
- - "lxd:nodes/0"
- - "lxd:nodes/0"
+ - "lxd:nodes/1"
+ - "lxd:nodes/2"
{% endif %}
{% endif %}
ceph-osd:
diff --git a/ci/config_tpl/juju2/deployconfig.yaml b/ci/config_tpl/juju2/deployconfig.yaml
index 844ede6f..bc2e1277 100644
--- a/ci/config_tpl/juju2/deployconfig.yaml
+++ b/ci/config_tpl/juju2/deployconfig.yaml
@@ -15,12 +15,14 @@ opnfv:
{% set netdata_prefix = opnfv.spaces_dict.data.cidr[:-4] %}
dataNetwork: {{ opnfv.spaces_dict.data.cidr }}
{% endif %}
+{% if lab.racks[0].osdomainname is defined %}
domain: {{ lab.racks[0].osdomainname }}
+ os-domain-name: {{ lab.racks[0].osdomainname }}
+{% endif %}
ext-port: {{ lab.racks[0]['ext-port'] }}
ext_port: {{ lab.racks[0]['ext-port'] }}
floating-ip-range: {{ lab.racks[0]['floating-ip-range'] }}
interface-enable: {{ lab.racks[0].ifnamelist }}
- os-domain-name: {{ lab.racks[0].osdomainname }}
{% if opnfv.spaces_dict.public is defined %}
{% set netpublic_prefix = opnfv.spaces_dict.public.cidr[:-4] %}
publicNetwork: {{ opnfv.spaces_dict.public.cidr }}