diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2017-05-04 16:36:58 -0500 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2017-05-04 16:37:23 -0500 |
| commit | 63d09f63cf10b9ab2e7c9bf936e5d7a686ff6c9a (patch) | |
| tree | e4dc29cdb568b09d517846d2ef0c88d4027dad99 | |
| parent | 1844bfff42a3190ae0246d7b480b59ea764be779 (diff) | |
modified to remove dns for K8 relationship.
Change-Id: Ibd4a0998dc3a6ccc344fd49f033856f045fcc7dd
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
| -rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/relations.yaml | 1 | ||||
| -rwxr-xr-x | juju/joid-configure-openstack | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ci/config_tpl/juju2/bundlek8_tpl/relations.yaml b/ci/config_tpl/juju2/bundlek8_tpl/relations.yaml index de69b769..32d9ccba 100644 --- 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 71e4f712..5df82b87 100755 --- 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" |