Merge remote-tracking branch 'origin/development'

Author: bensallen

.circleci/config.yml

@@ -0,0 +1,83 @@
+jobs:
+  build_centos7:
+    docker:
+     - image: centos:7
+
+    working_directory: ~/warewulf3
+
+    steps:
+      - checkout
+      - run:
+          name: Install Build Dependencies
+          command: |
+            set -o xtrace
+            yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+            rpmkeys --import /etc/pki/rpm-gpg/RPM-GPG-KEY-*
+            yum -y --exclude=systemtap --exclude=subversion install @development binutils-aarch64-linux-gnu device-mapper-devel gcc-aarch64-linux-gnu libacl-devel libattr-devel libuuid-devel openssl-devel perl-CGI perl-Compress-Raw-Bzip2 perl-Compress-Raw-Zlib perl-DBD-MySQL perl-DBI perl-Digest perl-Digest-MD5 perl-IO-Compress perl-Net-Daemon perl-PlRPC perl-Sys-Syslog perl-Test-Simple xz-devel
+      - run:
+          name: Build Common
+          command: |
+            set -o xtrace
+            set -o nounset
+            cd common
+            ./autogen.sh
+            make test
+            make dist-gzip
+            rpmbuild -D "_sourcedir $PWD" -ba ./warewulf-common.spec
+      - run:
+          name: Install warewulf-common
+          command: |
+            set -o xtrace
+            set -o nounset
+            GITVERSION=$(git show -s --pretty=format:%h)
+            DIST=$(rpm --eval '%{dist}')
+            yum -y install ~/rpmbuild/RPMS/noarch/warewulf-common-3.8-0.${GITVERSION}${DIST}.noarch.rpm
+      - run:
+          name: Build Cluster
+          command: |
+            set -o xtrace
+            set -o nounset
+            cd cluster
+            ./autogen.sh
+            make dist-gzip
+            rpmbuild -D "_sourcedir $PWD" -ba ./warewulf-cluster.spec
+      - run:
+          name: Build IPMI
+          command: |
+            set -o xtrace
+            set -o nounset
+            cd ipmi
+            ./autogen.sh
+            make dist-gzip
+            rpmbuild -D "_sourcedir $PWD" -ba ./warewulf-ipmi.spec
+      - run:
+          name: Build Provision 
+          command: |
+            set -o xtrace
+            set -o nounset
+            cd provision
+            ./autogen.sh
+            make dist-gzip
+            rpmbuild -D "_sourcedir $PWD" -D "cross_compile 1" -D "mflags -j$(/usr/bin/getconf _NPROCESSORS_ONLN)" -ba ./warewulf-provision.spec
+      - run:
+          name: Build VNFS
+          command: |
+            set -o xtrace
+            set -o nounset
+            cd vnfs
+            ./autogen.sh
+            make dist-gzip
+            rpmbuild -D "_sourcedir $PWD" -ba ./warewulf-vnfs.spec
+
+      - store_artifacts:
+          path: ~/rpmbuild/RPMS
+          destination: RPMS
+      - store_artifacts:
+          path: ~/rpmbuild/SRPMS
+          destination: SRPMS
+
+workflows:
+  version: 2
+  build:
+    jobs:
+      - build_centos7

cluster/README.node

@@ -138,7 +138,7 @@ CONFIGURATION VARIABLES (wwfirstboot.conf):
     FILESYSTEMS declaration for use during bootstrap:
 
       PART_1="2048:swap"
-      PART_2="fill:ext3:/tmp:1777"
+      PART_2="fill:ext4:/tmp:1777"
 
     The layout of the variable values is:
 
@@ -189,7 +189,7 @@ DISK=hdb
 #    seen. If you want to use up the rest of the disk, then
 #    define it as the last partiton
 PART_1="2048:swap"
-PART_2="114280:ext3:/scratch:1777"
+PART_2="114280:ext4:/scratch:1777"
 PART_3="fill:ext4:/storage:0755"
 #
 # 99-michost

