optimize finding type of the systemvm, minor optimizations

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Author: yadvr

systemvm/debian/opt/cloud/bin/setup/cloud-early-config

@@ -143,21 +143,6 @@ get_boot_params() {
   esac
 }
 
-get_systemvm_type() {
-  for str in $(cat $CMDLINE)
-    do
-      KEY=$(echo $str | cut -d= -f1)
-      VALUE=$(echo $str | cut -d= -f2)
-      case $KEY in
-        type)
-          export TYPE=$VALUE
-          ;;
-        *)
-          ;;
-      esac
-  done
-}
-
 patch() {
   local PATCH_MOUNT=/media/cdrom
   local patchfile=$PATCH_MOUNT/cloud-scripts.tgz
@@ -224,11 +209,11 @@ start() {
 
   config_guest
   get_boot_params
-  get_systemvm_type
   patch
   sync
   sysctl -p
 
+  export TYPE=$(grep -Po 'type=\K[a-zA-Z]*' $CMDLINE)
   log_it "Configuring systemvm type=$TYPE"
 
   if [ -f "/opt/cloud/bin/setup/$TYPE.sh" ]; then

systemvm/debian/opt/cloud/bin/setup/common.sh

@@ -578,24 +578,13 @@ setup_ntp() {
 }
 
 routing_svcs() {
-   systemctl disable --now cloud
-   systemctl disable --now nfs-common
-   systemctl disable --now portmap
-   systemctl enable apache2
-   systemctl enable haproxy
    echo "haproxy apache2" > /var/cache/cloud/enabled_svcs
    echo "cloud nfs-common portmap" > /var/cache/cloud/disabled_svcs
    if [ "$RROUTER" -eq "1" ]
    then
-       systemctl disable --now dnsmasq
-       systemctl enable conntrackd
-       systemctl enable keepalived
        echo "keepalived conntrackd" >> /var/cache/cloud/enabled_svcs
        echo "dnsmasq" >> /var/cache/cloud/disabled_svcs
    else
-       systemctl disable --now conntrackd
-       systemctl disable --now keepalived
-       systemctl enable dnsmasq
        echo "dnsmasq" >> /var/cache/cloud/enabled_svcs
        echo "keepalived conntrackd " >> /var/cache/cloud/disabled_svcs
    fi

systemvm/debian/opt/cloud/bin/setup/postinit.sh

@@ -21,48 +21,25 @@
 # Eject cdrom if any
 eject || true
 
-# Setup router
-CMDLINE=/var/cache/cloud/cmdline
-for str in $(cat $CMDLINE)
-  do
-    KEY=$(echo $str | cut -d= -f1)
-    VALUE=$(echo $str | cut -d= -f2)
-    case $KEY in
-      type)
-        export TYPE=$VALUE
-        ;;
-      *)
-        ;;
-    esac
-done
-
+TYPE=$(grep -Po 'type=\K[a-zA-Z]*' $CMDLINE)
 if [ "$TYPE" == "router" ] || [ "$TYPE" == "vpcrouter" ] || [ "$TYPE" == "dhcpsrvr" ]
 then
   if [ -x /opt/cloud/bin/update_config.py ]
   then
       /opt/cloud/bin/update_config.py cmd_line.json || true
-      logger -t cloud "postinit: Updated config cmd_line.json"
   fi
 fi
 
-if [ "$TYPE" == "router" ]
-then
-    python /opt/cloud/bin/baremetal-vr.py &
-    logger -t cloud "Started baremetal-vr service"
-fi
-
 [ ! -f /var/cache/cloud/enabled_svcs ] && touch /var/cache/cloud/enabled_svcs
 for svc in $(cat /var/cache/cloud/enabled_svcs)
 do
-   logger -t cloud "Starting $svc"
-   systemctl enable --no-block --now $svc
+   systemctl enable --now --no-block $svc
 done
 
 [ ! -f /var/cache/cloud/disabled_svcs ] && touch /var/cache/cloud/disabled_svcs
 for svc in $(cat /var/cache/cloud/disabled_svcs)
 do
-   logger -t cloud "Stopping $svc"
-   systemctl disable --no-block --now $svc
+   systemctl disable --now --no-block $svc
 done
 
 # Restore the persistent iptables nat, rules and filters for IPv4 and IPv6 if they exist
@@ -78,8 +55,12 @@ then
    ip6tables-restore < $ipv6
 fi
 
-# Enable SSH by default
-systemctl enable --no-block --now ssh
+# Enable SSH
+systemctl enable --now --no-block ssh
 
 date > /var/cache/cloud/boot_up_done
-logger -t cloud "Boot up process done"
+
+if [ "$TYPE" == "router" ]
+then
+    python /opt/cloud/bin/baremetal-vr.py &
+fi

systemvm/debian/opt/cloud/bin/setup/router.sh

@@ -19,9 +19,7 @@
 . /opt/cloud/bin/setup/common.sh
 
 setup_router() {
-  log_it "Setting up virtual router system vm"
-
-  #To save router public interface and gw ip information
+  # To save router public interface and gw ip information
   touch /var/cache/cloud/ifaceGwIp
 
   oldmd5=
@@ -82,11 +80,11 @@ setup_router() {
   cp /etc/iptables/iptables-router /etc/iptables/rules.v4
   setup_sshd $ETH1_IP "eth1"
 
-  #Only allow DNS service for current network
+  # Only allow DNS service for current network
   sed -i "s/-A INPUT -i eth0 -p udp -m udp --dport 53 -j ACCEPT/-A INPUT -i eth0 -p udp -m udp --dport 53 -s $DHCP_RANGE\/$CIDR_SIZE -j ACCEPT/g" /etc/iptables/rules.v4
   sed -i "s/-A INPUT -i eth0 -p tcp -m tcp --dport 53 -j ACCEPT/-A INPUT -i eth0 -p tcp -m tcp --dport 53 -s $DHCP_RANGE\/$CIDR_SIZE -j ACCEPT/g" /etc/iptables/rules.v4
 
-  #setup hourly logrotate
+  # Setup hourly logrotate
   mv -n /etc/cron.daily/logrotate /etc/cron.hourly 2>&1
 }