openstack-manuals

Merge lp:~jorgew/openstack-manuals/coreUpdates into lp:~annegentle/openstack-manuals/trunk

  1. coreUpdates
  2. Merge into trunk
Proposed by Jorge L. Williams
Status: Merged
Merged at revision: 124
Proposed branch: lp:~jorgew/openstack-manuals/coreUpdates
Merge into: lp:~annegentle/openstack-manuals/trunk
Diff against target: 506 lines (+110/-72)
21 files modified
doc/source/docbkx/openstack-compute-api-1.1/os-compute-devguide.xml (+40/-28)
doc/source/docbkx/openstack-compute-api-1.1/samples/ext-servers.json (+2/-2)
doc/source/docbkx/openstack-compute-api-1.1/samples/ext-servers.xml (+2/-2)
doc/source/docbkx/openstack-compute-api-1.1/samples/image-create-full.json (+2/-2)
doc/source/docbkx/openstack-compute-api-1.1/samples/image-create-full.xml (+2/-2)
doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-pip.json (+1/-1)
doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-pip.xml (+1/-1)
doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-pip2.json (+2/-2)
doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-pip2.xml (+2/-2)
doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req.json (+15/-1)
doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req.xml (+13/-1)
doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-resp.json (+2/-2)
doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-resp.xml (+2/-2)
doc/source/docbkx/openstack-compute-api-1.1/samples/server-put-req-ad.json (+2/-2)
doc/source/docbkx/openstack-compute-api-1.1/samples/server-put-req-ad.xml (+2/-2)
doc/source/docbkx/openstack-compute-api-1.1/samples/server.json (+2/-2)
doc/source/docbkx/openstack-compute-api-1.1/samples/server.xml (+2/-2)
doc/source/docbkx/openstack-compute-api-1.1/samples/servers-page1.json (+4/-4)
doc/source/docbkx/openstack-compute-api-1.1/samples/servers-page1.xml (+4/-4)
doc/source/docbkx/openstack-compute-api-1.1/samples/servers.json (+4/-4)
doc/source/docbkx/openstack-compute-api-1.1/samples/servers.xml (+4/-4)
To merge this branch: bzr merge lp:~jorgew/openstack-manuals/coreUpdates
Reviewer Review Type Date Requested Status
Anne Gentle Pending
Review via email: mp+66235@code.launchpad.net

Description of the change

Rename primaryIP -> accessIP

To post a comment you must log in.
lp:~jorgew/openstack-manuals/coreUpdates updated
123. By Anne Gentle

Separating pom files for trunk docs v incubated docs

Revision history for this message
Anne Gentle (annegentle) wrote :

I'm not usually up this late to review docs! :)

After merging, I spell-checked and found "not not" and fixed it, also seperate changed to separate. Also I believe overlimit should be overLimit. Let me know if these fixes are okay to include and then I'll push the merge.

Revision history for this message
Anne Gentle (annegentle) wrote :

Also, do you need two hard page break processing directives in a row? I'm seeing <?hard-pagebreak?>
<?hard-pagebreak?> around line 520 in the source. Makes for a blank page in the PDF, page 8.

Revision history for this message
Jorge L. Williams (jorgew) wrote :

On Jun 29, 2011, at 12:39 AM, Anne Gentle wrote:

> I'm not usually up this late to review docs! :)
>
> After merging, I spell-checked and found "not not" and fixed it, also seperate changed to separate. Also I believe overlimit should be overLimit. Let me know if these fixes are okay to include and then I'll push the merge.

All good catches! Yes it should be overLimit.

Yes go ahead an merge.

Thanks!

Revision history for this message
Jorge L. Williams (jorgew) wrote :

Wow, yea get rid of that extra hard-break.

I meant to go back and add hard-breaks to make the PDF look good -- but I'll have to do that later.

Thanks!

On Jun 29, 2011, at 12:41 AM, Anne Gentle wrote:

> Also, do you need two hard page break processing directives in a row? I'm seeing <?hard-pagebreak?>
> <?hard-pagebreak?> around line 520 in the source. Makes for a blank page in the PDF, page 8.
> --
> https://code.launchpad.net/~jorgew/openstack-manuals/coreUpdates/+merge/66235
> You are the owner of lp:~jorgew/openstack-manuals/coreUpdates.

