Merge "modfiied to support openbaton during the dpeloyment."

6 files changed, 16 insertions, 10 deletions

diff --git a/ci/config_tpl/juju2/bundle_tpl/bundle.yaml b/ci/config_tpl/juju2/bundle_tpl/bundle.yaml
index 9a46126d..5f3b5e8b 100644
--- a/ci/config_tpl/juju2/bundle_tpl/bundle.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/bundle.yaml
@@ -36,16 +36,16 @@
 {% else %}
 {% include 'ceph.yaml' %}
 {% endif %}
+{% if opnfv.storage_dict.ceph is defined %}
 {% include 'cinder.yaml' %}
 {% include 'glance.yaml' %}
-{% if opnfv.storage_dict.ceph is defined %}
+{% endif %}
 {% if os.service.promise %}
 {% include 'opnfv-promise.yaml' %}
 {% endif %}
 {% if os.service.congress %}
 {% include 'congress.yaml' %}
 {% endif %}
-{% endif %}
 {% if os.service.openbaton %}
 {% include 'openbaton.yaml' %}
 {% endif %}
@@ -83,3 +83,6 @@
 {% include 'harelations.yaml' %}
 {% endif %}
 {% include 'relations.yaml' %}
+{% if os.mano.mode == 'ha' %}
+{% include 'harelations.yaml' %}
+{% endif %}
diff --git a/ci/config_tpl/juju2/bundle_tpl/openbaton.yaml b/ci/config_tpl/juju2/bundle_tpl/openbaton.yaml
index 77318384..053da7cd 100644
--- a/ci/config_tpl/juju2/bundle_tpl/openbaton.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/openbaton.yaml
@@ -1,5 +1,5 @@
     openbaton:
-      charm: "./trusty/openbaton"
+      charm: ./{{ ubuntu.release }}/openbaton
       num_units: 1
 {% if os.service.bindings %}
       bindings:
diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh
index b97d160a..9174ed0a 100755
--- a/ci/nosdn/fetch-charms.sh
+++ b/ci/nosdn/fetch-charms.sh
@@ -33,12 +33,12 @@ git clone -b stable/17.02 https://github.com/openstack/charm-nova-compute.git $d
 git clone -b stable/17.02 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
 git clone -b stable/17.02 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
 git clone -b stable/17.02 https://github.com/openstack/charm-heat.git $distro/heat
-git clone https://github.com/openstack/charm-lxd.git xenial/lxd
-#git clone https://github.com/openstack/openbaton.git xenial/openbaton
+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/aodh $distro/aodh
 charm pull cs:~free.ekanayaka/xenial/haproxy-1 $distro/haproxy
-charm pull cs:~narindergupta/congress-0 $distro/congress
+charm pull cs:~narindergupta/congress-1 $distro/congress
 
 #pulling scaleio charms.
 charm pull cs:~cloudscaling/scaleio-mdm $distro/scaleio-mdm
diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh
index 4b028dd7..bda0f165 100755
--- a/ci/odl/fetch-charms.sh
+++ b/ci/odl/fetch-charms.sh
@@ -33,7 +33,8 @@ git clone -b stable/17.02 https://github.com/openstack/charm-nova-compute.git $d
 git clone -b stable/17.02 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
 git clone -b stable/17.02 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
 git clone -b stable/17.02 https://github.com/openstack/charm-heat.git $distro/heat
-git clone https://github.com/openstack/charm-lxd.git xenial/lxd
+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/aodh $distro/aodh
 
@@ -72,4 +73,4 @@ charm pull cs:$distro/odl-controller $distro/odl-controller
 charm pull cs:~narindergupta/neutron-api-odl-11 $distro/neutron-api-odl
 charm pull cs:~narindergupta/openvswitch-odl-3 $distro/openvswitch-odl
 charm pull cs:~narindergupta/neutron-gateway-6 $distro/neutron-gateway
-charm pull cs:~narindergupta/congress-0 $distro/congress
+charm pull cs:~narindergupta/congress-1 $distro/congress
diff --git a/ci/onos/fetch-charms.sh b/ci/onos/fetch-charms.sh
index b9d4ff97..ea6b3e62 100755
--- a/ci/onos/fetch-charms.sh
+++ b/ci/onos/fetch-charms.sh
@@ -33,9 +33,10 @@ git clone -b stable/17.02 https://github.com/openstack/charm-openstack-dashboard
 git clone -b stable/17.02 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
 git clone -b stable/17.02 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/aodh $distro/aodh
-charm pull cs:~narindergupta/congress-0 $distro/congress
+charm pull cs:~narindergupta/congress-1 $distro/congress
 
 #pulling scaleio charms.
 charm pull cs:~cloudscaling/scaleio-mdm $distro/scaleio-mdm
diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh
index 3fc745e1..1ee385f6 100755
--- a/ci/opencontrail/fetch-charms.sh
+++ b/ci/opencontrail/fetch-charms.sh
@@ -16,7 +16,7 @@ charm pull cs:trusty/mongodb $distro/mongodb
 charm pull cs:$distro/haproxy $distro/haproxy
 charm pull cs:$distro/ntp $distro/ntp
 charm pull cs:$distro/aodh $distro/aodh
-charm pull cs:~narindergupta/congress-0 $distro/congress
+charm pull cs:~narindergupta/congress-1 $distro/congress
 
 git clone -b stable/17.02 https://github.com/openstack/charm-hacluster.git $distro/hacluster
 #bzr branch lp:~sdn-charmers/charms/$distro/ceilometer/ceilometer-plugin $distro/ceilometer
@@ -38,6 +38,7 @@ git clone -b stable/17.02 https://github.com/openstack/charm-openstack-dashboard
 git clone -b stable/17.02 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
 git clone -b stable/17.02 https://github.com/openstack/charm-heat.git $distro/heat
 git clone -b stable/17.02 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
+git clone https://github.com/openbaton/juju-charm.git $distro/openbaton
 
 #pulling scaleio charms.
 charm pull cs:~cloudscaling/scaleio-mdm $distro/scaleio-mdm