summaryrefslogtreecommitdiff
path: root/openstack
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2014-12-18 09:40:06 +0000
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-02-11 18:30:32 +0000
commita80c7960d561ee4e44603fae1d36c5d84b6f4fb7 (patch)
treeb9f6c3d90b0cba98011424cfa73c71a72b9ab49a /openstack
parent330d7fe2ee5c90c0393fb0d80674da0917e1031c (diff)
downloaddefinitions-a80c7960d561ee4e44603fae1d36c5d84b6f4fb7.tar.gz
FIXUPME: Fix neutron description for keystone service-create and add region
Diffstat (limited to 'openstack')
-rw-r--r--openstack/usr/share/openstack/openstack-neutron-setup5
1 files changed, 3 insertions, 2 deletions
diff --git a/openstack/usr/share/openstack/openstack-neutron-setup b/openstack/usr/share/openstack/openstack-neutron-setup
index 94b0791c..731bd919 100644
--- a/openstack/usr/share/openstack/openstack-neutron-setup
+++ b/openstack/usr/share/openstack/openstack-neutron-setup
@@ -33,11 +33,12 @@ export OS_SERVICE_ENDPOINT='http://localhost:35357/v2.0'
keystone user-create --name ##NEUTRON_SERVICE_USER## --pass ##NEUTRON_SERVICE_PASSWORD##
keystone user-role-add --tenant service --user ##NEUTRON_SERVICE_USER## --role admin
-keystone service-create --name neutron --type network --description "OpenStack Compute Service"
+keystone service-create --name neutron --type network --description "OpenStack Networking"
keystone endpoint-create --service-id $(keystone service-list | awk '/ network / {print $2}') \
--publicurl ##NEUTRON_PUBLIC_URL## \
--internalurl ##NEUTRON_INTERNAL_URL## \
- --adminurl ##NEUTRON_ADMIN_URL##
+ --adminurl ##NEUTRON_ADMIN_URL## \
+ --region regionOne
# Neutron compute configuration
if [ ! -d /var/run/neutron ]; then