1 files changed, 13 insertions, 5 deletions
diff --git a/ci/bundle_tpl/phase2-overrides.yaml b/ci/bundle_tpl/phase2-overrides.yaml
index 8ec13f70..c2b8ff9a 100644
--- a/ci/bundle_tpl/phase2-overrides.yaml
+++ b/ci/bundle_tpl/phase2-overrides.yaml
@@ -1,10 +1,12 @@
 {% if opnfv.spaces_dict.data is defined %}
-    os-data-network: {{ opnfv.spaces_dict.data.cidr }}
+    os-data-network: {{ opnfv.dataNetwork }}
 {% endif %}
 {% if opnfv.spaces_dict.storage is defined %}
-    ceph-cluster-network: {{ opnfv.spaces_dict.storage.cidr }}
+    #ceph-cluster-network: {{ opnfv.spaces_dict.storage.cidr }}
 {% endif %}
+{% if os.network.ipv6 == 'true' %}
     prefer-ipv6: {{ os.network.ipv6 }}
+{% endif %}
 {% if os.network.dvr %}
     enable-dvr: true
 {% endif %}
@@ -12,12 +14,18 @@
     l2-population: true
 {% endif %}
     region: {{ os.region }}
-    #source: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+{% if os.release == 'trusty' %}
+    source: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+{% endif %}
     openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+{% if os.ha.mode == 'nonha' %}
     ceph-osd-replication-count: {{ os.storage.ceph_replica }}
-    admin-role: {{ os.admin_role }}
-    keystone-admin-role: {{ os.admin_role }}
+{% endif %}
+    admin-role: {{ os.admin.role }}
+    keystone-admin-role: {{ os.admin.role }}
 {% if os.beta.public_api %}
     use-internal-endpoints: true
+{% if opnfv.domain is defined %}
     os-public-hostname: api.{{ opnfv.domain }}
 {% endif %}
+{% endif %}