lp:~jorgew/openstack-manuals/coreUpdates updated
124. By Anne Gentle

Merges and fixes for OS API 1.1 guide

Revision history for this message
Anne Gentle (annegentle) wrote :

Okay, updated trunk and Cactus is copying up now. Thanks for the updates!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/os-compute-devguide.xml'
2--- doc/source/docbkx/openstack-compute-api-1.1/os-compute-devguide.xml 2011-06-27 22:14:57 +0000
3+++ doc/source/docbkx/openstack-compute-api-1.1/os-compute-devguide.xml 2011-06-29 05:01:38 +0000
4@@ -62,7 +62,7 @@
5 </copyright>
6 <releaseinfo>API v1.1</releaseinfo>
7 <productname>OpenStack Compute</productname>
8- <pubdate>2011-06-23</pubdate>
9+ <pubdate>2011-06-29</pubdate>
10 <legalnotice role="apache2">
11 <annotation>
12 <remark>Copyright details are filled in by the template.</remark>
13@@ -123,6 +123,19 @@
14 </thead>
15 <tbody>
16 <tr>
17+ <td colspan="1" align="center">June 29, 2011</td>
18+ <td colspan="4">
19+ <itemizedlist spacing="compact">
20+ <listitem>
21+ <para>
22+ Renamed Primary IP to
23+ Access IP.
24+ </para>
25+ </listitem>
26+ </itemizedlist>
27+ </td>
28+ </tr>
29+ <tr>
30 <td colspan="1" align="center">June 23, 2011</td>
31 <td colspan="4">
32 <itemizedlist spacing="compact">
33@@ -1765,57 +1778,56 @@
34 </para>
35 </section>
36 <section xml:id="Server_Primary_Addresses-d1e2558">
37- <title>Server Primary Addresses</title>
38+ <title>Server Access Addresses</title>
39 <para>
40 In a hybrid environment, the IP address of a
41 server may not be controlled by the underling
42- implementation. Instead, the primary IP
43- address may be part of the dedicated hardware;
44- for example, a router/NAT device. In this
45- case, the addresses provided by the
46- implementation cannot actually be used to
47- access the server (from outside the local
48- LAN). Here, a <firstterm>primary
49- address</firstterm> may be assigned at
50- creation time to provide access to the server.
51- This address may not be directly bound to a
52- network interface on the server and may not
53- not necessarily appear when a server's
54+ implementation. Instead, the access IP address
55+ may be part of the dedicated hardware; for
56+ example, a router/NAT device. In this case,
57+ the addresses provided by the implementation
58+ cannot actually be used to access the server
59+ (from outside the local LAN). Here, a seperate
60+ <firstterm>access address</firstterm> may be
61+ assigned at creation time to provide access to
62+ the server. This address may not be directly
63+ bound to a network interface on the server and
64+ may not not necessarily appear when a server's
65 addresses are queried (see <xref
66 linkend="ServerAddresses"/>). Nonetheless,
67 clients which need to access the server
68- directly are encouraged to do so via a
69- primary address. In the example below, an
70- IPv4 address is assigned at creation time.
71+ directly are encouraged to do so via an access
72+ address. In the example below, an IPv4
73+ address is assigned at creation time.
74 </para>
75 <example>
76- <title>Creating a Server with a Primary IP: XML</title>
77+ <title>Creating a Server with a Access IP: XML</title>
78 <programlisting language="xml">
79 <xi:include href="samples/server-post-req-pip.xml" parse="text"/>
80 </programlisting>
81 </example>
82 <example>
83- <title>Creating a Server with a Primary IP: JSON</title>
84+ <title>Creating a Server with a Access IP: JSON</title>
85 <programlisting language="javascript">
86 <xi:include href="samples/server-post-req-pip.json" parse="text"/>
87 </programlisting>
88 </example>
89 <para>
90 Note that both IPv4 and IPv6 addresses may be
91- used as primary addresses and both addresses
92+ used as access addresses and both addresses
93 may be assigned simultaneously as illustrated
94- below. Primary addresses may be updated after
95+ below. Access addresses may be updated after
96 a server has been created. See <xref
97 linkend="ServerUpdate"/> for more details.
98 </para>
99 <example>
100- <title>Creating a Server with Multiple Primary IPs: XML</title>
101+ <title>Creating a Server with Multiple Access IPs: XML</title>
102 <programlisting language="xml">
103 <xi:include href="samples/server-post-req-pip2.xml" parse="text"/>
104 </programlisting>
105 </example>
106 <example>
107- <title>Creating a Server with Multiple Primary IPs: JSON</title>
108+ <title>Creating a Server with Multiple Access IPs: JSON</title>
109 <programlisting language="javascript">
110 <xi:include href="samples/server-post-req-pip2.json" parse="text"/>
111 </programlisting>
112@@ -1884,7 +1896,7 @@
113 <td colspan="1">&PUT;</td>
114 <td colspan="2">/servers/<parameter>id</parameter></td>
115 <td colspan="3">Update the specified
116- server's name and primary addresses</td>
117+ server's editable attributes</td>
118 </tr>
119 </tbody>
120 </informaltable>
121@@ -1918,7 +1930,7 @@
122 <para>
123 This operation updates the editable attributes of
124 a server: the name of the server, the server
125- metadata, and the IPv4 and IPv6 primary address.
126+ metadata, and the IPv4 and IPv6 access address.
127 Note that while the server name is editable, the
128 operation does not change the server host
129 name. Note also that server names are not
130@@ -1937,17 +1949,17 @@
131 </programlisting>
132 </example>
133 <para>
134- Primary addresses may simultaneously be updated as
135+ Access addresses may simultaneously be updated as
136 illustrated below.
137 </para>
138 <example>
139- <title>Server Update Primary Address Request: XML</title>
140+ <title>Server Update Access Address Request: XML</title>
141 <programlisting language="xml">
142 <xi:include href="samples/server-put-req-ad.xml" parse="text"/>
143 </programlisting>
144 </example>
145 <example>
146- <title>Server Update Primary Address Request: JSON</title>
147+ <title>Server Update Access Address Request: JSON</title>
148 <programlisting language="javascript">
149 <xi:include href="samples/server-put-req-ad.json" parse="text"/>
150 </programlisting>
151
152=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/ext-servers.json'
153--- doc/source/docbkx/openstack-compute-api-1.1/samples/ext-servers.json 2011-06-24 00:43:26 +0000
154+++ doc/source/docbkx/openstack-compute-api-1.1/samples/ext-servers.json 2011-06-29 05:01:38 +0000
155@@ -8,8 +8,8 @@
156 "hostId": "e4d909c290d0fb1ca068ffaddf22cbd0",
157 "status": "BUILD",
158 "progress": 60,
159- "primaryIPv4" : "67.23.10.132",
160- "primaryIPv6" : "::babe:67.23.10.132",
161+ "accessIPv4" : "67.23.10.132",
162+ "accessIPv6" : "::babe:67.23.10.132",
163 "image" : {
164 "id": "52415800-8b69-11e0-9b19-734f6f006e54",
165 "name": "CentOS 5.2",
166
167=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/ext-servers.xml'
168--- doc/source/docbkx/openstack-compute-api-1.1/samples/ext-servers.xml 2011-06-24 00:43:26 +0000
169+++ doc/source/docbkx/openstack-compute-api-1.1/samples/ext-servers.xml 2011-06-29 05:01:38 +0000
170@@ -6,8 +6,8 @@
171 progress="60" hostId="e4d909c290d0fb1ca068ffaddf22cbd0"
172 updated="2010-10-10T12:00:00Z"
173 created="2010-08-10T12:00:00Z"
174- primaryIPv4="67.23.10.132"
175- primaryIPv6="::babe:67.23.10.132">
176+ accessIPv4="67.23.10.132"
177+ accessIPv6="::babe:67.23.10.132">
178 <image id="52415800-8b69-11e0-9b19-734f6f006e54"
179 name="CentOS 5.2">
180 <atom:link
181
182=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/image-create-full.json'
183--- doc/source/docbkx/openstack-compute-api-1.1/samples/image-create-full.json 2011-06-24 00:43:26 +0000
184+++ doc/source/docbkx/openstack-compute-api-1.1/samples/image-create-full.json 2011-06-29 05:01:38 +0000
185@@ -8,8 +8,8 @@
186 "created": "2010-08-10T12:00:00Z",
187 "hostId": "9e107d9d372bb6826bd81d3542a419d6",
188 "status": "ACTIVE",
189- "primaryIPv4" : "67.23.10.133",
190- "primaryIPv6" : "::babe:67.23.10.133",
191+ "accessIPv4" : "67.23.10.133",
192+ "accessIPv6" : "::babe:67.23.10.133",
193 "addresses": {
194 "public" : [
195 {
196
197=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/image-create-full.xml'
198--- doc/source/docbkx/openstack-compute-api-1.1/samples/image-create-full.xml 2011-06-24 00:43:26 +0000
199+++ doc/source/docbkx/openstack-compute-api-1.1/samples/image-create-full.xml 2011-06-29 05:01:38 +0000
200@@ -7,8 +7,8 @@
201 status="ACTIVE" hostId="9e107d9d372bb6826bd81d3542a419d6"
202 updated="2010-10-10T12:00:00Z"
203 created="2010-08-10T12:00:00Z"
204- primaryIPv4="67.23.10.133"
205- primaryIPv6="::babe:67.23.10.133"
206+ accessIPv4="67.23.10.133"
207+ accessIPv6="::babe:67.23.10.133"
208 >
209 <addresses>
210 <network id="public">
211
212=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-pip.json'
213--- doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-pip.json 2011-06-24 00:43:26 +0000
214+++ doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-pip.json 2011-06-29 05:01:38 +0000
215@@ -7,6 +7,6 @@
216 "flavor" : {
217 "id" : "52415800-8b69-11e0-9b19-734f1195ff37"
218 },
219- "primaryIPv4" : "67.23.10.132"
220+ "accessIPv4" : "67.23.10.132"
221 }
222 }
223
224=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-pip.xml'
225--- doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-pip.xml 2011-06-24 00:43:26 +0000
226+++ doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-pip.xml 2011-06-29 05:01:38 +0000
227@@ -1,6 +1,6 @@
228 <?xml version="1.0" encoding="UTF-8"?>
229 <server xmlns="http://docs.openstack.org/compute/api/v1.1"
230- name="test" primaryIPv4="67.23.10.132">
231+ name="test" accessIPv4="67.23.10.132">
232 <image id="52415800-8b69-11e0-9b19-734f6f006e54" />
233 <flavor id="52415800-8b69-11e0-9b19-734f1195ff37" />
234 </server>
235
236=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-pip2.json'
237--- doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-pip2.json 2011-06-24 00:43:26 +0000
238+++ doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-pip2.json 2011-06-29 05:01:38 +0000
239@@ -7,7 +7,7 @@
240 "flavor" : {
241 "id" : "52415800-8b69-11e0-9b19-734f1195ff37"
242 },
243- "primaryIPv4" : "67.23.10.132",
244- "primaryIPv6" : "::babe:67.23.10.132"
245+ "accessIPv4" : "67.23.10.132",
246+ "accessIPv6" : "::babe:67.23.10.132"
247 }
248 }
249
250=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-pip2.xml'
251--- doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-pip2.xml 2011-06-24 00:43:26 +0000
252+++ doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-pip2.xml 2011-06-29 05:01:38 +0000
253@@ -1,8 +1,8 @@
254 <?xml version="1.0" encoding="UTF-8"?>
255 <server xmlns="http://docs.openstack.org/compute/api/v1.1"
256 name="test"
257- primaryIPv4="67.23.10.132"
258- primaryIPv6="::babe:67.23.10.132">
259+ accessIPv4="67.23.10.132"
260+ accessIPv6="::babe:67.23.10.132">
261 <image id="52415800-8b69-11e0-9b19-734f6f006e54" />
262 <flavor id="52415800-8b69-11e0-9b19-734f1195ff37" />
263 </server>
264
265=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req.json'
266--- doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req.json 2011-06-24 00:43:26 +0000
267+++ doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req.json 2011-06-29 05:01:38 +0000
268@@ -2,7 +2,21 @@
269 "server" : {
270 "name" : "new-server-test",
271 "image" : {
272- "id" : "52415800-8b69-11e0-9b19-734f6f006e54"
273+ "id" : "52415800-8b69-11e0-9b19-734f6f006e54",
274+ "name": "CentOS 5.2",
275+ "updated": "2010-10-10T12:00:00Z",
276+ "created": "2010-08-10T12:00:00Z",
277+ "status": "ACTIVE",
278+ "links": [
279+ {
280+ "rel": "self",
281+ "href": "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"
282+ },
283+ {
284+ "rel": "bookmark",
285+ "href": "http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"
286+ }
287+ ]
288 },
289 "flavor" : {
290 "id" : "52415800-8b69-11e0-9b19-734f1195ff37"
291
292=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req.xml'
293--- doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req.xml 2011-06-24 00:43:26 +0000
294+++ doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req.xml 2011-06-29 05:01:38 +0000
295@@ -1,7 +1,19 @@
296 <?xml version="1.0" encoding="UTF-8"?>
297 <server xmlns="http://docs.openstack.org/compute/api/v1.1"
298+ xmlns:atom="http://www.w3.org/2005/Atom"
299 name="new-server-test">
300- <image id="52415800-8b69-11e0-9b19-734f6f006e54" />
301+ <image id="52415800-8b69-11e0-9b19-734f6f006e54"
302+ name="CentOS 5.2"
303+ updated="2010-10-10T12:00:00Z"
304+ created="2010-08-10T12:00:00Z"
305+ status="ACTIVE">
306+ <atom:link
307+ rel="self"
308+ href="http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"/>
309+ <atom:link
310+ rel="bookmark"
311+ href="http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"/>
312+ </image>
313 <flavor id="52415800-8b69-11e0-9b19-734f1195ff37" />
314 <metadata>
315 <meta key="My Server Name">Apache1</meta>
316
317=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-resp.json'
318--- doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-resp.json 2011-06-24 00:43:26 +0000
319+++ doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-resp.json 2011-06-29 05:01:38 +0000
320@@ -4,8 +4,8 @@
321 "name": "new-server-test",
322 "created": "2010-11-11T12:00:00Z",
323 "hostId": "e4d909c290d0fb1ca068ffaddf22cbd0",
324- "primaryIPv4" : "67.23.10.138",
325- "primaryIPv6" : "::babe:67.23.10.138",
326+ "accessIPv4" : "67.23.10.138",
327+ "accessIPv6" : "::babe:67.23.10.138",
328 "progress": 0,
329 "status": "BUILD",
330 "adminPass": "GFf1j9aP",
331
332=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-resp.xml'
333--- doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-resp.xml 2011-06-24 00:43:26 +0000
334+++ doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-resp.xml 2011-06-29 05:01:38 +0000
335@@ -6,8 +6,8 @@
336 hostId="e4d909c290d0fb1ca068ffaddf22cbd0" progress="0"
337 status="BUILD" adminPass="GFf1j9aP"
338 created="2010-11-11T12:00:00Z"
339- primaryIPv4="67.23.10.138"
340- primaryIPv6="::babe:67.23.10.138">
341+ accessIPv4="67.23.10.138"
342+ accessIPv6="::babe:67.23.10.138">
343 <image id="52415800-8b69-11e0-9b19-734f6f006e54"
344 name="CentOS 5.2">
345 <atom:link
346
347=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/server-put-req-ad.json'
348--- doc/source/docbkx/openstack-compute-api-1.1/samples/server-put-req-ad.json 2011-06-24 00:43:26 +0000
349+++ doc/source/docbkx/openstack-compute-api-1.1/samples/server-put-req-ad.json 2011-06-29 05:01:38 +0000
350@@ -1,7 +1,7 @@
351 {
352 "server" :
353 {
354- "primaryIPv4" : "67.23.10.132",
355- "primaryIPv6" : "::babe:67.23.10.132"
356+ "accessIPv4" : "67.23.10.132",
357+ "accessIPv6" : "::babe:67.23.10.132"
358 }
359 }
360
361=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/server-put-req-ad.xml'
362--- doc/source/docbkx/openstack-compute-api-1.1/samples/server-put-req-ad.xml 2011-06-24 00:43:26 +0000
363+++ doc/source/docbkx/openstack-compute-api-1.1/samples/server-put-req-ad.xml 2011-06-29 05:01:38 +0000
364@@ -1,6 +1,6 @@
365 <?xml version="1.0" encoding="UTF-8"?>
366 <server
367 xmlns="http://docs.openstack.org/compute/api/v1.1"
368- primaryIPv4="67.23.10.132"
369- primaryIPv6="::babe:67.23.10.132"
370+ accessIPv4="67.23.10.132"
371+ accessIPv6="::babe:67.23.10.132"
372 />
373
374=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/server.json'
375--- doc/source/docbkx/openstack-compute-api-1.1/samples/server.json 2011-06-24 00:43:26 +0000
376+++ doc/source/docbkx/openstack-compute-api-1.1/samples/server.json 2011-06-29 05:01:38 +0000
377@@ -5,8 +5,8 @@
378 "updated": "2010-10-10T12:00:00Z",
379 "created": "2010-08-10T12:00:00Z",
380 "hostId": "e4d909c290d0fb1ca068ffaddf22cbd0",
381- "primaryIPv4" : "67.23.10.132",
382- "primaryIPv6" : "::babe:67.23.10.132",
383+ "accessIPv4" : "67.23.10.132",
384+ "accessIPv6" : "::babe:67.23.10.132",
385 "status": "BUILD",
386 "progress": 60,
387 "image" : {
388
389=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/server.xml'
390--- doc/source/docbkx/openstack-compute-api-1.1/samples/server.xml 2011-06-24 00:43:26 +0000
391+++ doc/source/docbkx/openstack-compute-api-1.1/samples/server.xml 2011-06-29 05:01:38 +0000
392@@ -5,8 +5,8 @@
393 name="sample-server" status="BUILD"
394 updated="2010-10-10T12:00:00Z" created="2010-08-10T12:00:00Z"
395 progress="60" hostId="e4d909c290d0fb1ca068ffaddf22cbd0"
396- primaryIPv4="67.23.10.132"
397- primaryIPv6="::babe:67.23.10.132">
398+ accessIPv4="67.23.10.132"
399+ accessIPv6="::babe:67.23.10.132">
400 <image id="52415800-8b69-11e0-9b19-734f6f006e54"
401 name="CentOS 5.2">
402 <atom:link
403
404=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/servers-page1.json'
405--- doc/source/docbkx/openstack-compute-api-1.1/samples/servers-page1.json 2011-06-24 00:43:26 +0000
406+++ doc/source/docbkx/openstack-compute-api-1.1/samples/servers-page1.json 2011-06-29 05:01:38 +0000
407@@ -7,8 +7,8 @@
408 "created": "2010-08-10T12:00:00Z",
409 "hostId": "e4d909c290d0fb1ca068ffaddf22cbd0",
410 "status": "BUILD",
411- "primaryIPv4" : "67.23.10.132",
412- "primaryIPv6" : "::babe:67.23.10.132",
413+ "accessIPv4" : "67.23.10.132",
414+ "accessIPv6" : "::babe:67.23.10.132",
415 "progress": 60,
416 "image" : {
417 "id": "52415800-8b69-11e0-9b19-734f6f006e54",
418@@ -89,8 +89,8 @@
419 "updated": "2010-10-10T12:00:00Z",
420 "created": "2010-08-10T12:00:00Z",
421 "hostId": "9e107d9d372bb6826bd81d3542a419d6",
422- "primaryIPv4" : "67.23.10.133",
423- "primaryIPv6" : "::babe:67.23.10.133",
424+ "accessIPv4" : "67.23.10.133",
425+ "accessIPv6" : "::babe:67.23.10.133",
426 "status": "ACTIVE",
427 "image" : {
428 "id": "52415800-8b69-11e0-9b19-734f5736d2a2",
429
430=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/servers-page1.xml'
431--- doc/source/docbkx/openstack-compute-api-1.1/samples/servers-page1.xml 2011-06-24 00:43:26 +0000
432+++ doc/source/docbkx/openstack-compute-api-1.1/samples/servers-page1.xml 2011-06-29 05:01:38 +0000
433@@ -6,8 +6,8 @@
434 progress="60" hostId="e4d909c290d0fb1ca068ffaddf22cbd0"
435 updated="2010-10-10T12:00:00Z"
436 created="2010-08-10T12:00:00Z"
437- primaryIPv4="67.23.10.132"
438- primaryIPv6="::babe:67.23.10.132"
439+ accessIPv4="67.23.10.132"
440+ accessIPv6="::babe:67.23.10.132"
441 >
442 <image id="52415800-8b69-11e0-9b19-734f6f006e54"
443 name="CentOS 5.2">
444@@ -55,8 +55,8 @@
445 status="ACTIVE" hostId="9e107d9d372bb6826bd81d3542a419d6"
446 updated="2010-10-10T12:00:00Z"
447 created="2010-08-10T12:00:00Z"
448- primaryIPv4="67.23.10.133"
449- primaryIPv6="::babe:67.23.10.133"
450+ accessIPv4="67.23.10.133"
451+ accessIPv6="::babe:67.23.10.133"
452 >
453 <image
454 id="52415800-8b69-11e0-9b19-734f5736d2a2"
455
456=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/servers.json'
457--- doc/source/docbkx/openstack-compute-api-1.1/samples/servers.json 2011-06-24 00:43:26 +0000
458+++ doc/source/docbkx/openstack-compute-api-1.1/samples/servers.json 2011-06-29 05:01:38 +0000
459@@ -8,8 +8,8 @@
460 "hostId": "e4d909c290d0fb1ca068ffaddf22cbd0",
461 "status": "BUILD",
462 "progress": 60,
463- "primaryIPv4" : "67.23.10.132",
464- "primaryIPv6" : "::babe:67.23.10.132",
465+ "accessIPv4" : "67.23.10.132",
466+ "accessIPv6" : "::babe:67.23.10.132",
467 "image" : {
468 "id": "52415800-8b69-11e0-9b19-734f6f006e54",
469 "name": "CentOS 5.2",
470@@ -90,8 +90,8 @@
471 "created": "2010-08-10T12:00:00Z",
472 "hostId": "9e107d9d372bb6826bd81d3542a419d6",
473 "status": "ACTIVE",
474- "primaryIPv4" : "67.23.10.133",
475- "primaryIPv6" : "::babe:67.23.10.133",
476+ "accessIPv4" : "67.23.10.133",
477+ "accessIPv6" : "::babe:67.23.10.133",
478 "image" : {
479 "id": "52415800-8b69-11e0-9b19-734f5736d2a2",
480 "name": "My Server Backup",
481
482=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/servers.xml'
483--- doc/source/docbkx/openstack-compute-api-1.1/samples/servers.xml 2011-06-24 00:43:26 +0000
484+++ doc/source/docbkx/openstack-compute-api-1.1/samples/servers.xml 2011-06-29 05:01:38 +0000
485@@ -6,8 +6,8 @@
486 progress="60" hostId="e4d909c290d0fb1ca068ffaddf22cbd0"
487 updated="2010-10-10T12:00:00Z"
488 created="2010-08-10T12:00:00Z"
489- primaryIPv4="67.23.10.132"
490- primaryIPv6="::babe:67.23.10.132"
491+ accessIPv4="67.23.10.132"
492+ accessIPv6="::babe:67.23.10.132"
493 >
494 <image id="52415800-8b69-11e0-9b19-734f6f006e54"
495 name="CentOS 5.2">
496@@ -55,8 +55,8 @@
497 status="ACTIVE" hostId="9e107d9d372bb6826bd81d3542a419d6"
498 updated="2010-10-10T12:00:00Z"
499 created="2010-08-10T12:00:00Z"
500- primaryIPv4="67.23.10.133"
501- primaryIPv6="::babe:67.23.10.133"
502+ accessIPv4="67.23.10.133"
503+ accessIPv6="::babe:67.23.10.133"
504 >
505 <image
506 id="52415800-8b69-11e0-9b19-734f5736d2a2"

Subscribers

People subscribed via source and target branches