Make cluster_setup.sh use generated configuration file

[tridge/autocluster.git] / base / all / root / scripts / tasks / setup_node_ad.sh

diff --git a/base/all/root/scripts/tasks/setup_node_ad.sh b/base/all/root/scripts/tasks/setup_node_ad.sh
index 2077b7ff3be8008b68322528996c83482ef98f92..e8ceac761cdabd306d33297bf9a4cd4b121811be 100755 (executable)
--- a/base/all/root/scripts/tasks/setup_node_ad.sh
+++ b/base/all/root/scripts/tasks/setup_node_ad.sh
@@ -9,22 +9,22 @@ set -e
 rm -f /etc/samba/smb.conf
 
 # Create AD instance
-echo "Provisioning Samba4 AD domain: @@DOMAIN@@"
-hostip="@@NETWORK_PRIVATE_PREFIX@@.@@IPNUM@@"
+echo "Provisioning Samba4 AD domain: ${DOMAIN}"
+hostip="${NETWORK_PRIVATE_PREFIX}.${IPNUM}"
 samba-tool domain provision \
-    --realm="@@DOMAIN@@" \
-       --domain="@@WORKGROUP@@" \
+    --realm="$DOMAIN" \
+       --domain="$WORKGROUP" \
        --host-ip="$hostip" \
-       --host-name="@@AD_NETBIOS_NAME@@" \
+       --host-name="$AD_NETBIOS_NAME" \
        --server-role="domain controller" \
-       --function-level="@@AD_FUNCTION_LEVEL@@" \
+       --function-level="$AD_FUNCTION_LEVEL" \
        --dns-backend="SAMBA_INTERNAL"
 
 # Add samba configuration parameters
 sed -i -e '/server services/a\
         allow dns updates = True\
         nsupdate command = nsupdate\
-        dns forwarder = @@AD_DNS_FORWARDER@@\
+        dns forwarder = ${AD_DNS_FORWARDER}\
         dns recursive queries = Yes' /etc/samba/smb.conf
 
 # Add users/groups
@@ -34,7 +34,7 @@ samba-tool domain passwordsettings set --complexity=off
 samba-tool user add test test01
 samba-tool user setexpiry --noexpiry Administrator
 samba-tool user setexpiry --noexpiry test
-samba-tool user setpassword administrator --newpassword="@@AD_ADMIN_PASS@@"
+samba-tool user setpassword administrator --newpassword="$AD_ADMIN_PASS"
 
 # Samba start-up
 cat >> /etc/rc.d/rc.local <<EOF
@@ -45,7 +45,7 @@ EOF
 mkdir /var/run/samba
 
 # Add NetBIOS name to hosts
-echo "$hostip @@AD_NETBIOS_NAME@@.@@DOMAIN@@ @@AD_NETBIOS_NAME@@" >>/etc/hosts
+echo "${hostip} ${AD_NETBIOS_NAME}.${DOMAIN} ${AD_NETBIOS_NAME}" >>/etc/hosts
 
 # Update DNS configuration
 echo "Updating /etc/resolv.conf"