summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-23 20:34:33 +0000
committerGerrit Code Review <review@openstack.org>2018-10-23 20:34:33 +0000
commite596c3d25ac49850f2e6fbc037258f0f95cb876a (patch)
tree91511c7e521577f862864bf77d306db8454bd4b8
parentcf3b7938d7870c03c4f2d0d5dbff41cad773989e (diff)
parentc2bec175292a76e074b19d67615f7c84cd790e0d (diff)
Merge "Add build vm to multinode_genesis"
-rw-r--r--tools/multi_nodes_gate/airship_gate/manifests/multinode_genesis.json18
-rw-r--r--tools/multi_nodes_gate/airship_gate/manifests/multinode_genesis_slim.json68
2 files changed, 18 insertions, 68 deletions
diff --git a/tools/multi_nodes_gate/airship_gate/manifests/multinode_genesis.json b/tools/multi_nodes_gate/airship_gate/manifests/multinode_genesis.json
index ca505ad..dd422f0 100644
--- a/tools/multi_nodes_gate/airship_gate/manifests/multinode_genesis.json
+++ b/tools/multi_nodes_gate/airship_gate/manifests/multinode_genesis.json
@@ -4,6 +4,11 @@
4 "primary_repo": "deployment_files", 4 "primary_repo": "deployment_files",
5 "aux_repos": [] 5 "aux_repos": []
6 }, 6 },
7 "ingress": {
8 "domain": "gate.local",
9 "172.24.1.5": ["maas"],
10 "172.24.1.6": ["drydock","shipyard","keystone"]
11 },
7 "stages": [ 12 "stages": [
8 { 13 {
9 "name": "Gate Setup", 14 "name": "Gate Setup",
@@ -30,12 +35,25 @@
30 "script": "create-vms.sh" 35 "script": "create-vms.sh"
31 }, 36 },
32 { 37 {
38 "name": "Register Ingress",
39 "script": "ingress-dns.sh",
40 "arguments": ["build"]
41 },
42 {
33 "name": "Genesis", 43 "name": "Genesis",
34 "script": "genesis.sh", 44 "script": "genesis.sh",
35 "on_error": "collect_genesis_info.sh" 45 "on_error": "collect_genesis_info.sh"
36 } 46 }
37 ], 47 ],
38 "vm": { 48 "vm": {
49 "build": {
50 "memory": 2048,
51 "vcpus": 2,
52 "mac": "52:54:00:00:be:31",
53 "ip": "172.24.1.9",
54 "bootstrap": true,
55 "userdata": "packages: [docker.io]"
56 },
39 "n0" : { 57 "n0" : {
40 "memory": 16384, 58 "memory": 16384,
41 "vcpus": 8, 59 "vcpus": 8,
diff --git a/tools/multi_nodes_gate/airship_gate/manifests/multinode_genesis_slim.json b/tools/multi_nodes_gate/airship_gate/manifests/multinode_genesis_slim.json
deleted file mode 100644
index c236984..0000000
--- a/tools/multi_nodes_gate/airship_gate/manifests/multinode_genesis_slim.json
+++ /dev/null
@@ -1,68 +0,0 @@
1{
2 "configuration": {
3 "site": "gate-multinode",
4 "primary_repo": "deployment_files",
5 "aux_repos": []
6 },
7 "stages": [
8 {
9 "name": "Gate Setup",
10 "script": "gate-setup.sh"
11 },
12 {
13 "name": "Pegleg Collection",
14 "script": "pegleg-collect.sh"
15 },
16 {
17 "name": "Populate Image Cache",
18 "script": "registry-load.sh"
19 },
20 {
21 "name": "Generate Certificates",
22 "script": "generate-certificates.sh"
23 },
24 {
25 "name": "Build Scripts",
26 "script": "build-scripts.sh"
27 },
28 {
29 "name": "Create VMs",
30 "script": "create-vms.sh"
31 },
32 {
33 "name": "Genesis",
34 "script": "genesis.sh",
35 "on_error": "collect_genesis_info.sh"
36 }
37 ],
38 "vm": {
39 "n0" : {
40 "memory": 18432,
41 "vcpus": 8,
42 "mac": "52:54:00:00:a4:31",
43 "ip": "172.24.1.10",
44 "bootstrap": true
45 },
46 "n1" : {
47 "memory": 2816,
48 "vcpus": 2,
49 "mac": "52:54:00:00:a3:31",
50 "ip": "172.24.1.11",
51 "bootstrap": false
52 },
53 "n2" : {
54 "memory": 2816,
55 "vcpus": 2,
56 "mac": "52:54:00:1a:95:0d",
57 "ip": "172.24.1.12",
58 "bootstrap": false
59 },
60 "n3" : {
61 "memory": 2816,
62 "vcpus": 2,
63 "mac": "52:54:00:31:c2:36",
64 "ip": "172.24.1.13",
65 "bootstrap": false
66 }
67 }
68}