aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xcheck-jinja2.sh18
-rw-r--r--labs/arm/pod5.yaml80
-rw-r--r--labs/ericsson/idf-pod1.yaml12
-rw-r--r--labs/lf/pod2.yaml226
4 files changed, 301 insertions, 35 deletions
diff --git a/check-jinja2.sh b/check-jinja2.sh
index 7d74197..9bc57c7 100755
--- a/check-jinja2.sh
+++ b/check-jinja2.sh
@@ -5,37 +5,45 @@ set +o errexit
git submodule update --init --remote 2>/dev/null
GEN_CFG='./pharos/config/utils/generate_config.py'
INSTALLER_ADAPTERS='./pharos/config/installers/*'
+TMPF='/tmp/out.yml' # should be outside Jenkins WS to prevent data leakage
RC=0
# Build a table header, using ';' as column sep
-SUMMARY='PDF/Installer;'
+SUMMARY='PDF Verify Matrix;YAML Lint;'
for adapter in ${INSTALLER_ADAPTERS}; do
SUMMARY+="$(basename "${adapter}");"
done
# Iterate all PDFs, check with each installer adapter, log results
while IFS= read -r lab_config; do
- SUMMARY+="\n${lab_config#labs/};"
+ valid_yaml='OK'
+ echo -e "\n\nyamllint -s ${lab_config}"
+ if ! yamllint -s "${lab_config}"; then valid_yaml='FAIL'; fi
+ SUMMARY+="\n${lab_config#labs/};${valid_yaml};"
for adapter in ${INSTALLER_ADAPTERS}; do
pdf_inst=0
pdf_inst_pass=0
+ pdf_yaml_pass=0
while IFS= read -r jinja_template; do
echo -e "\n${GEN_CFG} -y ${lab_config} -j ${jinja_template}"
if "${GEN_CFG}" -y "${lab_config}" \
- -j "${jinja_template}" > /dev/null; then
+ -j "${jinja_template}" > "${TMPF}"; then
echo 'Result: PASS'
((pdf_inst_pass+=1))
+ echo -e "\nyamllint -s ${jinja_template%.j2}"
+ if yamllint -s "${TMPF}"; then ((pdf_yaml_pass+=1)); fi
else
echo 'Result: FAIL'
RC=1
fi
((pdf_inst+=1))
done < <(find "${adapter}" -name '*.j2')
- SUMMARY+="${pdf_inst_pass}/${pdf_inst};"
+ SUMMARY+="${pdf_yaml_pass}/${pdf_inst_pass}/${pdf_inst};"
done
done < <(find 'pharos/config' 'labs' -name 'pod*.yaml')
-echo -e '\n'
+rm -f "${TMPF}"
+echo -e '\n\nNOTE: tuple fmt: (valid YAML output/sucessful parse/templates).\n'
echo -e "${SUMMARY}" | sed -e 's/^/;/g' -e 's/;/;| /g' | column -t -s ';'
cat <<EOF
diff --git a/labs/arm/pod5.yaml b/labs/arm/pod5.yaml
index 28dacd2..cf25261 100644
--- a/labs/arm/pod5.yaml
+++ b/labs/arm/pod5.yaml
@@ -11,32 +11,31 @@ details:
##############################################################################
net_config:
oob:
- interface: 0
ip-range: 10.0.8.3-10.0.8.10
- vlan: 0
+ vlan: native
admin:
- interface: 1
- vlan: 0
+ interface: 0
+ vlan: native
network: 192.168.11.0
mask: 24
mgmt:
- interface: 2
+ interface: 1
vlan: 2183
network: 172.16.10.0
mask: 24
storage:
- interface: 2
+ interface: 1
vlan: 2184
network: 10.2.0.0
mask: 24
private:
- interface: 2
+ interface: 1
vlan: 2185
network: 10.1.0.0
mask: 24
public:
- interface: 2
- vlan: 0
+ interface: 1
+ vlan: native
network: 10.0.8.0
mask: 24
gateway: 10.0.8.254
@@ -73,11 +72,18 @@ jumphost:
address: 10.0.1.32
mac_address: "40:8D:5C:BA:B9:6A"
interfaces:
- - "40:8D:5C:BA:B9:6A"
- - "00:0f:b7:04:00:c0"
- - "00:0f:b7:04:00:c1"
- - "00:0f:b7:04:00:c2"
- - "68:05:ca:34:60:e3"
+ - mac_address: "68:05:ca:34:60:e3"
+ speed: 1gb
+ features: ''
+ - mac_address: "00:0f:b7:04:00:c1"
+ speed: 40gb
+ features: 'dpdk|sriov'
+ - mac_address: "00:0f:b7:04:00:c2"
+ speed: 40gb
+ features: 'dpdk|sriov'
+ - mac_address: "00:0f:b7:04:00:c0"
+ speed: 10gb
+ features: ''
fixed_ips:
admin: 192.168.11.1
mgmt: 172.16.10.1
@@ -99,7 +105,6 @@ nodes:
disk_capacity: 128G
disk_type: ssd
disk_interface: sata
- disk_rotation: ''
- name: 'disk2'
disk_capacity: 2048G
disk_type: hdd
@@ -110,9 +115,12 @@ nodes:
address: 10.0.8.3
mac_address: "e0:ff:f7:00:04:99"
interfaces:
- - "e0:ff:f7:00:04:99"
- - "e0:ff:f7:00:08:ae"
- - "e0:ff:f7:00:08:af"
+ - mac_address: "e0:ff:f7:00:08:ae"
+ speed: 10gb
+ features: ''
+ - mac_address: "e0:ff:f7:00:08:af"
+ speed: 10gb
+ features: ''
fixed_ips:
admin: 192.168.11.2
mgmt: 172.16.10.141
@@ -126,9 +134,12 @@ nodes:
address: 10.0.8.4
mac_address: "e0:ff:f7:00:05:00"
interfaces:
- - "e0:ff:f7:00:05:00"
- - "e0:ff:f7:00:08:b1"
- - "e0:ff:f7:00:08:b2"
+ - mac_address: "e0:ff:f7:00:08:b1"
+ speed: 10gb
+ features: ''
+ - mac_address: "e0:ff:f7:00:08:b2"
+ speed: 10gb
+ features: ''
fixed_ips:
admin: 192.168.11.3
mgmt: 172.16.10.142
@@ -142,9 +153,12 @@ nodes:
address: 10.0.8.5
mac_address: "e0:ff:f7:00:04:a9"
interfaces:
- - "e0:ff:f7:00:04:a9"
- - "e0:ff:f7:00:08:bd"
- - "e0:ff:f7:00:08:be"
+ - mac_address: "e0:ff:f7:00:08:bd"
+ speed: 10gb
+ features: ''
+ - mac_address: "e0:ff:f7:00:08:be"
+ speed: 10gb
+ features: ''
fixed_ips:
admin: 192.168.11.4
mgmt: 172.16.10.143
@@ -158,9 +172,12 @@ nodes:
address: 10.0.8.6
mac_address: "e0:ff:f7:00:04:78"
interfaces:
- - "e0:ff:f7:00:04:78"
- - "e0:ff:f7:00:08:c6"
- - "e0:ff:f7:00:08:c7"
+ - mac_address: "e0:ff:f7:00:08:c6"
+ speed: 10gb
+ features: ''
+ - mac_address: "e0:ff:f7:00:08:c7"
+ speed: 10gb
+ features: ''
fixed_ips:
admin: 192.168.11.5
mgmt: 172.16.10.101
@@ -174,9 +191,12 @@ nodes:
address: 10.0.8.7
mac_address: "e0:ff:f7:00:05:19"
interfaces:
- - "e0:ff:f7:00:05:19"
- - "e0:ff:f7:00:08:cf"
- - "e0:ff:f7:00:08:d0"
+ - mac_address: "e0:ff:f7:00:08:cf"
+ speed: 10gb
+ features: ''
+ - mac_address: "e0:ff:f7:00:08:d0"
+ speed: 10gb
+ features: ''
fixed_ips:
admin: 192.168.11.6
mgmt: 172.16.10.102
diff --git a/labs/ericsson/idf-pod1.yaml b/labs/ericsson/idf-pod1.yaml
new file mode 100644
index 0000000..10469d2
--- /dev/null
+++ b/labs/ericsson/idf-pod1.yaml
@@ -0,0 +1,12 @@
+---
+### ERICSSON POD 1 installer descriptor file ###
+
+idf:
+ version: 0.1
+ fuel:
+ jumphost:
+ bridges:
+ admin: pxebr
+ mgmt: br-mgmt
+ private:
+ public: br-external
diff --git a/labs/lf/pod2.yaml b/labs/lf/pod2.yaml
new file mode 100644
index 0000000..702a533
--- /dev/null
+++ b/labs/lf/pod2.yaml
@@ -0,0 +1,226 @@
+---
+### LF POD 2 descriptor file ###
+
+details:
+ pod_owner: Trevor Bramwell
+ contact: tbramwell@linuxfoundation.org
+ lab: LF Pharos Lab
+ location: Portland
+ type: production
+ link: https://wiki.opnfv.org/display/pharos/LF+POD+2
+##############################################################################
+net_config:
+ # NOTE: Network names are likely to change after the PDF spec is updated
+ oob:
+ interface: 0
+ ip-range: 172.30.8.65-172.30.8.75
+ vlan: 410
+ admin:
+ interface: 0
+ vlan: native
+ network: 192.168.11.0 # Untagged, 'PXE/Admin' on wiki, different IP
+ mask: 24
+ mgmt:
+ interface: 0
+ vlan: 300
+ network: 10.167.4.0 # Tagged, 'vlan 300' on wiki
+ mask: 24
+ storage:
+ interface: 3
+ vlan: 301
+ network: 10.2.0.0 # Tagged, not the same with 'storage' on wiki
+ mask: 24
+ private:
+ interface: 1
+ vlan: 1000
+ network: 10.1.0.0 # Tagged, not the same with 'private' on wiki
+ mask: 24
+ public:
+ interface: 2
+ vlan: native
+ network: 172.30.10.0 # Untagged, 'public' on wiki
+ mask: 24
+ gateway: 172.30.10.1
+ dns:
+ - 8.8.8.8
+ - 8.8.4.4
+##############################################################################
+jumphost:
+ name: pod2-jump
+ node:
+ type: baremetal
+ vendor: Cisco Systems Inc
+ model: UCSB-B200-M4
+ arch: x86_64
+ cpus: 2
+ cpu_cflags: haswell
+ cores: 8
+ memory: 128G
+ disks: &disks
+ - name: 'disk1'
+ disk_capacity: 2400G
+ disk_type: hdd
+ disk_interface: sas
+ disk_rotation:
+ os: centos-7
+ remote_params: &remote_params
+ type: ipmi
+ versions:
+ - 2.0
+ user: admin
+ pass: octopus
+ remote_management:
+ <<: *remote_params
+ address: 172.30.8.83
+ mac_address: "a8:9d:21:c9:c4:9e"
+ interfaces:
+ - mac_address: "00:25:b5:a0:00:1a"
+ speed: 40gb
+ features: 'dpdk|sriov'
+ - mac_address: "00:25:b5:a0:00:1b"
+ speed: 40gb
+ features: 'dpdk|sriov'
+ - mac_address: "00:25:b5:a0:00:1c"
+ speed: 40gb
+ features: 'dpdk|sriov'
+ - mac_address: "00:25:b5:a0:00:1d"
+ speed: 40gb
+ features: 'dpdk|sriov'
+ fixed_ips:
+ admin: 192.168.11.1
+ mgmt: 10.167.4.1
+ public: 172.30.10.72
+##############################################################################
+nodes:
+ - name: pod2-node1
+ node: &nodeparams
+ type: baremetal
+ vendor: Cisco Systems Inc
+ model: UCSB-B200-M4
+ arch: x86_64
+ cpus: 2
+ cpu_cflags: haswell
+ cores: 8
+ memory: 32G
+ disks: *disks
+ remote_management:
+ <<: *remote_params
+ address: 172.30.8.75
+ mac_address: "a8:9d:21:c9:8b:56"
+ interfaces:
+ - mac_address: "00:25:b5:a0:00:2a"
+ speed: 40gb
+ features: 'dpdk|sriov'
+ - mac_address: "00:25:b5:a0:00:2b"
+ speed: 40gb
+ features: 'dpdk|sriov'
+ - mac_address: "00:25:b5:a0:00:2c"
+ speed: 40gb
+ features: 'dpdk|sriov'
+ - mac_address: "00:25:b5:a0:00:2d"
+ speed: 40gb
+ features: 'dpdk|sriov'
+ fixed_ips:
+ admin: 192.168.11.2
+ mgmt: 10.167.4.2
+ public: 172.30.10.2
+ ############################################################################
+ - name: pod2-node2
+ node: *nodeparams
+ disks: *disks
+ remote_management:
+ <<: *remote_params
+ address: 172.30.8.65
+ mac_address: "a8:9d:21:c9:4d:26"
+ interfaces:
+ - mac_address: "00:25:b5:a0:00:3a"
+ speed: 40gb
+ features: 'dpdk|sriov'
+ - mac_address: "00:25:b5:a0:00:3b"
+ speed: 40gb
+ features: 'dpdk|sriov'
+ - mac_address: "00:25:b5:a0:00:3c"
+ speed: 40gb
+ features: 'dpdk|sriov'
+ - mac_address: "00:25:b5:a0:00:3d"
+ speed: 40gb
+ features: 'dpdk|sriov'
+ fixed_ips:
+ admin: 192.168.11.3
+ mgmt: 10.167.4.3
+ public: 172.30.10.3
+ ############################################################################
+ - name: pod2-node3
+ node: *nodeparams
+ disks: *disks
+ remote_management:
+ <<: *remote_params
+ address: 172.30.8.74
+ mac_address: "a8:9d:21:c9:3a:92"
+ interfaces:
+ - mac_address: "00:25:b5:a0:00:4a"
+ speed: 40gb
+ features: 'dpdk|sriov'
+ - mac_address: "00:25:b5:a0:00:4b"
+ speed: 40gb
+ features: 'dpdk|sriov'
+ - mac_address: "00:25:b5:a0:00:4c"
+ speed: 40gb
+ features: 'dpdk|sriov'
+ - mac_address: "00:25:b5:a0:00:4d"
+ speed: 40gb
+ features: 'dpdk|sriov'
+ fixed_ips:
+ admin: 192.168.11.4
+ mgmt: 10.167.4.4
+ public: 172.30.10.4
+ ############################################################################
+ - name: pod2-node4
+ node: *nodeparams
+ disks: *disks
+ remote_management:
+ <<: *remote_params
+ address: 172.30.8.73
+ mac_address: "74:a2:e6:a4:14:9c"
+ interfaces:
+ - mac_address: "00:25:b5:a0:00:5a"
+ speed: 40gb
+ features: 'dpdk|sriov'
+ - mac_address: "00:25:b5:a0:00:5b"
+ speed: 40gb
+ features: 'dpdk|sriov'
+ - mac_address: "00:25:b5:a0:00:5c"
+ speed: 40gb
+ features: 'dpdk|sriov'
+ - mac_address: "00:25:b5:a0:00:5d"
+ speed: 40gb
+ features: 'dpdk|sriov'
+ fixed_ips:
+ admin: 192.168.11.5
+ mgmt: 10.167.4.5
+ public: 172.30.10.5
+ ############################################################################
+ - name: pod2-node5
+ node: *nodeparams
+ disks: *disks
+ remote_management:
+ <<: *remote_params
+ address: 172.30.8.72
+ mac_address: "a8:9d:21:a0:15:9c"
+ interfaces:
+ - mac_address: "00:25:b5:a0:00:6a"
+ speed: 40gb
+ features: 'dpdk|sriov'
+ - mac_address: "00:25:b5:a0:00:6b"
+ speed: 40gb
+ features: 'dpdk|sriov'
+ - mac_address: "00:25:b5:a0:00:6c"
+ speed: 40gb
+ features: 'dpdk|sriov'
+ - mac_address: "00:25:b5:a0:00:6d"
+ speed: 40gb
+ features: 'dpdk|sriov'
+ fixed_ips:
+ admin: 192.168.11.6
+ mgmt: 10.167.4.6
+ public: 172.30.10.6