Merge "add remote virsh support for bootstrap"

diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh
index ac7804c..4fd75bf 100755 (executable)
--- a/ci/03-maasdeploy.sh
+++ b/ci/03-maasdeploy.sh
@@ -10,6 +10,7 @@ if [ ! -e $HOME/.ssh/id_rsa ]; then
 fi
 
 #install the packages needed
+sudo apt-get install software-properties-common -y
 sudo apt-add-repository ppa:juju/stable -y
 sudo apt-add-repository ppa:maas/stable -y
 sudo apt-add-repository cloud-archive:ocata -y

diff --git a/ci/config_tpl/juju2/bundlek8_tpl/relations.yaml b/ci/config_tpl/juju2/bundlek8_tpl/relations.yaml
index de69b76..32d9ccb 100644 (file)
--- a/ci/config_tpl/juju2/bundlek8_tpl/relations.yaml
+++ b/ci/config_tpl/juju2/bundlek8_tpl/relations.yaml
@@ -3,7 +3,6 @@
 {% else %}
     - [ 'kubernetes-master:kube-api-endpoint', 'kubernetes-worker:kube-api-endpoint' ]
 {% endif %}
-    - [ 'kubernetes-master:cluster-dns', 'kubernetes-worker:kube-dns' ]
     - [ 'kubernetes-master:certificates', 'easyrsa:client' ]
     - [ 'kubernetes-master:etcd', 'etcd:db' ]
     - [ 'kubernetes-worker:certificates', 'easyrsa:client' ]

diff --git a/juju/joid-configure-openstack b/juju/joid-configure-openstack
index 71e4f71..5df82b8 100755 (executable)
--- a/juju/joid-configure-openstack
+++ b/juju/joid-configure-openstack
@@ -78,12 +78,13 @@ openstack flavor show m1.xlarge > /dev/null 2>&1 || openstack flavor create --ra
 echo "modifying default quotas for admin user"
 
 #Modify quotas for the tenant to allow large deployments
-openstack quota set --instances 400 --cores 800 --ram 404800 --secgroups 4000 --floating-ips -1 --secgroup-rules -1 $TENANT_ID
+PROJECT_ID=`openstack quota show -f value -c project`
+openstack quota set --instances 400 --cores 800 --ram 404800 --secgroups 4000 --floating-ips -1 --secgroup-rules -1 $PROJECT_ID
 
 ### need to find how to change quota for the project not the tenant
 
 ### modify default quota the same way..
-openstack quota set --class --instances 400 --cores 800 --ram 404800 --secgroups 4000 --floating-ips -1 --secgroup-rules -1 $TENANT_ID
+#openstack quota set --class --instances 400 --cores 800 --ram 404800 --secgroups 4000 --floating-ips -1 --secgroup-rules -1 $TENANT_ID
 
 echo "Uploading images to glance"