From c2f50bdc2aecfa3a8f4bb0220ef92e3814f735a8 Mon Sep 17 00:00:00 2001
From: Jo De Boeck <deboeck.jo@gmail.com>
Date: Wed, 4 Jul 2018 14:38:43 +0200
Subject: [PATCH] Update to localdev scripts

Signed-off-by: Jo De Boeck <deboeck.jo@gmail.com>
---
 scripts/dev/localnode/_functions    |  2 +-
 scripts/dev/localnode/masterinstall | 12 ++++++++++++
 scripts/dev/localnode/nodeinstall   |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/scripts/dev/localnode/_functions b/scripts/dev/localnode/_functions
index 9bdabd77a..73ffe5f2c 100644
--- a/scripts/dev/localnode/_functions
+++ b/scripts/dev/localnode/_functions
@@ -44,7 +44,7 @@ createcontainer() {
     cmd apt-get install -y vim net-tools iproute2 openssh-server iputils-ping curl sudo
     enableservice ssh
     cmd mkdir /root/.ssh
-    docker cp $(readlink $HOME/.ssh/$SSHKEY) $name:/root/.ssh/authorized_keys
+    docker cp "$(readlink -f $HOME/.ssh/$SSHKEY)" $name:/root/.ssh/authorized_keys
     cmd chmod 600 /root/.ssh/authorized_keys
     cmd chown 0:0 /root/.ssh/authorized_keys
     addsshhosts
diff --git a/scripts/dev/localnode/masterinstall b/scripts/dev/localnode/masterinstall
index fbc9dd3ba..85a5407af 100755
--- a/scripts/dev/localnode/masterinstall
+++ b/scripts/dev/localnode/masterinstall
@@ -12,10 +12,22 @@ Restart=on-failure
 Type=simple                             
 " > /etc/systemd/system/multi-user.target.wants/ovcstartup.service
 
+debconf-set-selections <<< "postfix postfix/mailname string ovc.local"
+debconf-set-selections <<< "postfix postfix/main_mailer_type string 'Internet Site'"
+apt-get install -y postfix
+systemctl enable postfix
+systemctl start postfix
+
 installjs
 ays install -n python_portal
 ays install -n cb_master_aio --hrdseed /opt/code/github/0-complexity/openvcloud/scripts/dev/localnode/cfg/masterconfig.hrd
 echo "
 pcl = j.clients.portal.getByInstance('main')
 pcl.actors.cloudbroker.iaas.addExternalNetwork(name='docknet', subnet='172.17.0.0/16', gateway='172.17.0.1', startip='172.17.1.100', endip='172.17.1.120', gid=66, vlan=0)
+lcl = j.clients.osis.getNamespace('libvirt')
+if not lcl.vnc.list():
+    vnc = lcl.vnc.new()
+    vnc.gid = 66
+    vnc.url = 'http://172.17.1.10:8091/vnc_auto.html?token='
+    lcl.vnc.set(vnc)
 " | js
diff --git a/scripts/dev/localnode/nodeinstall b/scripts/dev/localnode/nodeinstall
index 441d7505d..70052c0d8 100755
--- a/scripts/dev/localnode/nodeinstall
+++ b/scripts/dev/localnode/nodeinstall
@@ -11,7 +11,7 @@ systemctl start virtlogd
 echo "
 <network>
        <name>gw_mgmt</name>
-       <forward mode="bridge"/>
+       <forward mode='bridge'/>
        <bridge name='gw_mgmt'/>
        <virtualport type='openvswitch'/>
    </network>