Merge "Add build vm to multinode_genesis"

tools/multi_nodes_gate/airship_gate/manifests/multinode_genesis.json

@@ -4,6 +4,11 @@
     "primary_repo": "deployment_files",
     "aux_repos": []
   },
+  "ingress": {
+    "domain": "gate.local",
+    "172.24.1.5": ["maas"],
+    "172.24.1.6": ["drydock","shipyard","keystone"]
+  },
   "stages": [
     {
       "name": "Gate Setup",
@@ -29,6 +34,11 @@
       "name": "Create VMs",
       "script": "create-vms.sh"
     },
+    {
+      "name": "Register Ingress",
+      "script": "ingress-dns.sh",
+      "arguments": ["build"]
+    },
     {
       "name": "Genesis",
       "script": "genesis.sh",
@@ -36,6 +46,14 @@
     }
   ],
   "vm": {
+    "build": {
+      "memory": 2048,
+      "vcpus": 2,
+      "mac": "52:54:00:00:be:31",
+      "ip": "172.24.1.9",
+      "bootstrap": true,
+      "userdata": "packages: [docker.io]"
+    },
     "n0" : {
       "memory": 16384,
       "vcpus": 8,

tools/multi_nodes_gate/airship_gate/manifests/multinode_genesis_slim.json

@@ -1,68 +0,0 @@
-{
-  "configuration": {
-    "site": "gate-multinode",
-    "primary_repo": "deployment_files",
-    "aux_repos": []
-  },
-  "stages": [
-    {
-      "name": "Gate Setup",
-      "script": "gate-setup.sh"
-    },
-    {
-      "name": "Pegleg Collection",
-      "script": "pegleg-collect.sh"
-    },
-    {
-      "name": "Populate Image Cache",
-      "script": "registry-load.sh"
-    },
-    {
-      "name": "Generate Certificates",
-      "script": "generate-certificates.sh"
-    },
-    {
-      "name": "Build Scripts",
-      "script": "build-scripts.sh"
-    },
-    {
-      "name": "Create VMs",
-      "script": "create-vms.sh"
-    },
-    {
-      "name": "Genesis",
-      "script": "genesis.sh",
-      "on_error": "collect_genesis_info.sh"
-    }
-  ],
-  "vm": {
-    "n0" : {
-      "memory": 18432,
-      "vcpus": 8,
-      "mac": "52:54:00:00:a4:31",
-      "ip": "172.24.1.10",
-      "bootstrap": true
-    },
-    "n1" : {
-      "memory": 2816,
-      "vcpus": 2,
-      "mac": "52:54:00:00:a3:31",
-      "ip": "172.24.1.11",
-      "bootstrap": false
-    },
-    "n2" : {
-      "memory": 2816,
-      "vcpus": 2,
-      "mac": "52:54:00:1a:95:0d",
-      "ip": "172.24.1.12",
-      "bootstrap": false
-    },
-    "n3" : {
-      "memory": 2816,
-      "vcpus": 2,
-      "mac": "52:54:00:31:c2:36",
-      "ip": "172.24.1.13",
-      "bootstrap": false
-    }
-  }
-}