cluster/bin/cluster-env

@@ -17,7 +17,7 @@ fi
 if [ ! -f "$HOME/.ssh/config" -a ! -f "$HOME/.ssh/cluster" ]; then
     echo "Configuring SSH for cluster access"
     install -d -m 700 $HOME/.ssh
-    ssh-keygen -t dsa -f $HOME/.ssh/cluster -N '' -C "Warewulf Cluster key" > /dev/null 2>&1
+    ssh-keygen -t rsa -f $HOME/.ssh/cluster -N '' -C "Warewulf Cluster key" > /dev/null 2>&1
     cat $HOME/.ssh/cluster.pub >> $HOME/.ssh/authorized_keys
     chmod 0600 $HOME/.ssh/authorized_keys
 

cluster/configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT(warewulf-cluster, 3.7, [email protected])
+AC_INIT(warewulf-cluster, 3.8, [email protected])
 AC_CONFIG_SRCDIR([.])
 
 AC_PROG_INSTALL

cluster/libexec/wwinit/20-ipxe.init

@@ -32,7 +32,7 @@ fi
 wwprint "Checking ssh keys for root"
 if ! wwtest test -f "$HOME/.ssh/cluster"; then
     wwprint "Generating ssh keypairs for local cluster access:\n"
-    if ! wwrun ssh-keygen -t dsa -f $HOME/.ssh/cluster -N ''; then
+    if ! wwrun ssh-keygen -t rsa -f $HOME/.ssh/cluster -N ''; then
         exit 255
     fi
     wwprint "Updating authorized keys"
@@ -46,8 +46,8 @@ wwprint "Checking root's ssh config"
 if ! wwtest test -f "$HOME/.ssh/config"; then
     wwprint "Creating ssh configuration for root"
     echo "Host *" >> $HOME/.ssh/config
-    echo "   IdentityFile ~/.ssh/identity" >> $HOME/.ssh/config
     echo "   IdentityFile ~/.ssh/id_rsa" >> $HOME/.ssh/config
+    echo "   IdentityFile ~/.ssh/id_ed25519" >> $HOME/.ssh/config
     echo "   IdentityFile ~/.ssh/id_dsa" >> $HOME/.ssh/config
     echo "   IdentityFile ~/.ssh/cluster" >> $HOME/.ssh/config
     echo "   StrictHostKeyChecking=no" >> $HOME/.ssh/config
@@ -57,19 +57,6 @@ if ! wwtest test -f "$HOME/.ssh/config"; then
 fi
 
 
-wwprint "Checking for default RSA1 host key for nodes"
-if ! wwtest test -f "$WAREWULF_SYSCONFDIR/warewulf/vnfs/ssh/ssh_host_key"; then
-    install -d -m 700 $WAREWULF_SYSCONFDIR/warewulf/vnfs/ssh
-    wwprint "Creating default node ssh_host_key:\n"
-    if ! ssh-keygen -q -t rsa1 -f $WAREWULF_SYSCONFDIR/warewulf/vnfs/ssh/ssh_host_key -C '' -N '' 2>/dev/null; then
-        wwprint "RSA1 key is not supported on your system" yellow
-        reply_warn
-    else
-	reply_ok
-    fi
-    RETVAL=0
-fi
-
 wwprint "Checking for default RSA host key for nodes"
 if ! wwtest test -f "$WAREWULF_SYSCONFDIR/warewulf/vnfs/ssh/ssh_host_rsa_key"; then
     install -d -m 700 $WAREWULF_SYSCONFDIR/warewulf/vnfs/ssh
@@ -103,5 +90,17 @@ if ! wwtest test -f "$WAREWULF_SYSCONFDIR/warewulf/vnfs/ssh/ssh_host_ecdsa_key";
     RETVAL=0
 fi
 
