modified to remove the errors.

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

4 files changed, 11 insertions, 9 deletions

diff --git a/ci/clean.sh b/ci/clean.sh
index a142ca7f..feecd70a 100755
--- a/ci/clean.sh
+++ b/ci/clean.sh
@@ -24,6 +24,7 @@ fi
 if [[ "$jujuver" > "2" ]]; then
     controllername=`awk 'NR==1{print substr($1, 1, length($1)-1)}' deployconfig.yaml`
     cloudname=`awk 'NR==1{print substr($1, 1, length($1)-1)}' deployconfig.yaml`
+    juju destroy-controller $controllername --destroy-all-models -y || true
     juju kill-controller $controllername --timeout 10s -y || true
     rm -rf precise
     rm -rf trusty
diff --git a/ci/config_tpl/juju2/bundle_tpl/bundle.yaml b/ci/config_tpl/juju2/bundle_tpl/bundle.yaml
index 5f3b5e8b..5a49b9a7 100644
--- a/ci/config_tpl/juju2/bundle_tpl/bundle.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/bundle.yaml
@@ -83,6 +83,3 @@
 {% include 'harelations.yaml' %}
 {% endif %}
 {% include 'relations.yaml' %}
-{% if os.mano.mode == 'ha' %}
-{% include 'harelations.yaml' %}
-{% endif %}
diff --git a/ci/genBundle.py b/ci/genBundle.py
index 8075eeb9..78e3b1cd 100644
--- a/ci/genBundle.py
+++ b/ci/genBundle.py
@@ -193,6 +193,8 @@ if 'dishypcon' in features:
 if 'hugepages' in features:
     config['os']['beta']['huge_pages'] = True
     config['os']['beta']['cpu_pin'] = True
+if 'openbaton' in features:
+    config['os']['service']['openbaton'] = True
 
 
 # Set beta option from extra
@@ -213,6 +215,8 @@ if 'xenial' in extra:
     config['ubuntu']['release'] = 'xenial'
 if 'dishypcon' in extra:
     config['os']['hyperconverged'] = False
+if 'openbaton' in features:
+    config['os']['service']['openbaton'] = True
 
 #
 # Transform template to bundle.yaml according to config
diff --git a/juju/configure-juju-on-openstack b/juju/configure-juju-on-openstack
index bf31514c..1c2bec6d 100755
--- a/juju/configure-juju-on-openstack
+++ b/juju/configure-juju-on-openstack
@@ -115,7 +115,7 @@ do
 done
 
 ## Generate tools (needed if windows is in).
-$SSH "juju metadata generate-tools -d juju-meta/ "
+#$SSH "juju metadata generate-tools -d juju-meta/ "
 
 ## upload images and tools streams to swift and make public
 $SSH swift --os-auth-url $OS_AUTH_URL --os-username $OS_USERNAME  --os-password $OS_PASSWORD \
@@ -125,9 +125,9 @@ $SSH "cd ~/juju-meta/ && swift --os-auth-url $OS_AUTH_URL --os-username $OS_USER
  --os-password $OS_PASSWORD --os-tenant-name $OS_TENANT_NAME \
 upload juju-meta images"
 
-$SSH "cd ~/juju-meta/ && swift --os-auth-url $OS_AUTH_URL --os-username $OS_USERNAME \
- --os-password $OS_PASSWORD --os-tenant-name $OS_TENANT_NAME \
-upload juju-meta tools"
+#$SSH "cd ~/juju-meta/ && swift --os-auth-url $OS_AUTH_URL --os-username $OS_USERNAME \
+# --os-password $OS_PASSWORD --os-tenant-name $OS_TENANT_NAME \
+#upload juju-meta tools"
 
 ## collect the URL for getting the images
 $($SSH swift --os-auth-url $OS_AUTH_URL --os-username $OS_USERNAME  --os-password $OS_PASSWORD \
@@ -140,7 +140,7 @@ $($SSH swift --os-auth-url $OS_AUTH_URL --os-username $OS_USERNAME  --os-passwor
 my_ip=`ip route | grep src| grep -v virb|grep -v lxcb| head -1| cut -d " " -f 12 `
 #Bootstrap Juju
 ##$SSH "juju bootstrap openstack openstack --metadata-source=/var/www/html/juju-meta/ --upload-tools"
-$SSH "juju bootstrap openstack openstack --config image-metadata-url=$OS_STORAGE_URL/juju-meta/images/ --config tools-metadata-url=$OS_STORAGE_URL/juju-meta/tools/ --config network=private"
+$SSH "juju bootstrap openstack openstack --config image-metadata-url=$OS_STORAGE_URL/juju-meta/images/ --config network=private"
 
 
 
@@ -158,6 +158,6 @@ echo "Pass: $OS_PASSWORD"
 echo "OR Log in to openstack Jumpserver2 to deploy from command line"
 echo "ssh ubuntu@$FLOAT_IP"
 echo " You must set the following if creating a new model:"
-echo " juju set-model-config image-metadata-url=$OS_STORAGE_URL/juju-meta/images/ tools-metadata-url=$OS_STORAGE_URL/juju-meta/tools/ network=private"
+echo " juju set-model-config image-metadata-url=$OS_STORAGE_URL/juju-meta/images/ network=private"
 exit