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/bundle.yaml | 96 ------------------------------------
 1 file changed, 96 deletions(-)
 delete mode 100644 ci/config_tpl/bundle_tpl/bundle.yaml

(limited to 'ci/config_tpl/bundle_tpl/bundle.yaml')

diff --git a/ci/config_tpl/bundle_tpl/bundle.yaml b/ci/config_tpl/bundle_tpl/bundle.yaml
deleted file mode 100644
index 8aab10f8..00000000
--- a/ci/config_tpl/bundle_tpl/bundle.yaml
+++ /dev/null
@@ -1,96 +0,0 @@
-# vim: set ts=2 et:
-{{ ubuntu.release }}-{{ os.release }}-nodes:
-  inherits: openstack-phase1
-  overrides:
-{% include 'phase2-overrides.yaml' %}
-
-{{ ubuntu.release }}-{{ os.release }}:
-  inherits: openstack-phase2
-
-openstack-phase1:
-  services:
-{% if os.hyperconverged %}
-    nodes:
-      charm: "cs:{{ ubuntu.release }}/ubuntu"
-      num_units: {{ opnfv.units }}
-{% else %}
-    nodes:
-      charm: "cs:{{ ubuntu.release }}/ubuntu"
-{% if os.ha.mode == 'ha' %}
-      num_units: 3
-{% else %}
-      num_units: 1
-{% endif %}
-      constraints: tags=control
-    nodes-compute:
-      charm: "cs:{{ ubuntu.release }}/ubuntu"
-{% if os.ha.mode == 'ha' %}
-      num_units: {{ opnfv.units - 3 }}
-{% else %}
-      num_units: {{ opnfv.units - 1 }}
-{% endif %}
-{% endif %}
-    ntp:
-      charm: "local:{{ ubuntu.release }}/ntp"
-{% if os.network.controller == 'ocl' %}
-      options:
-        source: "0.ubuntu.pool.ntp.org 1.ubuntu.pool.ntp.org 2.ubuntu.pool.ntp.org 3.ubuntu.pool.ntp.org"
-        auto_peers: false
-{% endif %}
-{% include 'mysql.yaml' %}
-{% include 'ceilometer.yaml' %}
-{% if opnfv.storage_dict.scaleio is defined %}
-{% include 'scaleio.yaml' %}
-{% else %}
-{% include 'ceph.yaml' %}
-{% endif %}
-{% include 'cinder.yaml' %}
-{% include 'glance.yaml' %}
-{% if opnfv.storage_dict.ceph is defined %}
-{% if os.service.promise %}
-{% include 'opnfv-promise.yaml' %}
-{% endif %}
-{% if os.service.congress %}
-{% include 'congress.yaml' %}
-{% endif %}
-{% endif %}
-{% include 'keystone.yaml' %}
-{% include 'nova-cloud-controller.yaml' %}
-{% include 'nova-compute.yaml' %}
-{% include 'openstack-dashboard.yaml' %}
-{% include 'rabbitmq.yaml' %}
-{% include 'heat.yaml' %}
-{% include 'neutron-api.yaml' %}
-{% include 'neutron-gateway.yaml' %}
-{% include 'aodh.yaml' %}
-{% if os.network.controller == 'odl' %}
-{% include 'odl.yaml' %}
-{% elif os.network.controller == 'onos' %}
-{% include 'onos.yaml' %}
-{% elif os.network.controller == 'ocl' %}
-{% include 'oclphase1.yaml' %}
-{% endif %}
-{% if os.ha.mode == 'ha' %}
-{% include 'haclusters.yaml' %}
-{% endif %}
-
-
-{% if os.hyperconverged %}
-  relations:
-    - [ 'ntp:juju-info', 'nodes:juju-info' ]
-{% else %}
-  relations:
-    - [ 'ntp:juju-info', 'nodes:juju-info' ]
-    - [ 'ntp:juju-info', 'nodes-compute:juju-info' ]
-{% endif %}
-
-{% if os.ha.mode == 'ha' %}
-{% include 'harelations.yaml' %}
-{% endif %}
-
-openstack-phase2:
-  inherits: openstack-phase1
-  relations:
-{% include 'relations.yaml' %}
-  services:
-{% include 'subordinate.yaml' %}
-- 
cgit 1.2.3-korg