modfied to use latest charm currently.

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

14 files changed, 42 insertions, 25 deletions

diff --git a/ci/config_tpl/juju2/bundle_tpl/aodh.yaml b/ci/config_tpl/juju2/bundle_tpl/aodh.yaml
index 4adbe076..1349ad22 100644
--- a/ci/config_tpl/juju2/bundle_tpl/aodh.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/aodh.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/ceilometer.yaml b/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
index 8234b87d..c3cec5c4 100644
--- a/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
@@ -8,6 +8,7 @@
       num_units: {{ unit_qty() }}
 {% if os.service.bindings %}
       bindings:
+        shared-db: internal-api
         internal: internal-api
 {% if opnfv.spaces_dict.data is defined %}
         admin: admin-api
diff --git a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
index 0d5c5f21..915e73d9 100644
--- a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
@@ -5,7 +5,7 @@
 {% if os.service.bindings %}
       bindings:
 {% if opnfv.spaces_dict.public is defined %}
-        public: public-api
+        public: internal-api
 {% else %}
         public: internal-api
 {% endif %}
@@ -57,7 +57,7 @@
 {% if os.service.bindings %}
       bindings:
 {% if opnfv.spaces_dict.public is defined %}
-        public: public-api
+        public: internal-api
 {% else %}
         public: internal-api
 {% endif %}
diff --git a/ci/config_tpl/juju2/bundle_tpl/cinder.yaml b/ci/config_tpl/juju2/bundle_tpl/cinder.yaml
index e472a693..268563c7 100644
--- a/ci/config_tpl/juju2/bundle_tpl/cinder.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/cinder.yaml
@@ -8,6 +8,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/congress.yaml b/ci/config_tpl/juju2/bundle_tpl/congress.yaml
index 3330cad1..4800e58c 100644
--- a/ci/config_tpl/juju2/bundle_tpl/congress.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/congress.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/glance.yaml b/ci/config_tpl/juju2/bundle_tpl/glance.yaml
index 969b3c16..c57260c6 100644
--- a/ci/config_tpl/juju2/bundle_tpl/glance.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/glance.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/keystone.yaml b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml
index 685ff370..fc688b7c 100644
--- a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/keystone.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 e42d09ad..fdd732c4 100644
--- a/ci/config_tpl/juju2/bundle_tpl/mysql.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/mysql.yaml
@@ -3,6 +3,7 @@
       num_units: {{ unit_qty() }}
 {% if os.service.bindings %}
       bindings:
+        access: internal-api
         shared-db: internal-api
 {% endif %}
       options:
diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
index f2214144..fa15dd87 100644
--- a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/neutron-api.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/neutron-gateway.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml
index cddaa2f9..f0416a73 100644
--- a/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml
@@ -1,10 +1,13 @@
     neutron-gateway:
       charm: "./{{ ubuntu.release }}/neutron-gateway"
       num_units: 1
-{% if opnfv.spaces_dict.data is defined %}
 {% if os.service.bindings %}
+{% if opnfv.spaces_dict.data is defined %}
       bindings:
         data: admin-api
+{% else %}
+      bindings:
+        data: internal-api
 {% endif %}
 {% endif %}
       options:
diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
index c73f3721..1dd2210d 100644
--- a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
@@ -1,15 +1,20 @@
     neutron-openvswitch:
       charm: ./{{ ubuntu.release }}/neutron-openvswitch
-{% if opnfv.spaces_dict.data is defined %}
 {% if os.service.bindings %}
+{% if opnfv.spaces_dict.data is defined %}
       bindings:
         data: admin-api
       options:
 {% else %}
+      bindings:
+        data: internal-api
       options:
 {% endif %}
 {% else %}
       options:
+{% if opnfv.spaces_dict.data is defined %}
+        os-data-network: {{ opnfv.spaces_dict.data.cidr }}
+{% endif %}
 {% endif %}
 {% if os.network.dpdk %}
         enable-dpdk: true
diff --git a/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml b/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml
index 52f509c0..dd421dc9 100644
--- a/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.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/odl.yaml b/ci/config_tpl/juju2/bundle_tpl/odl.yaml
index b57e2843..27e22cbd 100644
--- a/ci/config_tpl/juju2/bundle_tpl/odl.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/odl.yaml
@@ -2,7 +2,7 @@
       charm: ./{{ ubuntu.release }}/odl-controller
       num_units: 1
       options:
-        install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.5.0-Boron/distribution-karaf-0.5.0-Boron.tar.gz"
+        install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.5.2-Boron-SR2/distribution-karaf-0.5.2-Boron-SR2.tar.gz"
 {% if os.network.sfc %}
         profile: "openvswitch-odl-beryllium-sfc"
 {% elif os.network.bgpvpn %}
diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh
index 5002a911..790e39ea 100755
--- a/ci/odl/fetch-charms.sh
+++ b/ci/odl/fetch-charms.sh
@@ -17,26 +17,26 @@ bzr branch lp:~narindergupta/opnfv/ntp $distro/ntp
 git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress
 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-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
-git clone  -b stable/16.10 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
-git clone  -b stable/16.10 https://github.com/openstack/charm-glance.git $distro/glance
-git clone  -b stable/16.10 https://github.com/openstack/charm-keystone.git $distro/keystone
-git clone  -b stable/16.10 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
-git clone  -b stable/16.10 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
-git clone  -b stable/16.10 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway
-git clone  -b stable/16.10 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
-git clone  -b stable/16.10 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
-git clone  -b stable/16.10 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
-git clone  -b stable/16.10 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
-git clone  -b stable/16.10 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
-git clone  -b stable/16.10 https://github.com/openstack/charm-heat.git $distro/heat
-git clone  -b stable/16.10 https://github.com/openstack/charm-lxd.git xenial/lxd
+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-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
+git clone  https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
+git clone  https://github.com/openstack/charm-glance.git $distro/glance
+git clone  https://github.com/openstack/charm-keystone.git $distro/keystone
+git clone  https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
+git clone  https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
+git clone  https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway
+git clone  https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
+git clone  https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
+git clone  https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
+git clone  https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
+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
 
 charm pull cs:$distro/aodh $distro/aodh