Browse Source

Update bootsrapping doc for flavors

Update doc again according last changes in the implementation.

Change-Id: If9c10e806aa8a2b5507a26a952fc885edb3b94aa
Depends-On: I07daad9be8b4ccbc5a8e618351e8897af7d61672
Sergey Kraynev 2 years ago
parent
commit
415a797c91
1 changed files with 53 additions and 11 deletions
  1. 53
    11
      doc/source/bootstrapping.rst

+ 53
- 11
doc/source/bootstrapping.rst View File

@@ -207,7 +207,7 @@ execution:
207 207
 
208 208
 Creation of the image is handled by glance post deployment job
209 209
 **glance-cirros-image-upload**, which uses Bash script from fuel-ccp-glance
210
-repository: *service/files/glance-cirros-image-upload.sh.j2*
210
+repository: ``service/files/glance-cirros-image-upload.sh.j2``.
211 211
 
212 212
 .. _flavors:
213 213
 
@@ -228,12 +228,52 @@ in the table below:
228 228
  m1.xlarge  5  16384  160  8
229 229
 ========== == ====== ===== =====
230 230
 
231
+The corresponding section in the config file looks like:
232
+
233
+::
234
+
235
+ configs:
236
+   nova:
237
+     bootstrap:
238
+       enable: true
239
+       flavors:
240
+         - name: m1.test
241
+           id: 0
242
+           ram: 128
243
+           disk: 1
244
+           vcpus: 1
245
+         - name: m1.tiny
246
+           id: 1
247
+           ram: 512
248
+           disk: 1
249
+           vcpus: 1
250
+         - name: m1.small
251
+           id: 2
252
+           ram: 2048
253
+           disk: 20
254
+           vcpus: 1
255
+         - name: m1.medium
256
+           id: 3
257
+           ram: 4096
258
+           disk: 40
259
+           vcpus: 2
260
+         - name: m1.large
261
+           id: 4
262
+           ram: 8192
263
+           disk: 80
264
+           vcpus: 4
265
+         - name: m1.xlarge
266
+           id: 5
267
+           ram: 16384
268
+           disk: 160
269
+           vcpus: 8
270
+
231 271
 Creation of the flavors is handled by nova post deployment job
232
-**nova-create-default-flavors**, which uses Bash script from fuel-ccp-nova
233
-repository: *service/files/create-default-flavors.sh.j2*
272
+**nova-bootstrap-flavors**, which uses Bash script from fuel-ccp-nova
273
+repository: ``service/files/create-flavors.sh.j2``.
234 274
 
235
-Also the CCP allows to bootstrap custom flavors. Similarly previous sections
236
-it can be done by adding the following snippet to ~/.ccp.yaml:
275
+User also can specify to bootstrap custom flavors. Similar to previous
276
+sections it can be done by adding the following snippet to ~/.ccp.yaml:
237 277
 
238 278
 ::
239 279
 
@@ -253,9 +293,14 @@ it can be done by adding the following snippet to ~/.ccp.yaml:
253 293
            disk: 2
254 294
            vcpus: 2
255 295
 
256
-This snippet adds **bootstrap** section for nova service and enables it.
257
-Note, that by default **enable** option is False. So if user wants to use
258
-bootstrapping he should explicitly set it to True.
296
+.. WARNING:: New list of custom flavors will overwrite default flavors and
297
+             they will not be created. To avoid it, just copy paste definition
298
+             of default flavors to your config and then extend it by new custom
299
+             flavors.
300
+
301
+This snippet adds **bootstrap** section for nova service. Note, that by default
302
+**enable** option is True. So if user doesn't want to use bootstrapping he
303
+should explicitly set it to False.
259 304
 
260 305
 The last part of the snippet describes list of flavors with related options.
261 306
 All options should be specified, otherwise it will cause an error during job
@@ -283,6 +328,3 @@ execution:
283 328
    * - vcpus
284 329
      - Number of the vcpus for the current flavor.
285 330
      - --
286
-
287
-.. NOTE:: Default value for flavors is an empty list, so it means that
288
-          creation of custom flavors will be skipped.

Loading…
Cancel
Save