modfiied to support the new spaces in juju.

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

10 files changed, 52 insertions, 21 deletions

diff --git a/ci/01-bootstrap.sh b/ci/01-bootstrap.sh
index b02b83d3..1577f49f 100755
--- a/ci/01-bootstrap.sh
+++ b/ci/01-bootstrap.sh
@@ -18,5 +18,5 @@ if [[ "$jujuver" < "2" ]]; then
 else
   controllername=`awk 'NR==1{print substr($1, 1, length($1)-1)}' deployment.yaml`
   cloudname=`awk 'NR==1{print substr($1, 1, length($1)-1)}' deployment.yaml`
-  juju bootstrap $controllername $cloudname --debug --to bootstrap.maas
+  juju bootstrap --config agent-version=2.1-beta4 $controllername $cloudname --debug --to bootstrap.maas
 fi
diff --git a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
index 9592fae6..0d5c5f21 100644
--- a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
@@ -1,11 +1,24 @@
 {% if opnfv.storage_dict.ceph is defined %}
-    ceph:
-      charm: "./{{ ubuntu.release }}/ceph"
+    ceph-mon:
+      charm: "./{{ ubuntu.release }}/ceph-mon"
       num_units: {{ unit_ceph_qty() }}
+{% if os.service.bindings %}
+      bindings:
+{% if opnfv.spaces_dict.public is defined %}
+        public: public-api
+{% else %}
+        public: internal-api
+{% endif %}
+{% if opnfv.spaces_dict.storage is defined %}
+        cluster: cluster-stor
+{% else %}
+        cluster: internal-api
+{% endif %}
+{% endif %}
       options:
         monitor-count: {{ unit_ceph_qty() }}
-        fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
-        monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
+        fsid: ecbb8960-0e21-11e2-b495-83a88f44db01
+        monitor-secret: AQD1P2xQiKglDhAA4NGUF5j38Mhq56qwz+45wg==
 {% if ubuntu.release == 'trusty' and os.release < 'newton' %}
         source: "cloud:{{ ubuntu.release }}-updates/{{ os.release }}"
 {% elif ubuntu.release == 'xenial' and os.release >= 'newton' %}
@@ -14,9 +27,6 @@
 {% if os.network.ipv6 %}
         prefer-ipv6: {{ os.network.ipv6 }}
 {% endif %}
-{% if opnfv.spaces_dict.storage is defined %}
-        #ceph-cluster-network: {{ opnfv.spaces_dict.storage.cidr }}
-{% endif %}
       to:
 {% if os.hyperconverged %}
 {% for unit_id in to_select(unit_ceph_qty()) %}
@@ -44,6 +54,19 @@
 {% else %}
       num_units: 3
 {% endif %}
+{% if os.service.bindings %}
+      bindings:
+{% if opnfv.spaces_dict.public is defined %}
+        public: public-api
+{% else %}
+        public: internal-api
+{% endif %}
+{% if opnfv.spaces_dict.storage is defined %}
+        cluster: cluster-stor
+{% else %}
+        cluster: internal-api
+{% endif %}
+{% endif %}
       options:
         osd-devices: {{ opnfv.storage_dict.ceph.disk }}
         osd-reformat: 'yes'
@@ -96,7 +119,6 @@
 {% endif %}
       options:
         region: {{ os.region }}
-        use-embedded-webserver: true
         operator-roles: "Member,admin"
 {% if ubuntu.release == 'trusty' and os.release < 'newton' %}
         source: "cloud:{{ ubuntu.release }}-updates/{{ os.release }}"
diff --git a/ci/config_tpl/juju2/bundle_tpl/heat.yaml b/ci/config_tpl/juju2/bundle_tpl/heat.yaml
index 59edd419..c1f23581 100644
--- a/ci/config_tpl/juju2/bundle_tpl/heat.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/heat.yaml
@@ -4,6 +4,7 @@
 {% if os.service.bindings %}
       bindings:
         internal: internal-api
+        shared-db: internal-api
 {% if opnfv.spaces_dict.data is defined %}
         admin: admin-api
 {% else %}
diff --git a/ci/config_tpl/juju2/bundle_tpl/mysql.yaml b/ci/config_tpl/juju2/bundle_tpl/mysql.yaml
index b2540155..e42d09ad 100644
--- a/ci/config_tpl/juju2/bundle_tpl/mysql.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/mysql.yaml
@@ -1,13 +1,17 @@
     mysql:
       charm: "./{{ ubuntu.release }}/percona-cluster"
       num_units: {{ unit_qty() }}
+{% if os.service.bindings %}
+      bindings:
+        shared-db: internal-api
+{% endif %}
       options:
 {% if os.ha.mode == 'ha' %}
         innodb-buffer-pool-size: 10G
 {% else %}
         innodb-buffer-pool-size: 1G
 {% endif %}
-        max-connections: 20000
+        max-connections: 2000
         root-password: {{ get_password('mysql_root') }}
         sst-password: {{ get_password('mysql_sst') }}
 {% if os.network.ipv6 %}
diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
index d12f3257..c73f3721 100644
--- a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
@@ -1,11 +1,15 @@
     neutron-openvswitch:
       charm: ./{{ ubuntu.release }}/neutron-openvswitch
