diff --git a/doc/install-guide/object-storage/section_object-storage-install.xml b/doc/install-guide/object-storage/section_object-storage-install.xml index c0bbae4265..85ce92f1b3 100644 --- a/doc/install-guide/object-storage/section_object-storage-install.xml +++ b/doc/install-guide/object-storage/section_object-storage-install.xml @@ -84,8 +84,6 @@ | Property | Value | +-------------+----------------------------------+ | description | Object Storage Service | -| | | -| | | | id | eede9296683e4b5ebfa13f5166375ef6 | | name | swift | | type | object-store | @@ -100,7 +98,7 @@ In this guide, the controller host name is used. # keystone endpoint-create \ - --service-id=the_service_id_above \ + --service-id=$(keystone service-list | awk '/ object-store / {print $2}') \ --publicurl='http://controller:8080/v1/AUTH_%(tenant_id)s' \ --internalurl='http://controller:8080/v1/AUTH_%(tenant_id)s' \ --adminurl=http://controller:8080 diff --git a/doc/install-guide/section_ceilometer-install.xml b/doc/install-guide/section_ceilometer-install.xml index 73fc236f36..fae27441a1 100644 --- a/doc/install-guide/section_ceilometer-install.xml +++ b/doc/install-guide/section_ceilometer-install.xml @@ -207,13 +207,9 @@ os_password = CEILOMETER_PASS keystone command to register the service and specify the endpoint: # keystone service-create --name=ceilometer --type=metering \ - --description="Ceilometer Telemetry Service" - - - Note the id property that is returned - for the service. Use it when you create the endpoint: - # keystone endpoint-create \ - --service-id=the_service_id_above \ + --description="Ceilometer Telemetry Service" +# keystone endpoint-create \ + --service-id=$(keystone service-list | awk '/ metering / {print $2}') \ --publicurl=http://controller:8777 \ --internalurl=http://controller:8777 \ --adminurl=http://controller:8777 diff --git a/doc/install-guide/section_cinder-controller.xml b/doc/install-guide/section_cinder-controller.xml index 02f24a84db..d3187d8820 100644 --- a/doc/install-guide/section_cinder-controller.xml +++ b/doc/install-guide/section_cinder-controller.xml @@ -136,11 +136,9 @@ rabbit_password = RABBIT_PASS Register the service and specify the endpoint using the keystone command. # keystone service-create --name=cinder --type=volume \ - --description="Cinder Volume Service" - Note the id property returned and use - it to create the endpoint. - # keystone endpoint-create \ - --service-id=the_service_id_above \ + --description="Cinder Volume Service" +# keystone endpoint-create \ + --service-id=$(keystone service-list | awk '/ volume / {print $2}') \ --publicurl=http://controller:8776/v1/%\(tenant_id\)s \ --internalurl=http://controller:8776/v1/%\(tenant_id\)s \ --adminurl=http://controller:8776/v1/%\(tenant_id\)s @@ -149,11 +147,9 @@ rabbit_password = RABBIT_PASS Also register a service and endpoint for version 2 of the Block Storage Service API. # keystone service-create --name=cinderv2 --type=volumev2 \ - --description="Cinder Volume Service V2" - Note the id property returned and use - it to create the endpoint. - # keystone endpoint-create \ - --service-id=the_service_id_above \ + --description="Cinder Volume Service V2" +# keystone endpoint-create \ + --service-id=$(keystone service-list | awk '/ volumev2 / {print $2}') \ --publicurl=http://controller:8776/v2/%\(tenant_id\)s \ --internalurl=http://controller:8776/v2/%\(tenant_id\)s \ --adminurl=http://controller:8776/v2/%\(tenant_id\)s diff --git a/doc/install-guide/section_glance-install.xml b/doc/install-guide/section_glance-install.xml index 600d6bf693..b2bb1a3caf 100644 --- a/doc/install-guide/section_glance-install.xml +++ b/doc/install-guide/section_glance-install.xml @@ -192,13 +192,9 @@ admin_password=GLANCE_PASS that other OpenStack services can locate it. Register the service and create the endpoint: # keystone service-create --name=glance --type=image \ - --description="Glance Image Service" - - - Use the id property returned for the - service to create the endpoint: - # keystone endpoint-create \ - --service-id=the_service_id_above \ + --description="Glance Image Service" +# keystone endpoint-create \ + --service-id=$(keystone service-list | awk '/ image / {print $2}') \ --publicurl=http://controller:9292 \ --internalurl=http://controller:9292 \ --adminurl=http://controller:9292 diff --git a/doc/install-guide/section_heat-install.xml b/doc/install-guide/section_heat-install.xml index 577f26990c..a836ab0f9b 100644 --- a/doc/install-guide/section_heat-install.xml +++ b/doc/install-guide/section_heat-install.xml @@ -127,24 +127,16 @@ keystone_ec2_uri = http://controller:5000/v2.0/ec2tok these APIs. Register the service and specify the endpoint: # keystone service-create --name=heat --type=orchestration \ - --description="Heat Orchestration API" - - - Use the id property that is returned - for the service to create the endpoint: - # keystone endpoint-create \ - --service-id=the_service_id_above \ + --description="Heat Orchestration API" +# keystone endpoint-create \ + --service-id=$(keystone service-list | awk '/ orchestration / {print $2}') \ --publicurl=http://controller:8004/v1/%\(tenant_id\)s \ --internalurl=http://controller:8004/v1/%\(tenant_id\)s \ - --adminurl=http://controller:8004/v1/%\(tenant_id\)s - # keystone service-create --name=heat-cfn --type=cloudformation \ - --description="Heat CloudFormation API" - - - Use the id property that is returned - for the service to create the endpoint: - # keystone endpoint-create \ - --service-id=the_service_id_above \ + --adminurl=http://controller:8004/v1/%\(tenant_id\)s +# keystone service-create --name=heat-cfn --type=cloudformation \ + --description="Heat CloudFormation API" +# keystone endpoint-create \ + --service-id=$(keystone service-list | awk '/ cloudformation / {print $2}') \ --publicurl=http://controller:8000/v1 \ --internalurl=http://controller:8000/v1 \ --adminurl=http://controller:8000/v1 diff --git a/doc/install-guide/section_keystone-services.xml b/doc/install-guide/section_keystone-services.xml index d342f76242..aec86149d1 100644 --- a/doc/install-guide/section_keystone-services.xml +++ b/doc/install-guide/section_keystone-services.xml @@ -43,7 +43,7 @@ controller host name is used. Note that the Identity Service uses a different port for the admin API. # keystone endpoint-create \ - --service-id=the_service_id_above \ + --service-id=$(keystone service-list | awk '/ identity / {print $2}') \ --publicurl=http://controller:5000/v2.0 \ --internalurl=http://controller:5000/v2.0 \ --adminurl=http://controller:35357/v2.0 diff --git a/doc/install-guide/section_neutron-install.xml b/doc/install-guide/section_neutron-install.xml index c5f726b495..34f0c77979 100644 --- a/doc/install-guide/section_neutron-install.xml +++ b/doc/install-guide/section_neutron-install.xml @@ -152,11 +152,9 @@ IDENTIFIED BY 'NEUTRON_DBPASS'; Create the neutron service: # keystone service-create --name=neutron --type=network \ --description="OpenStack Networking Service" - Create a Networking endpoint. Use the - id property for the service that was - returned in the previous step to create the endpoint: + Create a Networking endpoint: # keystone endpoint-create \ - --service-id the_service_id_above \ + --service-id $(keystone service-list | awk '/ network / {print $2}') \ --publicurl http://controller:9696 \ --adminurl http://controller:9696 \ --internalurl http://controller:9696 diff --git a/doc/install-guide/section_nova-controller.xml b/doc/install-guide/section_nova-controller.xml index c864ce156f..8030b7099f 100644 --- a/doc/install-guide/section_nova-controller.xml +++ b/doc/install-guide/section_nova-controller.xml @@ -211,13 +211,9 @@ admin_password = NOVA_PASS service and specify the endpoint: # keystone service-create --name=nova --type=compute \ - --description="Nova Compute service" - - - Use the id property that is returned to - create the endpoint. - # keystone endpoint-create \ - --service-id=the_service_id_above \ + --description="Nova Compute service" +# keystone endpoint-create \ + --service-id=$(keystone service-list | awk '/ compute / {print $2}') \ --publicurl=http://controller:8774/v2/%\(tenant_id\)s \ --internalurl=http://controller:8774/v2/%\(tenant_id\)s \ --adminurl=http://controller:8774/v2/%\(tenant_id\)s