summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRihab Banday <rihab.banday@ericsson.com>2020-08-18 10:51:24 +0200
committerRihab Banday <rihab.banday@ericsson.com>2020-08-18 11:03:51 +0200
commit4ab14dcbf0bb1e37d25c086c27c8c1c48f8abfd0 (patch)
tree86d7264ba7cec9b4fb18fcf79e8dff43c0560936
parent28d1cee5c7b95ae905a4481245d5d5650c87e101 (diff)
Fix minor bugs observed in hw_config files
This patch fixes minor bugs observed in hw_config files: 1. Rename admin network to public in Intel's IDF to have consistent network naming schemes across IDF's. 2. Remove arbitary/unverified VLAN's from Intel's PDF. 3. Move shebang to top to fix linting error. Change-Id: Ibad63e80431880ef5558864bf890dd1877400b08 Signed-off-by: Rihab Banday <rihab.banday@ericsson.com>
-rwxr-xr-xhw_config/ericsson-pod1/setup_network.sh2
-rw-r--r--hw_config/intel/idf.yaml4
-rw-r--r--hw_config/intel/pdf.yaml4
3 files changed, 5 insertions, 5 deletions
diff --git a/hw_config/ericsson-pod1/setup_network.sh b/hw_config/ericsson-pod1/setup_network.sh
index 022394d..4696f6b 100755
--- a/hw_config/ericsson-pod1/setup_network.sh
+++ b/hw_config/ericsson-pod1/setup_network.sh
@@ -1,8 +1,8 @@
+#!/bin/bash
# Adapt this script according to your network setup
# TODO Get networking info from PDF & IDF
# TODO Add support in infra engine to update nameserver, etc
# files with correct info
-#!/bin/bash
echo "no additional network setup needed"
diff --git a/hw_config/intel/idf.yaml b/hw_config/intel/idf.yaml
index a5f9455..328fe09 100644
--- a/hw_config/intel/idf.yaml
+++ b/hw_config/intel/idf.yaml
@@ -19,10 +19,10 @@ idf:
mask: 24
dns:
- 8.8.8.8
- admin: # admin
+ public:
interface: 1
- vlan: 191
network: 10.10.191.0
+ vlan: native
mask: 24
bridge: br-name
kubespray: &idf_kubespray
diff --git a/hw_config/intel/pdf.yaml b/hw_config/intel/pdf.yaml
index ba0c856..86501a0 100644
--- a/hw_config/intel/pdf.yaml
+++ b/hw_config/intel/pdf.yaml
@@ -75,7 +75,7 @@ nodes:
features:
address: 192.168.11.211
mac_address: "a4:bf:01:4b:55:f5"
- vlan: 191
+ vlan: native
- name: 'nic3'
speed: 10gb
features: 'dpdk|sriov'
@@ -131,4 +131,4 @@ nodes:
features: 'dpdk|sriov'
address: 10.10.195.3
mac_address: "00:00:00:00:00:00"
- vlan: 1193
+ vlan: native