openstack/training-guides
Code Issues Proposed changes

Merge "Fix URLs in setup_neutron_controller.sh"

Browse Source
This commit is contained in:
Jenkins 2015-08-05 14:35:42 +00:00 committed by Gerrit Code Review
commit 1cc1dba016
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
labs/scripts/ubuntu/setup_neutron_controller.sh
View File

@ -40,7 +40,7 @@ keystone service-create \
neutron_service_id=$(keystone service-list | awk '/ network / {print $2}') neutron_service_id=$(keystone service-list | awk '/ network / {print $2}')
keystone endpoint-create \ keystone endpoint-create \
--service-id "$neutron_service_id" \ --service-id "$neutron_service_id" \
--publicurl "http://controller-api:9696" \ --publicurl "http://controller-mgmt:9696" \
--adminurl "http://controller-mgmt:9696" \ --adminurl "http://controller-mgmt:9696" \
--internalurl "http://controller-mgmt:9696" \ --internalurl "http://controller-mgmt:9696" \
--region "$REGION" --region "$REGION"
@ -73,7 +73,7 @@ iniset_sudo $conf DEFAULT rabbit_password "$RABBIT_PASSWORD"
iniset_sudo $conf DEFAULT auth_strategy keystone iniset_sudo $conf DEFAULT auth_strategy keystone
# Configuring [keystone_authtoken] section # Configuring [keystone_authtoken] section
iniset_sudo $conf keystone_authtoken auth_uri "http://controller-mgmt:5000" iniset_sudo $conf keystone_authtoken auth_uri "http://controller-mgmt:5000/v2.0"
iniset_sudo $conf keystone_authtoken identity_uri "http://controller-mgmt:35357" iniset_sudo $conf keystone_authtoken identity_uri "http://controller-mgmt:35357"
iniset_sudo $conf keystone_authtoken admin_tenant_name "$SERVICE_TENANT_NAME" iniset_sudo $conf keystone_authtoken admin_tenant_name "$SERVICE_TENANT_NAME"
iniset_sudo $conf keystone_authtoken admin_user "$neutron_admin_user" iniset_sudo $conf keystone_authtoken admin_user "$neutron_admin_user"