modified to use /srv instead of /dev/sdb for ceph.

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

diff --git a/ci/config_tpl/juju2/bundle_tpl/mysql.yaml b/ci/config_tpl/juju2/bundle_tpl/mysql.yaml
index d6276a5..e5626a7 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/mysql.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/mysql.yaml
@@ -13,6 +13,9 @@
         innodb-buffer-pool-size: 1G
 {% endif %}
         max-connections: 4000
+        #performance-schema: true
+        #source: "deb http://repo.percona.com/apt xenial main"
+        #key: "8507EFA5"
         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/odl.yaml b/ci/config_tpl/juju2/bundle_tpl/odl.yaml
index 2be64b1..5580449 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/odl.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/odl.yaml
@@ -3,19 +3,7 @@
       num_units: 1
 {% if os.service.bindings %}
       bindings:
-        shared-db: internal-api
-        internal: internal-api
-{% if opnfv.spaces_dict.public is defined %}
-        public: public-api
-{% if opnfv.spaces_dict.data is defined %}
-        admin: admin-api
-{% else %}
-        admin: internal-api
-{% endif %}
-{% else %}
-        admin: internal-api
-        public: internal-api
-{% endif %}
+        "": internal-api
 {% endif %}
       options:
         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"

diff --git a/ci/onos/fetch-charms.sh b/ci/onos/fetch-charms.sh
index 7c61b76..3e22b92 100755 (executable)
--- a/ci/onos/fetch-charms.sh
+++ b/ci/onos/fetch-charms.sh
@@ -17,25 +17,25 @@ 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-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 $distro/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-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 $distro/lxd
 
 charm pull cs:$distro/aodh $distro/aodh
 

diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh
index 955abd6..98348b1 100755 (executable)
--- a/ci/opencontrail/fetch-charms.sh
+++ b/ci/opencontrail/fetch-charms.sh
@@ -20,26 +20,26 @@ charm pull cs:$distro/aodh $distro/aodh
 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 https://github.com/openstack/charm-hacluster.git $distro/hacluster
 #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-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-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-neutron-api.git $distro/neutron-api
+#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-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-neutron-api.git $distro/neutron-api
 
 #charm pull cs:~openstack-charmers-next/hacluster $distro/hacluster
 #charm pull cs:~openstack-charmers-next/ceilometer $distro/ceilometer

diff --git a/labconfig/huawei/pod12/labconfig.yaml b/labconfig/huawei/pod12/labconfig.yaml
index d10069f..1d3da94 100644 (file)
--- a/labconfig/huawei/pod12/labconfig.yaml
+++ b/labconfig/huawei/pod12/labconfig.yaml
@@ -107,7 +107,7 @@ opnfv:
   - type: nosdn
   storage:
   - type: ceph
-    disk: /dev/sdb
+    disk: /srv
   feature: odl_l2
   spaces:
   - type: admin