From 31882813e2b47c840634aa5461d2cb4b8d58a172 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Fri, 8 Sep 2017 16:12:09 -0500 Subject: [PATCH] enable heat for OCL and try. Change-Id: Ie114402ec96d5e809dbf990ac9b1d0410a436ff2 Signed-off-by: Narinder Gupta --- ci/config_tpl/juju2/bundle_tpl/bundle.yaml | 2 +- ci/config_tpl/juju2/bundle_tpl/haclusters.yaml | 2 -- ci/config_tpl/juju2/bundle_tpl/harelations.yaml | 2 +- ci/config_tpl/juju2/bundle_tpl/relations.yaml | 6 +++--- ci/opencontrail/fetch-charms.sh | 4 ++-- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ci/config_tpl/juju2/bundle_tpl/bundle.yaml b/ci/config_tpl/juju2/bundle_tpl/bundle.yaml index dd0ba146..8c248ce0 100644 --- a/ci/config_tpl/juju2/bundle_tpl/bundle.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/bundle.yaml @@ -56,9 +56,9 @@ {% include 'openstack-dashboard.yaml' %} {% include 'rabbitmq.yaml' %} {% include 'neutron-api.yaml' %} +{% include 'heat.yaml' %} {% if os.network.controller != 'ocl' %} {% include 'neutron-gateway.yaml' %} -{% include 'heat.yaml' %} {% include 'ceilometer.yaml' %} {% endif %} {% include 'aodh.yaml' %} diff --git a/ci/config_tpl/juju2/bundle_tpl/haclusters.yaml b/ci/config_tpl/juju2/bundle_tpl/haclusters.yaml index 091fa7e0..26ea2867 100644 --- a/ci/config_tpl/juju2/bundle_tpl/haclusters.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/haclusters.yaml @@ -15,7 +15,6 @@ {% if os.network.ipv6 %} prefer-ipv6: {{ os.network.ipv6 }} {% endif %} -{% if os.network.controller != 'ocl' %} hacluster-heat: charm: "./{{ ubuntu.release }}/hacluster" options: @@ -23,7 +22,6 @@ cluster_count: 3 {% if os.network.ipv6 %} prefer-ipv6: {{ os.network.ipv6 }} -{% endif %} {% endif %} hacluster-horizon: charm: "./{{ ubuntu.release }}/hacluster" diff --git a/ci/config_tpl/juju2/bundle_tpl/harelations.yaml b/ci/config_tpl/juju2/bundle_tpl/harelations.yaml index 8a4a2474..e5274ed8 100644 --- a/ci/config_tpl/juju2/bundle_tpl/harelations.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/harelations.yaml @@ -1,8 +1,8 @@ {% if os.ha.mode == 'ha' %} {% if os.network.controller != 'ocl' %} - - [ 'heat:ha', 'hacluster-heat:ha' ] - [ 'ceilometer:ha', 'hacluster-ceilometer:ha' ] {% endif %} + - [ 'heat:ha', 'hacluster-heat:ha' ] - [ 'mysql:ha', 'hacluster-mysql:ha' ] - [ 'cinder:ha', 'hacluster-cinder:ha' ] - [ 'glance:ha', 'hacluster-glance:ha' ] diff --git a/ci/config_tpl/juju2/bundle_tpl/relations.yaml b/ci/config_tpl/juju2/bundle_tpl/relations.yaml index a27e7d05..2ed75e67 100644 --- a/ci/config_tpl/juju2/bundle_tpl/relations.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/relations.yaml @@ -3,9 +3,6 @@ - [ 'neutron-gateway:amqp', 'rabbitmq-server:amqp' ] - [ 'neutron-gateway:neutron-plugin-api', 'neutron-api:neutron-plugin-api' ] - [ 'nova-cloud-controller:quantum-network-service', 'neutron-gateway:quantum-network-service' ] - - [ 'heat:shared-db', 'mysql:shared-db' ] - - [ 'heat:identity-service', 'keystone:identity-service' ] - - [ 'heat:amqp', 'rabbitmq-server:amqp' ] - [ 'ceilometer:amqp', 'rabbitmq-server:amqp' ] - [ 'ceilometer-agent:ceilometer-service', 'ceilometer:ceilometer-service' ] - [ 'ceilometer:identity-service', 'keystone:identity-service' ] @@ -13,6 +10,9 @@ - [ 'ceilometer-agent:nova-ceilometer', 'nova-compute:nova-ceilometer' ] - [ 'ceilometer:shared-db', 'mongodb:database' ] {% endif %} + - [ 'heat:shared-db', 'mysql:shared-db' ] + - [ 'heat:identity-service', 'keystone:identity-service' ] + - [ 'heat:amqp', 'rabbitmq-server:amqp' ] - [ 'keystone:shared-db', 'mysql:shared-db' ] - [ 'nova-cloud-controller:identity-service', 'keystone:identity-service' ] - [ 'glance:identity-service', 'keystone:identity-service' ] diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh index 89d55080..7a903c7f 100755 --- a/ci/opencontrail/fetch-charms.sh +++ b/ci/opencontrail/fetch-charms.sh @@ -11,8 +11,6 @@ function build { # openstack bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise -bzr branch lp:~billy-olsen/charms/xenial/mongodb/trunk $distro/mongodb -bzr branch lp:~narindergupta/opnfv/ntp $distro/ntp git clone https://github.com/openstack/charm-hacluster.git $distro/hacluster git clone https://github.com/openstack/charm-ceilometer.git $distro/ceilometer @@ -36,6 +34,8 @@ git clone https://github.com/openstack/charm-heat.git $distro/heat git clone https://github.com/openstack/charm-lxd.git $distro/lxd git clone https://github.com/openbaton/juju-charm.git $distro/openbaton +charm pull cs:$distro/mongodb $distro/mongodb +charm pull cs:$distro/ntp $distro/ntp charm pull cs:$distro/aodh $distro/aodh charm pull cs:~free.ekanayaka/xenial/haproxy-1 $distro/haproxy charm pull cs:~narindergupta/congress-1 $distro/congress -- 2.16.6