modified to remove dns for K8 relationship.

[joid.git] / ci / config_tpl / bundle_tpl / phase2-overrides.yaml

diff --git a/ci/config_tpl/bundle_tpl/phase2-overrides.yaml b/ci/config_tpl/bundle_tpl/phase2-overrides.yaml
index 12b8905..72de779 100644 (file)
--- a/ci/config_tpl/bundle_tpl/phase2-overrides.yaml
+++ b/ci/config_tpl/bundle_tpl/phase2-overrides.yaml
@@ -2,7 +2,7 @@
     #ceph-cluster-network: {{ opnfv.spaces_dict.storage.cidr }}
 {% endif %}
 {% if os.network.ipv6 %}
-    prefer-ipv6: {{ os.network.ipv6 }}
+    #prefer-ipv6: {{ os.network.ipv6 }}
 {% endif %}
 {% if os.ha.mode == 'ha' %}
 {% if os.api.haproxy_timeout %}
@@ -21,9 +21,11 @@
 {% if os.network.l2_population %}
     #l2-population: true
 {% endif %}
+    region: {{ os.region }}
 {% if ubuntu.release == 'trusty' %}
     #source: "cloud:{{ ubuntu.release }}-{{ os.release }}"
 {% endif %}
+    #openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
 {% if ubuntu.release == 'xenial' %}
 {% if os.release == 'newton' %}
     #source: "cloud:{{ ubuntu.release }}-{{ os.release }}"
@@ -34,8 +36,8 @@
     #ceph-osd-replication-count: {{ unit_ceph_qty() }}
 {% endif %}
 {% endif %}
-    admin-role: {{ os.admin.role }}
-    keystone-admin-role: {{ os.admin.role }}
+    #admin-role: {{ os.admin.role }}
+    #keystone-admin-role: {{ os.admin.role }}
 {% if os.beta.public_api %}
-    use-internal-endpoints: true
+    #use-internal-endpoints: true
 {% endif %}