From 5cc5559348a8a18a41cfd25cce446955d63afb83 Mon Sep 17 00:00:00 2001 From: David Blaisonneau Date: Thu, 4 Aug 2016 17:37:15 +0200 Subject: New scripts for configs generation, based on jinja2 Signed-off-by: David Blaisonneau --- ci/bundle_tpl/bundle.yaml | 60 ----------------------------------------------- 1 file changed, 60 deletions(-) delete mode 100644 ci/bundle_tpl/bundle.yaml (limited to 'ci/bundle_tpl/bundle.yaml') diff --git a/ci/bundle_tpl/bundle.yaml b/ci/bundle_tpl/bundle.yaml deleted file mode 100644 index 8c08c1a2..00000000 --- a/ci/bundle_tpl/bundle.yaml +++ /dev/null @@ -1,60 +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: - nodes: - charm: "cs:{{ ubuntu.release }}/ubuntu" - num_units: {{ opnfv.units }} - 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' %} -{% include 'ceph.yaml' %} -{% include 'cinder.yaml' %} -{% include 'glance.yaml' %} -{% include 'opnfv-promise.yaml' %} -{% include 'congress.yaml' %} -{% 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 %} - - relations: - - [ 'ntp:juju-info', 'nodes:juju-info' ] -{% 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