openstack/training-guides
Code Issues Proposed changes

Functional changes in keystone (part 3) to match Juno

Browse Source 
Make functional changes in keystone (part 3) to match the Juno
install-guide.

Change-Id: Ia7992af923e786d8eba78a34d437cb830d8cc2ec
This commit is contained in:
Roger Luethi
2014-12-28 16:08:40 +01:00
parent c0a6c50ecf
commit 3ebd54a44d
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
labs/config/openstack
View File

@@ -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 "". # Default is Google Public DNS (8.8.8.8); to disable, set to "".
: ${TENANT_VM_DNS_SERVER:=8.8.8.8} : ${TENANT_VM_DNS_SERVER:=8.8.8.8}
: ${REGION:=regionOne}
# vim: set ai ts=4 sw=4 et ft=sh: # vim: set ai ts=4 sw=4 et ft=sh:

5
labs/scripts/ubuntu/setup_keystone.sh
View File

@@ -3,6 +3,8 @@ set -o errexit -o nounset
TOP_DIR=$(cd $(dirname "$0")/.. && pwd) TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
source "$TOP_DIR/config/paths" source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/credentials" source "$CONFIG_DIR/credentials"
# Get REGION
source "$CONFIG_DIR/openstack"
source "$LIB_DIR/functions.guest" source "$LIB_DIR/functions.guest"
exec_logfile exec_logfile
@@ -137,7 +139,8 @@ keystone endpoint-create \
--service-id "$keystone_service_id" \ --service-id "$keystone_service_id" \
--publicurl "http://controller-api:5000/v2.0" \ --publicurl "http://controller-api:5000/v2.0" \
--internalurl "http://controller-mgmt: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 # Verify the Identity Service installation

2
labs/scripts/ubuntu/setup_neutron_network.sh
View File

@@ -122,7 +122,7 @@ sudo killall dnsmasq||rc=$?
echo "Configuring the metadata agent" echo "Configuring the metadata agent"
conf=/etc/neutron/metadata_agent.ini conf=/etc/neutron/metadata_agent.ini
iniset_sudo $conf DEFAULT auth_url http://controller-mgmt:5000/v2.0 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_tenant_name "$SERVICE_TENANT_NAME"
iniset_sudo $conf DEFAULT admin_user "$neutron_admin_user" iniset_sudo $conf DEFAULT admin_user "$neutron_admin_user"
iniset_sudo $conf DEFAULT admin_password "$neutron_admin_password" iniset_sudo $conf DEFAULT admin_password "$neutron_admin_password"