airship/airship-in-a-bottle
Code Issues Proposed changes

(multinode) Update configs for new scripting

Browse Source 
- The site definitoin and manifest JSON needs updated
  to reflect the new extensible config.

Change-Id: Ic037e37e97019f19505d9087a0cdf1ea8957f457
This commit is contained in:
Scott Hussey 2019-08-07 16:29:14 -05:00 committed by Kaspars Skels
parent a7e6a8937a
commit 2eb00af047
4 changed files with 131 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deployment_files/site/gate-multinode/baremetal/nodes.yaml
View File

@ -10,7 +10,7 @@ metadata:
data:
host_profile: defaults
addressing:
- network: gp
- network: pxe
address: 172.24.1.11
metadata:
boot_mac: '52:54:00:00:a3:31'
@ -29,7 +29,7 @@ metadata:
data:
host_profile: defaults
addressing:
- network: gp
- network: pxe
address: 172.24.1.12
metadata:
boot_mac: '52:54:00:1a:95:0d'
@ -48,7 +48,7 @@ metadata:
data:
host_profile: defaults
addressing:
- network: gp
- network: pxe
address: 172.24.1.13
metadata:
boot_mac: '52:54:00:31:c2:36'

25
deployment_files/site/gate-multinode/networks/physical/network.yaml
View File

@ -2,7 +2,7 @@
schema: 'drydock/NetworkLink/v1'
metadata:
schema: 'metadata/Document/v1'
name: gp
name: pxe
layeringDefinition:
abstract: false
layer: site
@ -14,30 +14,35 @@ data:
linkspeed: auto
trunking:
mode: disabled
default_network: gp
default_network: pxe
allowed_networks:
- gp
- pxe
...
---
schema: 'drydock/Network/v1'
metadata:
schema: 'metadata/Document/v1'
name: gp
name: pxe
layeringDefinition:
abstract: false
layer: site
storagePolicy: cleartext
data:
mtu: 1500
cidr: 172.24.1.0/24
ranges:
- type: dhcp
start: 172.24.1.100
end: 172.24.1.200
routes:
- subnet: 0.0.0.0/0
gateway: 172.24.1.1
metric: 10
metric: 100
ranges:
- type: reserved
start: 172.24.1.1
end: 172.24.1.10
- type: static
start: 172.24.1.11
end: 172.24.1.20
- type: dhcp
start: 172.24.1.41
end: 172.24.1.50
dns:
domain: gate.local
servers: '172.24.1.9'

9
deployment_files/site/gate-multinode/profile/host/defaults.yaml
View File

@ -9,7 +9,6 @@ metadata:
storagePolicy: cleartext
data:
hardware_profile: 'GenericVM'
primary_network: 'gp'
oob:
type: 'libvirt'
libvirt_uri: 'qemu+ssh://virtmgr@172.24.1.1/system'
@ -32,13 +31,15 @@ data:
mountpoint: '/boot'
fstype: 'ext4'
mount_options: 'defaults'
primary_network: pxe
interfaces:
ens3:
device_link: 'gp'
device_link: pxe
slaves:
- 'ens3'
- ens3
networks:
- 'gp'
- pxe
platform:
image: 'xenial'
kernel: 'hwe-16.04'

128
tools/multi_nodes_gate/airship_gate/manifests/multinode_deploy.json
View File

@ -31,6 +31,23 @@
}
}
},
"networking":{
"pxe": {
"roles":["ssh","bgp", "dns"],
"layer2": {
"mtu": 1500,
"address": "52:54:00:00:dd:31"
},
"layer3": {
"cidr": "172.24.1.0/24",
"address": "172.24.1.1",
"gateway": "172.24.1.1",
"routing": {
"mode": "nat"
}
}
}
},
"stages": [
{
"name": "Gate Setup",
@ -98,49 +115,120 @@
"build": {
"memory": 3072,
"vcpus": 2,
"mac": "52:54:00:00:be:31",
"ip": "172.24.1.9",
"io_profile": "fast",
"disk_profile": "simple",
"disk_layout": "simple",
"networking": {
"ens3": {
"mac": "52:54:00:00:be:31",
"pci": {
"slot": 3,
"port": 0
},
"attachment": {
"network": "pxe"
}
},
"addresses": {
"pxe": {
"ip": "172.24.1.9"
}
}
},
"bootstrap": true,
"userdata": "packages: [docker.io]"
},
"n0" : {
"memory": 24576,
"vcpus": 16,
"mac": "52:54:00:00:a4:31",
"ip": "172.24.1.10",
"io_profile": "fast",
"disk_profile": "simple",
"disk_layout": "simple",
"networking": {
"ens3": {
"mac": "52:54:00:00:a4:31",
"pci": {
"slot": 3,
"port": 0
},
"attachment": {
"network": "pxe"
}
},
"addresses": {
"pxe": {
"ip": "172.24.1.10"
}
}
},
"bootstrap": true
},
"n1" : {
"memory": 3072,
"vcpus": 2,
"mac": "52:54:00:00:a3:31",
"ip": "172.24.1.11",
"io_profile": "fast",
"disk_profile": "simple",
"disk_layout": "simple",
"networking": {
"ens3": {
"mac": "52:54:00:00:a3:31",
"pci": {
"slot": 3,
"port": 0
},
"attachment": {
"network": "pxe"
}
},
"addresses": {
"pxe": {
"ip": "172.24.1.11"
}
}
},
"bootstrap": false
},
"n2" : {
"memory": 3072,
"vcpus": 2,
"mac": "52:54:00:1a:95:0d",
"ip": "172.24.1.12",
"io_profile": "fast",
"disk_profile": "simple",
"disk_layout": "simple",
"networking": {
"ens3": {
"mac": "52:54:00:1a:95:0d",
"pci": {
"slot": 3,
"port": 0
},
"attachment": {
"network": "pxe"
}
},
"addresses": {
"pxe": {
"ip": "172.24.1.12"
}
}
},
"bootstrap": false
},
"n3" : {
"memory": 3072,
"vcpus": 2,
"mac": "52:54:00:31:c2:36",
"ip": "172.24.1.13",
"io_profile": "fast",
"disk_profile": "simple",
"disk_layout": "simple",
"networking": {
"ens3": {
"mac": "52:54:00:31:c2:36",
"pci": {
"slot": 3,
"port": 0
},
"attachment": {
"network": "pxe"
}
},
"addresses": {
"pxe": {
"ip": "172.24.1.13"
}
}
},
"bootstrap": false
}
},
"bgp" : {
"quagga_as": 64688,