diff options
Diffstat (limited to 'juju')
| -rwxr-xr-x | juju/configure-juju-on-openstack | 2 | ||||
| -rwxr-xr-x | juju/joid-configure-openstack | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/juju/configure-juju-on-openstack b/juju/configure-juju-on-openstack index ad357ce7..c83a45a4 100755 --- a/juju/configure-juju-on-openstack +++ b/juju/configure-juju-on-openstack @@ -116,6 +116,8 @@ echo "credentials: password: $OS_PASSWORD tenant-name: $OS_TENANT_NAME username: $OS_USERNAME + user-domain-name: $OS_USER_DOMAIN_NAME + project-domain-name: $OS_PROJECT_DOMAIN_NAME " > os-creds.yaml juju add-credential openstack -f os-creds.yaml --replace diff --git a/juju/joid-configure-openstack b/juju/joid-configure-openstack index 5887ac73..52347b4a 100755 --- a/juju/joid-configure-openstack +++ b/juju/joid-configure-openstack @@ -57,9 +57,9 @@ echo "Configuring security groups for access to ICMP, SSH and RDP by default" PROJECT_ID=`openstack project list -c ID -f value --domain admin_domain` #Configure the default security group to allow ICMP and SSH -sicmpecuritygroup=`openstack security group list --project "$PROJECT_ID" -c ID -f value` -openstack security group rule list $securitygroup | grep "icmp" > /dev/null 2>&1 || openstack security group rule create --remote-group $securitygroup --ingress --protocol icmp --prefix "0.0.0.0/0"$securitygroup -openstack security group rule list $securitygroup | grep "22/tcp" > /dev/null 2>&1 || openstack security group rule create --remote-group $securitygroup --ingress --protocol tcp --dst-port 22:22 --prefix "0.0.0.0/0" $securitygroup +SEC_GRP=`openstack security group list --project "$PROJECT_ID" -c ID -f value` +openstack security group rule list $SEC_GRP | grep "icmp" > /dev/null 2>&1 || openstack security group rule create --remote-group $SEC_GRP --ingress --protocol icmp --prefix "0.0.0.0/0" $SEC_GRP +openstack security group rule list $SEC_GRP | grep "22/tcp" > /dev/null 2>&1 || openstack security group rule create --remote-group $SEC_GRP --ingress --protocol tcp --dst-port 22:22 --prefix "0.0.0.0/0" $SEC_GRP echo "Uploading default SSH key" |