+wwprint "Checking for default Ed25519 host key for nodes"
+if ! wwtest test -f "$WAREWULF_SYSCONFDIR/warewulf/vnfs/ssh/ssh_host_ed25519_key"; then
+    install -d -m 700 $WAREWULF_SYSCONFDIR/warewulf/vnfs/ssh
+    wwprint "Creating default node ssh_host_ed25519_key:\n"
+    if ! ssh-keygen -q -t ed25519 -f $WAREWULF_SYSCONFDIR/warewulf/vnfs/ssh/ssh_host_ed25519_key -C '' -N '' 2>/dev/null; then
+        wwprint "Ed25519 key is not supported on your system" yellow
+        reply_warn
+    else
+	reply_ok
+    fi
+    RETVAL=0
+fi
 
 exit $RETVAL

cluster/libexec/wwinit/50-ssh_keys.init

@@ -21,7 +21,7 @@ fi
 wwreqroot
 
 if wwpackage_check tftp-server tftpd tftpd-hpa; then
-    if wwservice_activate tftpd tftp tftpd-hpa; then
+    if wwservice_activate tftp.socket tftpd tftp tftpd-hpa; then
         exit 0
     fi
 fi

cluster/libexec/wwinit/50-tftp.init

@@ -1,6 +1,6 @@
 wwinitdir = $(libexecdir)/warewulf/wwinit
 
-dist_wwinit_SCRIPTS = 20-ipxe.init 30-domain.init 40-authfiles.init 50-dhcp.init 50-nfsd.init 50-ntpd.init 50-ssh_keys.init 50-tftp.init 60-hostfile.init 90-bootstrap.init 91-vnfs.init
+dist_wwinit_SCRIPTS = 30-domain.init 40-authfiles.init 50-dhcp.init 50-nfsd.init 50-ntpd.init 50-ssh_keys.init 50-tftp.init 60-hostfile.init 90-bootstrap.init 91-vnfs.init
 
 MAINTAINERCLEANFILES = Makefile.in
 

cluster/libexec/wwinit/Makefile.am

@@ -1,7 +1,7 @@
 #!/usr/bin/perl -Tw
 #
 # Copyright (c) 2001-2003 Gregory M. Kurtzer
-# 
+#
 # Copyright (c) 2003-2011, The Regents of the University of California,
 # through Lawrence Berkeley National Laboratory (subject to receipt of any
 # required approvals from the U.S. Dept. of Energy).  All rights reserved.
@@ -62,6 +62,11 @@ if ($opt_help) {
     exit;
 }
 
