From dd24537bc23c1bd8d70ab2956d33c1f84f40808b Mon Sep 17 00:00:00 2001
From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Tue, 25 Jul 2017 16:41:43 -0500
Subject: modfied to take care of OCL deployment

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

(limited to 'ci/config_tpl')

diff --git a/ci/config_tpl/juju2/bundle_tpl/phase2-overrides.yaml b/ci/config_tpl/juju2/bundle_tpl/phase2-overrides.yaml
deleted file mode 100644
index a8dbd400..00000000
--- a/ci/config_tpl/juju2/bundle_tpl/phase2-overrides.yaml
+++ /dev/null
@@ -1,41 +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 %}
-{% if ubuntu.release == 'trusty' %}
-    #source: "cloud:{{ ubuntu.release }}-{{ os.release }}"
-{% endif %}
-{% 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