From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Fri, 8 Jul 2016 04:24:02 +0000 (-0500)
Subject: trying different option as delpoyment failed.
X-Git-Tag: colorado.1.0~91
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=5e5881112d62c2089dd13b805682cfe2e9b878b5;p=joid.git

trying different option as delpoyment failed.

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

diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index 52486be6..e53f3f50 100755
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -154,9 +154,8 @@ fi
 python genBundle.py  -l deployconfig.yaml  -s $var > bundles.yaml
 
 echo "... Deployment Started ...."
-    juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml $6-"$2"
-    #juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml $6-"$2"-nodes
-    #check_status
-
+    juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml $6-"$2"-nodes
     juju ssh nodes/0 "echo 512 | sudo tee /proc/sys/fs/inotify/max_user_instances"
     juju ssh nodes/1 "echo 512 | sudo tee /proc/sys/fs/inotify/max_user_instances"
+    juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml $6-"$2"
+    #check_status
diff --git a/ci/bundle_tpl/bundle.yaml b/ci/bundle_tpl/bundle.yaml
index 713a6931..62047fba 100644
--- a/ci/bundle_tpl/bundle.yaml
+++ b/ci/bundle_tpl/bundle.yaml
@@ -1,9 +1,12 @@
 # vim: set ts=2 et:
-{{ ubuntu.release }}-{{ os.release }}:
+{{ ubuntu.release }}-{{ os.release }}-nodes:
   inherits: openstack-phase1
   overrides:
 {% include 'phase2-overrides.yaml' %}
 
+{{ ubuntu.release }}-{{ os.release }}:
+  inherits: openstack-phase2
+
 openstack-phase1:
   services:
     nodes:
@@ -45,12 +48,16 @@ openstack-phase1:
 {% if os.ha.mode == 'ha' %}
 {% include 'haclusters.yaml' %}
 {% endif %}
-{% include 'subordinate.yaml' %}
 
   relations:
     - [ 'ntp:juju-info', 'nodes:juju-info' ]
 {% if os.ha.mode == 'ha' %}
 {% include 'harelations.yaml' %}
 {% endif %}
-{% include 'relations.yaml' %}
 
+openstack-phase2:
+  inherits: openstack-phase1
+  relations:
+{% include 'relations.yaml' %}
+  services:
+{% include 'subordinate.yaml' %}
diff --git a/ci/bundle_tpl/mysql.yaml b/ci/bundle_tpl/mysql.yaml
index 2c618b20..110140e9 100644
--- a/ci/bundle_tpl/mysql.yaml
+++ b/ci/bundle_tpl/mysql.yaml
@@ -2,7 +2,7 @@
       charm: "local:{{ ubuntu.release }}/percona-cluster"
       num_units: {{ unit_qty() }}
       options:
-        innodb-buffer-pool-size: 2G
+        innodb-buffer-pool-size: 100M
         #lp1366997-workaround: true
         max-connections: 20000
         root-password: {{ get_password('mysql_root') }}
diff --git a/ci/bundle_tpl/nova-cloud-controller.yaml b/ci/bundle_tpl/nova-cloud-controller.yaml
index 20e9bf4f..1dfc47ec 100644
--- a/ci/bundle_tpl/nova-cloud-controller.yaml
+++ b/ci/bundle_tpl/nova-cloud-controller.yaml
@@ -2,7 +2,7 @@
       charm: "local:{{ ubuntu.release }}/nova-cloud-controller"
       num_units: {{ unit_qty() }}
       options:
-        console-access-protocol: novnc
+        #console-access-protocol: novnc
         neutron-external-network: ext-net
         service-guard: true
 {% if opnfv.domain is defined %}