diff options
| author |   Rihab Banday <rihab.banday@ericsson.com> | 2020-08-12 15:39:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2020-08-12 15:39:02 +0000 |
| commit | 332652ce8bb53ea580d3a2a1f9b12e7d311ae29b (patch) | |
| tree | 4525d34e5eec310009581f0c153c5a139d68e88e /hw_config | |
| parent | 2269cffee0006eaf7415cb50261f0a1d34e9f37f (diff) | |
| parent | 15af69c32d0338d7a659ddcf23cfb339973d18e2 (diff) | |
Merge "Implement linting process"
Diffstat (limited to 'hw_config')
| -rw-r--r-- | hw_config/intel/idf.yaml | 2 | ||||
| -rw-r--r-- | hw_config/intel/pdf.yaml | 5 | ||||
| -rwxr-xr-x | hw_config/intel/setup_network.sh | 15 |
3 files changed, 15 insertions, 7 deletions
diff --git a/hw_config/intel/idf.yaml b/hw_config/intel/idf.yaml index d9127ff..a5f9455 100644 --- a/hw_config/intel/idf.yaml +++ b/hw_config/intel/idf.yaml @@ -1,3 +1,4 @@ +--- # SPDX-license-identifier: Apache-2.0 ############################################################################## # Copyright (c) 2020 @@ -6,6 +7,7 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## + idf: version: 0.1 net_config: &net_config diff --git a/hw_config/intel/pdf.yaml b/hw_config/intel/pdf.yaml index c97f29a..4b7862d 100644 --- a/hw_config/intel/pdf.yaml +++ b/hw_config/intel/pdf.yaml @@ -1,3 +1,4 @@ +--- # SPDX-license-identifier: Apache-2.0 ############################################################################## # Copyright (c) 2020 @@ -6,7 +7,6 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -### POD descriptor file ### version: 1.0 details: @@ -16,7 +16,6 @@ details: location: somewhere type: baremetal link: http://wiki.opnfv.org/display/pharos/Intel+Hosting -############################################################################## jumphost: name: pod19-jump node: &nodeparas @@ -56,7 +55,6 @@ jumphost: address: 10.10.192.1 mac_address: "3c:fd:fe:aa:be:24" vlan: native -############################################################################## nodes: - name: node1 node: *nodeparas @@ -96,7 +94,6 @@ nodes: address: 10.10.195.2 mac_address: "00:00:00:00:00:00" vlan: native -######################################################################## - name: node2 node: *nodeparas disks: *disks diff --git a/hw_config/intel/setup_network.sh b/hw_config/intel/setup_network.sh index a6ff6df..4035b7a 100755 --- a/hw_config/intel/setup_network.sh +++ b/hw_config/intel/setup_network.sh @@ -1,11 +1,20 @@ +#!/bin/bash +# SPDX-license-identifier: Apache-2.0 +############################################################################## +# Copyright (c) +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + # 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 nameserver 8.8.8.8 > /etc/resolv.conf -sed -i 's/NM_CONTROLLED=yes/NM_CONTROLLED=no/g' /etc/sysconfig/network-scripts/ifcfg-eth2 +sed -i 's/NM_CONTROLLED=yes/NM_CONTROLLED=no/g' \ +/etc/sysconfig/network-scripts/ifcfg-eth2 echo GATEWAY=10.10.190.1 >> /etc/sysconfig/network-scripts/ifcfg-eth2 ifup eth2 - |