From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Wed, 1 Feb 2017 05:58:35 +0000 (-0600)
Subject: imodified to user port 5000 to do the juju on openstack for openrc.
X-Git-Tag: danube.1.0~71
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7d5df8c96948086605955438f282eb96385de9cc;p=joid.git

imodified to user port 5000 to do the juju on openstack for openrc.

Change-Id: If396896c5675d10bf91aa48b8e5c459d14b6efba
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---

diff --git a/ci/config_tpl/juju2/bundle_tpl/bundle.yaml b/ci/config_tpl/juju2/bundle_tpl/bundle.yaml
index b0a0e861..9a46126d 100644
--- a/ci/config_tpl/juju2/bundle_tpl/bundle.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/bundle.yaml
@@ -46,6 +46,9 @@
 {% include 'congress.yaml' %}
 {% endif %}
 {% endif %}
+{% if os.service.openbaton %}
+{% include 'openbaton.yaml' %}
+{% endif %}
 {% include 'keystone.yaml' %}
 {% include 'nova-cloud-controller.yaml' %}
 {% include 'nova-compute.yaml' %}
diff --git a/ci/config_tpl/juju2/bundle_tpl/openbaton.yaml b/ci/config_tpl/juju2/bundle_tpl/openbaton.yaml
new file mode 100644
index 00000000..fc64eb8b
--- /dev/null
+++ b/ci/config_tpl/juju2/bundle_tpl/openbaton.yaml
@@ -0,0 +1,6 @@
+    openbaton:
+      charm: "./{{ ubuntu.release }}/openbaton"
+      num_units: 1
+      to:
+        - "lxd:nodes/0"
+{# Empty block to avoid bad block trim #}
diff --git a/ci/default_deployment_config.yaml b/ci/default_deployment_config.yaml
index b6bb6185..977f23ee 100644
--- a/ci/default_deployment_config.yaml
+++ b/ci/default_deployment_config.yaml
@@ -31,6 +31,7 @@ os:
         congress: True
         promise: True
         bindings: True
+        openbaton: False
 k8:
     feature:
         loadbalancer: False
diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh
index f40291a3..76de80c6 100755
--- a/ci/nosdn/fetch-charms.sh
+++ b/ci/nosdn/fetch-charms.sh
@@ -37,6 +37,7 @@ git clone   https://github.com/openstack/charm-openstack-dashboard.git $distro/o
 git clone   https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
 git clone   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
 
 charm pull cs:$distro/aodh $distro/aodh
 charm pull cs:~free.ekanayaka/xenial/haproxy-1 $distro/haproxy
diff --git a/ci/openstack.sh b/ci/openstack.sh
index 513bf991..f7518317 100755
--- a/ci/openstack.sh
+++ b/ci/openstack.sh
@@ -92,7 +92,7 @@ create_openrc() {
         adminPasswd=$(juju config keystone | grep admin-password -A 5 | grep value | awk '{print $2}' 2> /dev/null)
     fi
 
-    configOpenrc admin $adminPasswd admin http://$keystoneIp:35357/v2.0 RegionOne > ~/joid_config/admin-openrc
+    configOpenrc admin $adminPasswd admin http://$keystoneIp:5000/v2.0 RegionOne > ~/joid_config/admin-openrc
     chmod 0600 ~/joid_config/admin-openrc
 }