Browse Source

Support update site action

- Create a manifest for an update_site scenario
- Update pegleg-collect stage to support behavior change
  on an update site to only collect changes in the site
  definition and not regenerate libvirt keys.

Change-Id: Iba4dc49c9173a3872ca01946bfcb4247f2ca19a2
changes/65/634265/4
Scott Hussey 5 months ago
parent
commit
6f5466392a

tools/multi_nodes_gate/airship_gate/manifests/multinode_update.json → tools/multi_nodes_gate/airship_gate/manifests/update_site.json View File

@@ -1,3 +1,4 @@
1
+
1 2
 {
2 3
   "configuration": {
3 4
     "site": "gate-multinode",
@@ -11,48 +12,20 @@
11 12
     "172.24.1.6": ["drydock","shipyard","keystone"]
12 13
   },
13 14
   "stages": [
14
-    {
15
-      "name": "Gate Setup",
16
-      "script": "gate-setup.sh"
17
-    },
18 15
     {
19 16
       "name": "Pegleg Collection",
20
-      "script": "pegleg-collect.sh"
21
-    },
22
-    {
23
-      "name": "Populate Image Cache",
24
-      "script": "registry-load.sh"
25
-    },
26
-    {
27
-      "name": "Generate Certificates",
28
-      "script": "generate-certificates.sh"
29
-    },
30
-    {
31
-      "name": "Build Scripts",
32
-      "script": "build-scripts.sh"
33
-    },
34
-    {
35
-      "name": "Create VMs",
36
-      "script": "create-vms.sh"
37
-    },
38
-    {
39
-      "name": "Genesis",
40
-      "script": "genesis.sh",
41
-      "on_error": "collect_genesis_info.sh"
17
+      "script": "pegleg-collect.sh",
18
+      "arguments": ["update"]
42 19
     },
43 20
     {
44 21
       "name": "Load Site Design",
45
-      "script": "shipyard-load-design.sh"
22
+      "script": "shipyard-load-design.sh",
23
+      "arguments": ["-g", "-o"]
46 24
     },
47 25
     {
48 26
       "name": "Deploy Site",
49
-      "script": "shipyard-deploy-site.sh"
50
-    },
51
-    {
52
-      "name": "Update Site",
53 27
       "script": "shipyard-update-site.sh"
54 28
     }
55
-
56 29
   ],
57 30
   "vm": {
58 31
     "build": {
@@ -60,12 +33,11 @@
60 33
       "vcpus": 2,
61 34
       "mac": "52:54:00:00:be:31",
62 35
       "ip": "172.24.1.9",
63
-      "io_profile": "fast",
64 36
       "bootstrap": true,
65 37
       "userdata": "packages: [docker.io]"
66 38
     },
67 39
     "n0" : {
68
-      "memory": 16384,
40
+      "memory": 32768,
69 41
       "vcpus": 8,
70 42
       "mac": "52:54:00:00:a4:31",
71 43
       "ip": "172.24.1.10",

+ 23
- 11
tools/multi_nodes_gate/airship_gate/stages/pegleg-collect.sh View File

@@ -50,16 +50,28 @@ render_pegleg_cli() {
50 50
     echo ${cli_string}
51 51
 }
52 52
 
53
-log "Collecting site definition to ${DEFINITION_DEPOT}"
53
+collect_design_docs() {
54
+  docker run \
55
+    --rm -t \
56
+    --network none \
57
+    -v "${REPO_ROOT}":/workspace \
58
+    -v "${DEFINITION_DEPOT}":/collect \
59
+    "${IMAGE_PEGLEG_CLI}" \
60
+    $(render_pegleg_cli)
61
+}
54 62
 
55
-docker run \
56
-  --rm -t \
57
-  --network none \
58
-  -v "${REPO_ROOT}":/workspace \
59
-  -v "${DEFINITION_DEPOT}":/collect \
60
-  "${IMAGE_PEGLEG_CLI}" \
61
-  $(render_pegleg_cli)
63
+collect_initial_docs() {
64
+  collect_design_docs
65
+  log "Generating virtmgr key documents"
66
+  gen_libvirt_key && install_libvirt_key
67
+  collect_ssh_key
68
+}
69
+
70
+log "Collecting site definition to ${DEFINITION_DEPOT}"
62 71
 
63
-log "Generating virtmgr key documents"
64
-gen_libvirt_key && install_libvirt_key
65
-collect_ssh_key
72
+if [[ "$1" != "update" ]];
73
+then
74
+  collect_initial_docs
75
+else
76
+  collect_design_docs
77
+fi

Loading…
Cancel
Save