SM-STORAGE: changes to support kilo with storage.

Closes-Bug: #1537283

Changes:
========
1. changes to cinder.conf for v2 api support
2. details about keystone auth_uri and identity_uri.
3. changed openstackrc template to supprot volume  V2 api.

PATCH 2:
1. enabled v1 api as it works for both kilo/juno

TESTING:
=========
KILO:
1. provisioned 5 servers with kilo, verified provison completed
2. created 2 volumes, of type ocs-type-block
3. added a image using glance, launched a network, subnet and 2 VMs.
4. attached volumes to instances.
5. login to horizon, login to console, pinged other VM, wget metadata file
(http://169.254.169.254/openstack).
6. verified one volume with /dev/vdb was available to instance

JUNO:
1. provisioned 5 servers with kilo, verified provison completed
2. created 2 volumes, of type ocs-type-block
3. added a image using glance, launched a network, subnet and 2 VMs.
4. attached volumes to instances.
5. login to horizon, login to console, pinged other VM, wget metadata file
(http://169.254.169.254/openstack).
6. verified one volume with /dev/vdb was available to instance

Change-Id: If1c04282621131e20da0e2d402ced88a0b10a3f3

contrail/environment/modules/contrail/files/config-storage-openstack.sh

@@ -14,6 +14,15 @@ NUM_TARGET_OSD=$3
 openstack-config --set /etc/cinder/cinder.conf DEFAULT sql_connection mysql://cinder:cinder@127.0.0.1/cinder
 openstack-config --set /etc/cinder/cinder.conf DEFAULT enabled_backends rbd-disk
 openstack-config --set /etc/cinder/cinder.conf DEFAULT rabbit_host  ${openstack_ip}
+openstack-config --set /etc/cinder/cinder.conf DEFAULT rpc_backend rabbit
+openstack-config --set /etc/cinder/cinder.conf DEFAULT enable_v1_api true
+openstack-config --set /etc/cinder/cinder.conf DEFAULT enable_v2_api true
+openstack-config --set /etc/cinder/cinder.conf DEFAULT auth_strategy keystone
+
+openstack-config --set /etc/cinder/cinder.conf keystone_authtoken auth_uri http://${openstack_ip}:5000/v2.0
+openstack-config --set /etc/cinder/cinder.conf keystone_authtoken identity_uri http://${openstack_ip}:35357
+
+
 openstack-config --set /etc/cinder/cinder.conf rbd-disk rbd_pool volumes
 openstack-config --set /etc/cinder/cinder.conf rbd-disk rbd_user volumes
 openstack-config --set /etc/cinder/cinder.conf rbd-disk rbd_secret_uuid $virsh_secret
@@ -29,6 +38,11 @@ openstack-config --set /etc/glance/glance-api.conf DEFAULT rbd_store_pool images
 openstack-config --set /etc/glance/glance-api.conf DEFAULT rbd_store_ceph_conf /etc/ceph/ceph.conf
 openstack-config --set /etc/glance/glance-api.conf DEFAULT known_stores glance.store.rbd.Store,glance.store.http.Store,glance.store.filesystem.Store
 
+openstack-config --set /etc/glance/glance-api.conf glance_store default_store rbd
+openstack-config --set /etc/glance/glance-api.conf glance_store rbd_store_chunk_size 8
+openstack-config --set /etc/glance/glance-api.conf glance_store rbd_store_pool images
+openstack-config --set /etc/glance/glance-api.conf glance_store rbd_store_ceph_conf /etc/ceph/ceph.conf
+openstack-config --set /etc/glance/glance-api.conf glance_store stores glance.store.rbd.Store,glance.store.filesystem.Store,glance.store.http.Store
 ## configure ceph-rest-api 
 sed -i "s/app.run(host=app.ceph_addr, port=app.ceph_port)/app.run(host=app.ceph_addr, port=5005)/" /usr/bin/ceph-rest-api