From bba15961e7ffeaa27bb1d0f9c2f975a7f187fdd5 Mon Sep 17 00:00:00 2001
From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Tue, 25 Jul 2017 12:47:44 -0500
Subject: modified to accomodate OCL

Change-Id: Ib8227c4050b51adc2c466511bedf47e45a817db1
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---
 ci/config_tpl/bundle_tpl/phase2-overrides.yaml | 43 --------------------------
 1 file changed, 43 deletions(-)
 delete mode 100644 ci/config_tpl/bundle_tpl/phase2-overrides.yaml

(limited to '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
deleted file mode 100644
index 72de7790..00000000
--- a/ci/config_tpl/bundle_tpl/phase2-overrides.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-{% if opnfv.spaces_dict.storage is defined %}
-    #ceph-cluster-network: {{ opnfv.spaces_dict.storage.cidr }}
-{% endif %}
-{% if os.network.ipv6 %}
-    #prefer-ipv6: {{ os.network.ipv6 }}
-{% endif %}
-{% if os.ha.mode == 'ha' %}
-{% if os.api.haproxy_timeout %}
-    #haproxy-server-timeout: {{ os.api.haproxy_timeout }}
-    #haproxy-client-timeout: {{ os.api.haproxy_timeout }}
-    #haproxy-queue-timeout: {{ os.api.haproxy_timeout }}
-    #haproxy-connect-timeout: {{ os.api.haproxy_timeout }}
-{% endif %}
-{% endif %}
-{% if os.api.worker_multiplier %}
-    #worker-multiplier: {{ os.api.worker_multiplier }}
-{% endif %}
-{% if os.network.dvr %}
-    #enable-dvr: true
-{% endif %}
-{% 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 }}"
-{% endif %}
-{% endif %}
-{% if os.ha.mode == 'nonha' %}
-{% if opnfv.storage_dict.ceph is defined %}
-    #ceph-osd-replication-count: {{ unit_ceph_qty() }}
-{% endif %}
-{% endif %}
-    #admin-role: {{ os.admin.role }}
-    #keystone-admin-role: {{ os.admin.role }}
-{% if os.beta.public_api %}
-    #use-internal-endpoints: true
-{% endif %}
-- 
cgit 1.2.3-korg