move to master branch of charm for few bug fixes.

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

15 files changed, 98 insertions, 75 deletions

diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh
index 498c3f92..8019bb7a 100755
--- a/ci/03-maasdeploy.sh
+++ b/ci/03-maasdeploy.sh
@@ -25,7 +25,8 @@ sudo apt-get update -y
 sudo apt-get dist-upgrade -y
 sudo apt-get install openssh-server bzr git juju virtinst qemu-kvm libvirt-bin \
              maas maas-region-controller python-pip python-psutil python-openstackclient \
-             python-congressclient gsutil charm-tools pastebinit python-jinja2 sshpass -y
+             python-congressclient gsutil charm-tools pastebinit python-jinja2 sshpass \
+             openssh-server vlan -y
 
 sudo pip install --upgrade pip
 
@@ -185,6 +186,8 @@ installmaas(){
 
 #
 # MAAS config
+# https://insights.ubuntu.com/2016/01/23/maas-setup-deploying-openstack-on-maas-1-9-with-juju/
+# http://blog.naydenov.net/2016/01/nodes-networking-deploying-openstack-on-maas-1-9-with-juju/
 #
 configuremaas(){
     sudo maas createadmin --username=ubuntu --email=ubuntu@ubuntu.com --password=ubuntu
@@ -212,6 +215,26 @@ configuremaas(){
     maas $PROFILE tags create name='compute'
     maas $PROFILE tags create name='control'
     maas $PROFILE tags create name='storage'
+
+    #create the required spaces.
+    maas $PROFILE space update 0 name=default
+    maas $PROFILE spaces create name=unused
+    maas $PROFILE spaces create name=admin-api
+    maas $PROFILE spaces create name=internal-api
+    maas $PROFILE spaces create name=public-api
+    maas $PROFILE spaces create name=compute-data
+    maas $PROFILE spaces create name=compute-external
+    maas $PROFILE spaces create name=storage-data
+    maas $PROFILE spaces create name=storage-cluster
+
+    #maas $PROFILE subnet update vlan:<vlan id> name=internal-api space=<0> gateway_ip=10.5.1.1
+    #maas $PROFILE subnet update vlan:<vlan id> name=admin-api space=<2> gateway_ip=10.5.12.1
+    #maas $PROFILE subnet update vlan:<vlan id> name=public-api space=<1> gateway_ip=10.5.15.1
+    #maas $PROFILE subnet update vlan:<vlan id> name=compute-data space=<3> gateway_ip=10.5.17.1
+    #maas $PROFILE subnet update vlan:<vlan id> name=compute-external space=<4> gateway_ip=10.5.19.1
+    #maas $PROFILE subnet update vlan:<vlan id> name=storage-data space=<5> gateway_ip=10.5.20.1
+    #maas $PROFILE subnet update vlan:<vlan id> name=storage-cluster space=<6> gateway_ip=10.5.21.1
+
 }
 
 enablesubnetanddhcp(){
diff --git a/ci/config_tpl/juju2/bundle_tpl/aodh.yaml b/ci/config_tpl/juju2/bundle_tpl/aodh.yaml
index 92617ea1..4adbe076 100644
--- a/ci/config_tpl/juju2/bundle_tpl/aodh.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/aodh.yaml
@@ -3,16 +3,16 @@
       num_units: 1
 {% if os.service.bindings %}
       bindings:
-        internal: internal
+        internal: internal-api
 {% if opnfv.spaces_dict.data is defined %}
-        admin: admin
+        admin: admin-api
 {% else %}
-        admin: internal
+        admin: internal-api
 {% endif %}
 {% if opnfv.spaces_dict.public is defined %}
-        public: public
+        public: public-api
 {% else %}
-        public: internal
+        public: internal-api
 {% endif %}
 {% endif %}
       options:
diff --git a/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml b/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
index 554450f6..8234b87d 100644
--- a/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
@@ -8,16 +8,16 @@
       num_units: {{ unit_qty() }}
 {% if os.service.bindings %}
       bindings:
-        internal: internal
+        internal: internal-api
 {% if opnfv.spaces_dict.data is defined %}
-        admin: admin
+        admin: admin-api
 {% else %}
-        admin: internal
+        admin: internal-api
 {% endif %}
 {% if opnfv.spaces_dict.public is defined %}
-        public: public
+        public: public-api
 {% else %}
-        public: internal
+        public: internal-api
 {% endif %}
 {% endif %}
       options:
diff --git a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
index 16a3206d..9592fae6 100644
--- a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
@@ -82,16 +82,16 @@
       num_units: {{ unit_qty() if os.beta.hacluster_ceph_radosgw else 1 }}
 {% if os.service.bindings %}
       bindings:
-        internal: internal
+        internal: internal-api
 {% if opnfv.spaces_dict.data is defined %}
-        admin: admin
+        admin: admin-api
 {% else %}
-        admin: internal
+        admin: internal-api
 {% endif %}
 {% if opnfv.spaces_dict.public is defined %}
-        public: public
+        public: public-api
 {% else %}
-        public: internal
+        public: internal-api
 {% endif %}
 {% endif %}
       options:
diff --git a/ci/config_tpl/juju2/bundle_tpl/cinder.yaml b/ci/config_tpl/juju2/bundle_tpl/cinder.yaml
index 82c15c38..e472a693 100644
--- a/ci/config_tpl/juju2/bundle_tpl/cinder.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/cinder.yaml
@@ -7,16 +7,16 @@
 {% endif %}
 {% if os.service.bindings %}
       bindings:
-        internal: internal
+        internal: internal-api
 {% if opnfv.spaces_dict.data is defined %}
-        admin: admin
+        admin: admin-api
 {% else %}
-        admin: internal
+        admin: internal-api
 {% endif %}
 {% if opnfv.spaces_dict.public is defined %}
-        public: public
+        public: public-api
 {% else %}
-        public: internal
+        public: internal-api
 {% endif %}
 {% endif %}
       options:
diff --git a/ci/config_tpl/juju2/bundle_tpl/congress.yaml b/ci/config_tpl/juju2/bundle_tpl/congress.yaml
index b57bf328..3330cad1 100644
--- a/ci/config_tpl/juju2/bundle_tpl/congress.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/congress.yaml
@@ -3,16 +3,16 @@
       num_units: 1
 {% if os.service.bindings %}
       bindings:
-        internal: internal
+        internal: internal-api
 {% if opnfv.spaces_dict.data is defined %}
-        admin: admin
+        admin: admin-api
 {% else %}
-        admin: internal
+        admin: internal-api
 {% endif %}
 {% if opnfv.spaces_dict.public is defined %}
-        public: public
+        public: public-api
 {% else %}
-        public: internal
+        public: internal-api
 {% endif %}
 {% endif %}
       options:
diff --git a/ci/config_tpl/juju2/bundle_tpl/glance.yaml b/ci/config_tpl/juju2/bundle_tpl/glance.yaml
index e8eee7fd..969b3c16 100644
--- a/ci/config_tpl/juju2/bundle_tpl/glance.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/glance.yaml
@@ -3,16 +3,16 @@
       num_units: {{ unit_qty() }}
 {% if os.service.bindings %}
       bindings:
-        internal: internal
+        internal: internal-api
 {% if opnfv.spaces_dict.data is defined %}
-        admin: admin
+        admin: admin-api
 {% else %}
-        admin: internal
+        admin: internal-api
 {% endif %}
 {% if opnfv.spaces_dict.public is defined %}
-        public: public
+        public: public-api
 {% else %}
-        public: internal
+        public: internal-api
 {% endif %}
 {% endif %}
       options:
diff --git a/ci/config_tpl/juju2/bundle_tpl/heat.yaml b/ci/config_tpl/juju2/bundle_tpl/heat.yaml
index 4af546d3..59edd419 100644
--- a/ci/config_tpl/juju2/bundle_tpl/heat.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/heat.yaml
@@ -3,16 +3,16 @@
       num_units: 1
 {% if os.service.bindings %}
       bindings:
-        internal: internal
+        internal: internal-api
 {% if opnfv.spaces_dict.data is defined %}
-        admin: admin
+        admin: admin-api
 {% else %}
-        admin: internal
+        admin: internal-api
 {% endif %}
 {% if opnfv.spaces_dict.public is defined %}
-        public: public
+        public: public-api
 {% else %}
-        public: internal
+        public: internal-api
 {% endif %}
 {% endif %}
       options:
diff --git a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml
index c25f309b..685ff370 100644
--- a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml
@@ -3,16 +3,16 @@
       num_units: {{ unit_qty() }}
 {% if os.service.bindings %}
       bindings:
-        internal: internal
+        internal: internal-api
 {% if opnfv.spaces_dict.data is defined %}
-        admin: admin
+        admin: admin-api
 {% else %}
-        admin: internal
+        admin: internal-api
 {% endif %}
 {% if opnfv.spaces_dict.public is defined %}
-        public: public
+        public: public-api
 {% else %}
-        public: internal
+        public: internal-api
 {% endif %}
 {% 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 863715d3..f2214144 100644
--- a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
@@ -3,16 +3,16 @@
       num_units: {{ unit_qty() }}
 {% if os.service.bindings %}
       bindings:
-        internal: internal
+        internal: internal-api
 {% if opnfv.spaces_dict.data is defined %}
-        admin: admin
+        admin: admin-api
 {% else %}
-        admin: internal
+        admin: internal-api
 {% endif %}
 {% if opnfv.spaces_dict.public is defined %}
-        public: public
+        public: public-api
 {% else %}
-        public: internal
+        public: internal-api
 {% endif %}
 {% endif %}
       options:
@@ -20,7 +20,7 @@
         region: {{ os.region }}
         neutron-security-groups: true
 {% if os.beta.public_api %}
-        use-internal-endpoints: true
+        #use-internal-endpoints: true
 {% endif %}
 {% if os.network.ipv6 %}
         prefer-ipv6: {{ os.network.ipv6 }}
diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml
index cb459cc1..cddaa2f9 100644
--- a/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml
@@ -4,7 +4,7 @@
 {% if opnfv.spaces_dict.data is defined %}
 {% if os.service.bindings %}
       bindings:
-        data: admin
+        data: admin-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 7eb02534..d12f3257 100644
--- a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
@@ -4,7 +4,7 @@
 {% if opnfv.spaces_dict.data is defined %}
 {% if os.service.bindings %}
       bindings:
-        data: admin
+        data: admin-api
 {% endif %}
 {% endif %}
 {% if os.network.dpdk %}
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 e20e99a7..52f509c0 100644
--- a/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml
@@ -3,16 +3,16 @@
       num_units: {{ unit_qty() }}
 {% if os.service.bindings %}
       bindings:
-        internal: internal
+        internal: internal-api
 {% if opnfv.spaces_dict.data is defined %}
-        admin: admin
+        admin: admin-api
 {% else %}
-        admin: internal
+        admin: internal-api
 {% endif %}
 {% if opnfv.spaces_dict.public is defined %}
-        public: public
+        public: public-api
 {% else %}
-        public: internal
+        public: internal-api
 {% endif %}
 {% endif %}
       options:
diff --git a/ci/config_tpl/juju2/bundle_tpl/rabbitmq.yaml b/ci/config_tpl/juju2/bundle_tpl/rabbitmq.yaml
index a9515202..5f8d5adc 100644
--- a/ci/config_tpl/juju2/bundle_tpl/rabbitmq.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/rabbitmq.yaml
@@ -3,7 +3,7 @@
       num_units: {{ unit_qty() }}
 {% if os.service.bindings %}
       bindings:
-        amqp: internal
+        amqp: internal-api
 {% endif %}
       options:
 {% if opnfv.storage_dict.ceph is defined %}
diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh
index 661b0dee..8abf6fcf 100755
--- a/ci/nosdn/fetch-charms.sh
+++ b/ci/nosdn/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
-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
+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
 charm pull cs:~free.ekanayaka/xenial/haproxy-1 $distro/haproxy