diff --git a/labs/config/openstack b/labs/config/openstack index 704afcff..78aed97b 100644 --- a/labs/config/openstack +++ b/labs/config/openstack @@ -29,4 +29,6 @@ CIRROS_URL="http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img" # Default is Google Public DNS (8.8.8.8); to disable, set to "". : ${TENANT_VM_DNS_SERVER:=8.8.8.8} +: ${REGION:=regionOne} + # vim: set ai ts=4 sw=4 et ft=sh: diff --git a/labs/scripts/ubuntu/setup_keystone.sh b/labs/scripts/ubuntu/setup_keystone.sh index a1c79208..2d00e699 100755 --- a/labs/scripts/ubuntu/setup_keystone.sh +++ b/labs/scripts/ubuntu/setup_keystone.sh @@ -3,6 +3,8 @@ set -o errexit -o nounset TOP_DIR=$(cd $(dirname "$0")/.. && pwd) source "$TOP_DIR/config/paths" source "$CONFIG_DIR/credentials" +# Get REGION +source "$CONFIG_DIR/openstack" source "$LIB_DIR/functions.guest" exec_logfile @@ -137,7 +139,8 @@ keystone endpoint-create \ --service-id "$keystone_service_id" \ --publicurl "http://controller-api:5000/v2.0" \ --internalurl "http://controller-mgmt:5000/v2.0" \ - --adminurl "http://controller-mgmt:35357/v2.0" + --adminurl "http://controller-mgmt:35357/v2.0" \ + --region "$REGION" #------------------------------------------------------------------------------ # Verify the Identity Service installation diff --git a/labs/scripts/ubuntu/setup_neutron_network.sh b/labs/scripts/ubuntu/setup_neutron_network.sh index 464e6717..8a60bd0a 100755 --- a/labs/scripts/ubuntu/setup_neutron_network.sh +++ b/labs/scripts/ubuntu/setup_neutron_network.sh @@ -122,7 +122,7 @@ sudo killall dnsmasq||rc=$? echo "Configuring the metadata agent" conf=/etc/neutron/metadata_agent.ini iniset_sudo $conf DEFAULT auth_url http://controller-mgmt:5000/v2.0 -iniset_sudo $conf DEFAULT auth_region regionOne +iniset_sudo $conf DEFAULT auth_region "$REGION" iniset_sudo $conf DEFAULT admin_tenant_name "$SERVICE_TENANT_NAME" iniset_sudo $conf DEFAULT admin_user "$neutron_admin_user" iniset_sudo $conf DEFAULT admin_password "$neutron_admin_password"