-      options:
 {% if opnfv.spaces_dict.data is defined %}
 {% if os.service.bindings %}
       bindings:
         data: admin-api
+      options:
+{% else %}
+      options:
 {% endif %}
+{% else %}
+      options:
 {% endif %}
 {% if os.network.dpdk %}
         enable-dpdk: true
@@ -24,7 +28,7 @@
         data-port: br-ex:{{ opnfv.ext_port }}
 {% endif %}
 {% else %}
-         ext-port: {{ opnfv.ext_port }}
+        ext-port: {{ opnfv.ext_port }}
 {% endif %}
 {% endif %}
 {# Empty block to avoid bad block trim #}
diff --git a/ci/config_tpl/juju2/bundle_tpl/relations.yaml b/ci/config_tpl/juju2/bundle_tpl/relations.yaml
index 9eb860b9..012d696d 100644
--- a/ci/config_tpl/juju2/bundle_tpl/relations.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/relations.yaml
@@ -32,11 +32,11 @@
     - [ 'nova-compute:ephemeral-backend', 'scaleio-openstack:ephemeral-backend' ]
 {% else %}
     - [ 'cinder-ceph:storage-backend', 'cinder:storage-backend' ]
-    - [ 'ceph:client', 'nova-compute:ceph' ]
-    - [ 'ceph:client', 'cinder-ceph:ceph' ]
-    - [ 'ceph:client', 'glance:ceph' ]
-    - [ 'ceph-osd:mon', 'ceph:osd' ]
-    - [ 'ceph-radosgw:mon', 'ceph:radosgw' ]
+    - [ 'ceph-mon:client', 'nova-compute:ceph' ]
+    - [ 'ceph-mon:client', 'cinder-ceph:ceph' ]
+    - [ 'ceph-mon:client', 'glance:ceph' ]
+    - [ 'ceph-osd:mon', 'ceph-mon:osd' ]
+    - [ 'ceph-radosgw:mon', 'ceph-mon:radosgw' ]
     - [ 'ceph-radosgw:identity-service', 'keystone:identity-service' ]
 {% if os.service.congress %}
     - [ 'congress:shared-db', 'mysql:shared-db' ]
diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh
index 8abf6fcf..f40291a3 100755
--- a/ci/nosdn/fetch-charms.sh
+++ b/ci/nosdn/fetch-charms.sh
@@ -20,7 +20,7 @@ build congress
 git clone https://github.com/openstack/charm-hacluster.git $distro/hacluster
 git clone   https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
 git clone   https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
-git clone   https://github.com/openstack/charm-ceph-mon.git $distro/ceph
+git clone   https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon
 git clone   https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
 git clone   https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
 git clone   https://github.com/openstack/charm-cinder.git $distro/cinder
diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh
index b38c6cec..5002a911 100755
--- a/ci/odl/fetch-charms.sh
+++ b/ci/odl/fetch-charms.sh
@@ -20,7 +20,7 @@ build congress
 git clone  -b stable/16.10 https://github.com/openstack/charm-hacluster.git $distro/hacluster
 git clone  -b stable/16.10 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
 git clone  -b stable/16.10 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
-git clone  -b stable/16.10 https://github.com/openstack/charm-ceph-mon.git $distro/ceph
+git clone  -b stable/16.10 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon
 git clone  -b stable/16.10 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
 git clone  -b stable/16.10 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
 git clone  -b stable/16.10 https://github.com/openstack/charm-cinder.git $distro/cinder
diff --git a/ci/onos/fetch-charms.sh b/ci/onos/fetch-charms.sh
index 5b7c05a0..7c61b76b 100755
--- a/ci/onos/fetch-charms.sh
+++ b/ci/onos/fetch-charms.sh
@@ -20,7 +20,7 @@ build congress
 git clone -b stable/16.10 https://github.com/openstack/charm-hacluster.git $distro/hacluster
 git clone -b stable/16.10 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
 git clone -b stable/16.10 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
-git clone -b stable/16.10 https://github.com/openstack/charm-ceph-mon.git $distro/ceph
+git clone -b stable/16.10 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon
 git clone -b stable/16.10 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
 git clone -b stable/16.10 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
 git clone -b stable/16.10 https://github.com/openstack/charm-cinder.git $distro/cinder
diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh
index e8088af4..955abd64 100755
--- a/ci/opencontrail/fetch-charms.sh
+++ b/ci/opencontrail/fetch-charms.sh
@@ -24,7 +24,7 @@ git clone -b stable/16.10 https://github.com/openstack/charm-hacluster.git $dist
 #bzr branch lp:~sdn-charmers/charms/$distro/ceilometer/ceilometer-plugin $distro/ceilometer
 #git clone -b stable/16.10 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
 #git clone -b stable/16.10 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
-git clone -b stable/16.10 https://github.com/openstack/charm-ceph-mon.git $distro/ceph
+git clone -b stable/16.10 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon
 git clone -b stable/16.10 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
 git clone -b stable/16.10 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
 git clone -b stable/16.10 https://github.com/openstack/charm-cinder.git $distro/cinder