+# Use of -e/--exp implies -s/--sh:
+if ($opt_exp) {
+    $opt_sh = 1;
+}
+
 foreach my $key (@VARS) {
     my $val;
 

common/bin/wwconfig

@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT(warewulf-common, 3.7, [email protected])
+AC_INIT(warewulf-common, 3.8, [email protected])
 AC_CONFIG_SRCDIR([.])
 
 AC_PROG_INSTALL

common/configure.ac

@@ -102,9 +102,9 @@ reply_error() {
 }
 
 wwprint() {
-    MSG=$1
+    MSG="$1"
     COLOR=$GRAY
-    COMMAND=`basename $0 | sed -e 's/^[0-9]*-\?//' | sed -e 's/\.init$//'`
+    COMMAND=`basename -- $0 | sed -e 's/^[0-9]*-\?//' | sed -e 's/\.init$//'`
 
     case $2 in
         white|WHITE)            COLOR=$WHITE ;;
@@ -117,6 +117,26 @@ wwprint() {
     echo -ne "$WHITE$COMMAND$NORMAL:\\033[14G $COLOR$MSG$NORMAL"
 }
 
+wwprintf() {
+    FMT="$1"
+    shift
+    
+    COLOR=$GRAY
+    COMMAND=`basename -- $0 | sed -e 's/^[0-9]*-\?//' | sed -e 's/\.init$//'`
+
+    case $1 in
+        white|WHITE)            COLOR=$WHITE; shift ;;
+        gray|GRAY|grey|GREY)    COLOR=$GRAY; shift ;;
+        red|RED|error)          COLOR=$RED; shift ;;
+        yellow|YELLOW|warn)     COLOR=$YELLOW; shift ;;
+        blue|BLUE)              COLOR=$BLUE; shift ;;
+    esac
+
+    echo -ne "$WHITE$COMMAND$NORMAL:\\033[14G $COLOR"
+    printf "$FMT" "$@"
+    echo -ne "$NORMAL"
+}
+
 wwaction() {
     TMPFILE=`mktemp`
     "$@" >$TMPFILE 2>&1
@@ -127,7 +147,7 @@ wwaction() {
         reply_error
         wwprint "+ $*\n" RED
         cat $TMPFILE | while read i; do
-            wwprint "$i\n" YELLOW
+            wwprintf "%s\n" YELLOW "$i"
         done
     fi
     rm -f $TMPFILE
@@ -155,7 +175,7 @@ wwrun() {
     else
         reply_error
         cat $TMPFILE | while read i; do
-            wwprint "$i\n" YELLOW
+            wwprintf "%s\n" YELLOW "$i"
         done
     fi
     rm -f $TMPFILE
@@ -212,16 +232,19 @@ wwpackage_check() {
 # that have different service names for the same service (e.g. ntp and
 # ntpd).
 wwservice_activate() {
-    if test -x "/bin/initctl" || test -x "/usr/sbin/update-rc.d" ; then
-        # We need to add entries for initctl and update-rc.d below! HELP!
-        wwprint "You will need to manually enable and (re)start: $@\n" warn
-    fi
     for SERVICE in "$@"; do
-        if [ -e "/etc/xinetd.d/$SERVICE" ]; then
-            wwprint "Activating xinetd service: $1\n"
-            wwrun sed -ie 's@\(disable\s*=\s*\)\S*@\1no@' /etc/xinetd.d/$SERVICE
-            wwservice_activate xinetd
-            return 0
+        if [ -x "/bin/systemctl" ]; then
+            if ! echo $SERVICE | egrep -q '\.service$|\.socket$'; then
+                SERVICE="${SERVICE}.service"
+            fi
+            if systemctl list-unit-files --type=service,socket | egrep -q "^$SERVICE"; then
+                wwprint "Activating Systemd unit: $1\n"
+                if wwrun /bin/systemctl -q enable $SERVICE; then
+                    if wwrun /bin/systemctl -q restart $SERVICE; then
+                        return 0
+                    fi
+                fi
+            fi
         elif [ -x "/etc/rc.d/init.d/$SERVICE" ]; then
             wwprint "Activating system service: $1\n"
             if [ -x "/sbin/chkconfig" ]; then
@@ -235,13 +258,11 @@ wwservice_activate() {
             if wwrun /etc/init.d/$SERVICE restart; then
                 return 0
             fi
-        elif test -x "/bin/systemctl" && systemctl list-unit-files --type=service | egrep -q "^$SERVICE.service"; then
-            wwprint "Activating Systemd service: $1\n"
-            if wwrun /bin/systemctl -q enable $SERVICE.service; then
-                if wwrun /bin/systemctl -q restart $SERVICE.service; then
-                    return 0
-                fi
-            fi
+        elif [ -e "/etc/xinetd.d/$SERVICE" ]; then
+            wwprint "Activating xinetd service: $1\n"
+            wwrun sed -ie 's@\(disable\s*=\s*\)\S*@\1no@' /etc/xinetd.d/$SERVICE
+            wwservice_activate xinetd
+            return 0
         fi
     done
 
@@ -251,17 +272,17 @@ wwservice_activate() {
 
 
 service_findname() {
-    wwprint "service_findname() has been depricated" warn
+    wwprint "service_findname() has been deprecated" warn
     return 0
 }
 
 service_enable() {
-    wwprint "service_enable() has been depricated" warn
+    wwprint "service_enable() has been deprecated" warn
     return 0
 }
 
 service_restart() {
-    wwprint "service_restart() has been depricated" warn
+    wwprint "service_restart() has been deprecated" warn
     return 0
 }