Skip to content

Commit

Permalink
Fix bug 997446, bug 997186
Browse files Browse the repository at this point in the history 
- Fixes endpoint in endpoint creation command to match the swift proxy.conf file.
- Fixes swift CLI verification commands - tenant:user not user:password.

Change-Id: I9cf555c9f814499499a8c23da58c290b1b6de9a5
  • Loading branch information
@annegentle
annegentle committed May 11, 2012
1 parent 43a5808 commit 97a490b
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 22 deletions.
6 changes: 3 additions & 3 deletions doc/src/docbkx/openstack-install/identity-install-keystone.xml
View file
Expand Up @@ -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'
</userinput>
<computeroutput>
+-------------+----------------------------------------------------------------+
Expand Down
5 changes: 4 additions & 1 deletion doc/src/docbkx/openstack-install/install-config-glance.xml
View file
Expand Up @@ -48,7 +48,10 @@ flavor = keystone</screen>
<screen>[paste_deploy]
flavor = keystone</screen>

<para>Update <filename>/etc/glance/glance-registry-paste.ini</filename>, configure the admin_* vaules under [filter:authtoken]:</para>
<para>Update
<filename>/etc/glance/glance-registry-paste.ini</filename>,
configure the admin_* values under
[filter:authtoken]:</para>
<screen>[filter:authtoken]
admin_tenant_name = service
admin_user = glance
Expand Down
2 changes: 1 addition & 1 deletion doc/src/docbkx/openstack-install/nova-manage-initial-user-project.xml
View file
Expand Up @@ -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</literallayout>
$ sudo nova-manage network create novanet --bridge_interface=br100 192.168.100.0/24 1 256</literallayout>
<para>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
Expand Down
24 changes: 10 additions & 14 deletions doc/src/docbkx/openstack-install/object-storage-verifying-install.xml
View file
Expand Up @@ -15,41 +15,37 @@
<para>Run the swift CLI, swift, with the correct Identity
service URL. </para>
<screen>
<prompt>$</prompt> <userinput>swift -V 2 -A http://&lt;AUTH_HOSTNAME&gt;:5000/v2.0 -U adminUser:admin -K 012345SECRET99TOKEN012345 stat</userinput>
<prompt>$</prompt> <userinput>swift -V 2.0 -A http://&lt;AUTH_HOSTNAME&gt;:5000/v2.0 -U openstackDemo:adminUser -K $ADMINPASS stat</userinput>
</screen>
</listitem>
<listitem>
<para>Get an X-Storage-Url and
X-Auth-Token:</para>
<para>
<literallayout class="monospaced">$ curl -k -v -H 'X-Storage-User: adminUser:admin' -H 'X-Storage-Pass: $ADMINPASS' http://&lt;AUTH_HOSTNAME&gt;:5000/auth/v1.0</literallayout>
</para>
<screen><prompt>$</prompt> <userinput>curl -k -v -H 'X-Storage-User: openstackDemo:adminUser' -H 'X-Storage-Pass: $ADMINPASS' http://&lt;AUTH_HOSTNAME&gt;:5000/auth/v1.0</userinput>
</screen>
</listitem>
<listitem>
<para>Check that you can HEAD the
account:</para>
<para>
<literallayout class="monospaced">$ curl -k -v -H 'X-Auth-Token: &lt;token-from-x-auth-token-above&gt;' &lt;url-from-x-storage-url-above&gt;</literallayout>
</para>
<screen><prompt>$</prompt> <userinput>curl -k -v -H 'X-Auth-Token: &lt;token-from-x-auth-token-above&gt;' &lt;url-from-x-storage-url-above&gt;</userinput>
</screen>
</listitem>
<listitem>
<para>Use swift to upload a few files
named
&#8216;bigfile[1-2].tgz&#8217; to a
container named
&#8216;myfiles&#8217;:</para>
<para>
<literallayout class="monospaced">$ swift -A http://&lt;AUTH_HOSTNAME&gt;:5000/v2.0 -U adminUser:admin -K $ADMINPASS upload myfiles bigfile1.tgz
$ swift -A http://&lt;AUTH_HOSTNAME&gt;:5000/v2.0 -U adminUser:admin -K $ADMINPASS upload myfiles bigfile2.tgz</literallayout>
</para>
<screen><prompt>$</prompt> <userinput>swift -A http://&lt;AUTH_HOSTNAME&gt;:5000/v2.0 -U openstackDemo:adminUser -K $ADMINPASS upload myfiles bigfile1.tgz</userinput>
<prompt>$</prompt> <userinput>swift -A http://&lt;AUTH_HOSTNAME&gt;:5000/v2.0 -U openstackDemo:adminUser -K $ADMINPASS upload myfiles bigfile2.tgz</userinput>
</screen>
</listitem>
<listitem>
<para>Use swift to download all files
from the &#8216;myfiles&#8217;
container:</para>
<para>
<literallayout class="monospaced">$ swift -A http://&lt;AUTH_HOSTNAME&gt;:5000/v2.0 -U adminUser:admin -K $ADMINPASS download myfiles</literallayout>
</para>
<screen><prompt>$</prompt> <userinput>swift -A http://&lt;AUTH_HOSTNAME&gt;:5000/v2.0 -U openstackDemo:adminUser -K $ADMINPASS download myfiles</userinput>
</screen>
</listitem>
</orderedlist>
</section>
Expand Down
6 changes: 3 additions & 3 deletions doc/src/docbkx/openstack-install/samples/glance-registry.conf
View file
Expand Up @@ -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]
Expand Down

0 comments on commit 97a490b

Please sign in to comment.