diff --git a/doc/src/docbkx/openstack-install/identity-install-keystone.xml b/doc/src/docbkx/openstack-install/identity-install-keystone.xml index 04d192c5a82..71fb2a69a0d 100644 --- a/doc/src/docbkx/openstack-install/identity-install-keystone.xml +++ b/doc/src/docbkx/openstack-install/identity-install-keystone.xml @@ -565,9 +565,9 @@ service-create \ endpoint-create \ --region RegionOne \ --service_id=272efad2d1234376cbb911c1e5a5a6ed \ - --publicurl 'http://127.0.0.1:8080/v1/AUTH_%(tenant_id)s' \ - --adminurl 'http://127.0.0.1:8080/' \ - --internalurl 'http://127.0.0.1:8080/v1/AUTH_%(tenant_id)s' + --publicurl 'http://127.0.0.1:8888/v1/AUTH_%(tenant_id)s' \ + --adminurl 'http://127.0.0.1:8888/' \ + --internalurl 'http://127.0.0.1:8888/v1/AUTH_%(tenant_id)s' +-------------+----------------------------------------------------------------+ diff --git a/doc/src/docbkx/openstack-install/install-config-glance.xml b/doc/src/docbkx/openstack-install/install-config-glance.xml index a3e38f39aaa..00d35c4eb36 100644 --- a/doc/src/docbkx/openstack-install/install-config-glance.xml +++ b/doc/src/docbkx/openstack-install/install-config-glance.xml @@ -48,7 +48,10 @@ flavor = keystone [paste_deploy] flavor = keystone - Update /etc/glance/glance-registry-paste.ini, configure the admin_* vaules under [filter:authtoken]: + Update + /etc/glance/glance-registry-paste.ini, + configure the admin_* values under + [filter:authtoken]: [filter:authtoken] admin_tenant_name = service admin_user = glance diff --git a/doc/src/docbkx/openstack-install/nova-manage-initial-user-project.xml b/doc/src/docbkx/openstack-install/nova-manage-initial-user-project.xml index 35a022caa33..94b33424c73 100644 --- a/doc/src/docbkx/openstack-install/nova-manage-initial-user-project.xml +++ b/doc/src/docbkx/openstack-install/nova-manage-initial-user-project.xml @@ -22,7 +22,7 @@ export EC2_SECRET_KEY=a00a3a32-726a-4e1e-b0c8-24e7df55c959 $ sudo nova-manage project create dubproject dub -$ sudo nova-manage network create novanet --bridge=br100 192.168.100.0/24 1 256 +$ sudo nova-manage network create novanet --bridge_interface=br100 192.168.100.0/24 1 256 For this example, the number of IPs is /24 which will be compatible with the ‘fixed-range’ set in nova.conf. Currently, there can only be one network, and this set up would use the max IPs available in a /24. You can choose values that let you use any valid amount that you diff --git a/doc/src/docbkx/openstack-install/object-storage-verifying-install.xml b/doc/src/docbkx/openstack-install/object-storage-verifying-install.xml index e1207095387..3541b16f915 100644 --- a/doc/src/docbkx/openstack-install/object-storage-verifying-install.xml +++ b/doc/src/docbkx/openstack-install/object-storage-verifying-install.xml @@ -15,22 +15,20 @@ Run the swift CLI, swift, with the correct Identity service URL. -$ swift -V 2 -A http://<AUTH_HOSTNAME>:5000/v2.0 -U adminUser:admin -K 012345SECRET99TOKEN012345 stat +$ swift -V 2.0 -A http://<AUTH_HOSTNAME>:5000/v2.0 -U openstackDemo:adminUser -K $ADMINPASS stat Get an X-Storage-Url and X-Auth-Token: - - $ curl -k -v -H 'X-Storage-User: adminUser:admin' -H 'X-Storage-Pass: $ADMINPASS' http://<AUTH_HOSTNAME>:5000/auth/v1.0 - + $ curl -k -v -H 'X-Storage-User: openstackDemo:adminUser' -H 'X-Storage-Pass: $ADMINPASS' http://<AUTH_HOSTNAME>:5000/auth/v1.0 + Check that you can HEAD the account: - - $ curl -k -v -H 'X-Auth-Token: <token-from-x-auth-token-above>' <url-from-x-storage-url-above> - + $ curl -k -v -H 'X-Auth-Token: <token-from-x-auth-token-above>' <url-from-x-storage-url-above> + Use swift to upload a few files @@ -38,18 +36,16 @@ ‘bigfile[1-2].tgz’ to a container named ‘myfiles’: - - $ swift -A http://<AUTH_HOSTNAME>:5000/v2.0 -U adminUser:admin -K $ADMINPASS upload myfiles bigfile1.tgz -$ swift -A http://<AUTH_HOSTNAME>:5000/v2.0 -U adminUser:admin -K $ADMINPASS upload myfiles bigfile2.tgz - + $ swift -A http://<AUTH_HOSTNAME>:5000/v2.0 -U openstackDemo:adminUser -K $ADMINPASS upload myfiles bigfile1.tgz +$ swift -A http://<AUTH_HOSTNAME>:5000/v2.0 -U openstackDemo:adminUser -K $ADMINPASS upload myfiles bigfile2.tgz + Use swift to download all files from the ‘myfiles’ container: - - $ swift -A http://<AUTH_HOSTNAME>:5000/v2.0 -U adminUser:admin -K $ADMINPASS download myfiles - + $ swift -A http://<AUTH_HOSTNAME>:5000/v2.0 -U openstackDemo:adminUser -K $ADMINPASS download myfiles + diff --git a/doc/src/docbkx/openstack-install/samples/glance-registry.conf b/doc/src/docbkx/openstack-install/samples/glance-registry.conf index 9d24939a9df..4b12fe29d53 100644 --- a/doc/src/docbkx/openstack-install/samples/glance-registry.conf +++ b/doc/src/docbkx/openstack-install/samples/glance-registry.conf @@ -57,12 +57,12 @@ paste.filter_factory = glance.common.context:filter_factory [filter:authtoken] paste.filter_factory = keystone.middleware.auth_token:filter_factory service_protocol = http -service_host = 127.0.0.1 +service_host = 192.168.206.130 service_port = 5000 -auth_host = 127.0.0.1 +auth_host = 192.168.206.130 auth_port = 35357 auth_protocol = http -auth_uri = http://127.0.0.1:5000/ +auth_uri = http://192.168.206.130:5000/ admin_token = 012345SECRET99TOKEN012345 [filter:keystone_shim]