Commit bb3d6de1 authored by Marc Vef's avatar Marc Vef
Browse files

Start/shutdown script: hostfile bugfix

parent cb3eb3d5

ifs/scripts/shutdown_adafs.py

+1 −2
Original line number Diff line number Diff line
@@ -55,12 +55,11 @@ def shutdown_system(daemon_path, nodelist, sigkill): 
        nodefile = True

        if not util.create_pssh_hostfile(nodelist, CONST_PSSH_HOSTFILE_PATH):

            exit(1)

        nodelist = CONST_PSSH_HOSTFILE_PATH

    if PSSH_PATH is '':

        check_dependencies()

    # set pssh arguments

    if nodefile:

        pssh = '%s -O StrictHostKeyChecking=no -i -h "%s"' % (PSSH_PATH, nodelist)

        pssh = '%s -O StrictHostKeyChecking=no -i -h "%s"' % (PSSH_PATH, CONST_PSSH_HOSTFILE_PATH)

    else:

        pssh = '%s -O StrictHostKeyChecking=no -i -H "%s"' % (PSSH_PATH, nodelist.replace(',', ' '))

    if sigkill:

ifs/scripts/startup_adafs.py

+1 −2
Original line number Diff line number Diff line
@@ -57,12 +57,11 @@ def init_system(daemon_path, rootdir, mountdir, nodelist, cleanroot): 
        nodefile = True

        if not util.create_pssh_hostfile(nodelist, CONST_PSSH_HOSTFILE_PATH):

            exit(1)

        nodelist = CONST_PSSH_HOSTFILE_PATH

    if PSSH_PATH is '':

        check_dependencies()

    # set pssh arguments

    if nodefile:

        pssh = '%s -O StrictHostKeyChecking=no -i -h "%s"' % (PSSH_PATH, nodelist)

        pssh = '%s -O StrictHostKeyChecking=no -i -h "%s"' % (PSSH_PATH, CONST_PSSH_HOSTFILE_PATH)

    else:

        pssh = '%s -O StrictHostKeyChecking=no -i -H "%s"' % (PSSH_PATH, nodelist.replace(',', ' '))