Merge "Adding Deployment Guide"

diff --git a/deploy.env b/deploy.env
index 602dfd8..07d1bf3 100644 (file)
--- a/deploy.env
+++ b/deploy.env
@@ -10,3 +10,4 @@ export BRIDGE=pxebr
 export VM_NAME=$(yq r $CURRENTPATH/hw_config/$VENDOR/pdf.yaml jumphost.name)
 export USERNAME=ubuntu
 export PROJECT_ROOT="/home/ubuntu"
+export ROOT_PASSWORD="root" # This is used for throubleshooting purposes

diff --git a/functions.sh b/functions.sh
index b0baf2d..5c37843 100755 (executable)
--- a/functions.sh
+++ b/functions.sh
@@ -46,7 +46,8 @@ EOL
 # Create VM
     sudo genisoimage  -output "/var/lib/libvirt/images/$VM_NAME/$VM_NAME-cidata.iso" \
         -volid cidata -joliet -rock user-data meta-data
-
+    sudo virt-customize -a "/var/lib/libvirt/images/$VM_NAME/$VM_NAME.qcow2" \
+        --root-password password:"$ROOT_PASSWORD"
     sudo virt-install --connect qemu:///system --name "$VM_NAME" \
         --ram 4096 --vcpus=4 --os-type linux --os-variant ubuntu16.04 \
         --disk path="/var/lib/libvirt/images/$VM_NAME/$VM_NAME.qcow2",format=qcow2 \

diff --git a/hw_config/ericsson-pod1/setup_network.sh b/hw_config/ericsson-pod1/setup_network.sh
index 022394d..4696f6b 100755 (executable)
--- 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 (file)
--- 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 (file)
--- 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