Remove Windows checks for scp/ssh/openssl
- Update docs - Remove unused vars in nodeprep script
This commit is contained in:
Fred Park
Родитель
362546686d
Коммит
0161169daa
|
|
@ -1,6 +1,8 @@
|
|||
# Change Log
|
||||
|
||||
## [Unreleased]
|
||||
### Fixed
|
||||
- Checks that prevented ssh/scp/openssl interaction on Windows
|
||||
|
||||
## [2.6.0rc1] - 2017-04-14
|
||||
### Added
|
||||
|
|
@ -24,7 +26,6 @@ can be configured using the `fault_domains` property. This was lowered from
|
|||
the prior default of 3 due to managed disks and availability set restrictions
|
||||
as some regions do not support 3 fault domains with this combination.
|
||||
- Updated NC-series Tesla driver to 375.51
|
||||
- Removed support for OpenSUSE 13.2 and SLES 12
|
||||
|
||||
### Fixed
|
||||
- Broken Docker installations due to gpgkey changes
|
||||
|
|
@ -33,6 +34,9 @@ as some regions do not support 3 fault domains with this combination.
|
|||
- Allow smbd.service to auto-restart with delay
|
||||
- Data ingress to glusterfs on compute with no remotefs settings
|
||||
|
||||
### Removed
|
||||
- Host support for OpenSUSE 13.2 and SLES 12
|
||||
|
||||
## [2.6.0b3] - 2017-04-03
|
||||
### Added
|
||||
- Created [Azure App Service Site Extension](https://www.siteextensions.net/packages/batch-shipyard).
|
||||
|
|
|
|||
|
|
@ -189,14 +189,6 @@ def adjust_general_settings(config):
|
|||
'found in global configuration. Please update your global '
|
||||
'configuration file. See the configuration doc for more '
|
||||
'information.')
|
||||
# adjust encryption settings on windows
|
||||
if util.on_windows():
|
||||
enc = settings.batch_shipyard_encryption_enabled(config)
|
||||
if enc:
|
||||
logger.warning(
|
||||
'disabling credential encryption due to script being run '
|
||||
'from Windows')
|
||||
settings.set_batch_shipyard_encryption_enabled(config, False)
|
||||
|
||||
|
||||
def populate_global_settings(config, fs_storage):
|
||||
|
|
@ -1369,28 +1361,6 @@ def _adjust_settings_for_pool_creation(config):
|
|||
'cannot create more than one GlusterFS volume per pool')
|
||||
except KeyError:
|
||||
pass
|
||||
# adjust settings on windows
|
||||
if util.on_windows():
|
||||
if pool.ssh.ssh_public_key is None:
|
||||
logger.warning(
|
||||
'disabling ssh user creation due to script being run '
|
||||
'from Windows and no public key is specified')
|
||||
settings.remove_ssh_settings(config)
|
||||
# ensure file transfer settings
|
||||
if pool.transfer_files_on_pool_creation:
|
||||
try:
|
||||
direct = False
|
||||
files = settings.global_resources_files(config)
|
||||
for fdict in files:
|
||||
if settings.is_direct_transfer(fdict):
|
||||
direct = True
|
||||
break
|
||||
if direct:
|
||||
raise RuntimeError(
|
||||
'cannot transfer files directly to compute nodes '
|
||||
'on Windows')
|
||||
except KeyError:
|
||||
pass
|
||||
|
||||
|
||||
def action_fs_disks_add(resource_client, compute_client, config):
|
||||
|
|
|
|||
|
|
@ -539,14 +539,6 @@ def pool_settings(config):
|
|||
)
|
||||
|
||||
|
||||
def remove_ssh_settings(config):
|
||||
# type: (dict) -> None
|
||||
"""Remove ssh settings from pool specification
|
||||
:param dict config: configuration object
|
||||
"""
|
||||
config['pool_specification'].pop('ssh', None)
|
||||
|
||||
|
||||
def set_block_until_all_global_resources_loaded(config, flag):
|
||||
# type: (dict, bool) -> None
|
||||
"""Set block until all global resources setting
|
||||
|
|
|
|||
|
|
@ -288,7 +288,9 @@ programs must be installed to take advantage of data movement features of
|
|||
Batch Shipyard:
|
||||
|
||||
1. An SSH client that provides `ssh` and `scp` (or `ssh.exe` and `scp.exe`
|
||||
on Windows). OpenSSH with
|
||||
on Windows). You can find
|
||||
[OpenSSH binaries for Windows](https://github.com/PowerShell/Win32-OpenSSH/releases)
|
||||
released by the PowerShell team. OpenSSH with
|
||||
[HPN patches](https://www.psc.edu/index.php/using-joomla/extensions/templates/atomic/636-hpn-ssh)
|
||||
can be used on the client side to further accelerate `scp` to Azure Batch
|
||||
compute nodes where `hpn_server_swap` has been set to `true` in the
|
||||
|
|
@ -304,8 +306,11 @@ typically placed in `~/.local/bin`. This path will need to be added to your
|
|||
### Encryption Support
|
||||
Batch Shipyard supports encrypting credentials that are used by backend
|
||||
components within your pool deployment. In order to utilize this feature,
|
||||
you must have `openssl` installed. The `install.sh` script ensures that
|
||||
OpenSSL is installed. The Docker CLI image also contains OpenSSL.
|
||||
you must have `openssl` (or `openssl.exe` on Windows) installed. The
|
||||
`install.sh` script ensures that OpenSSL is installed on Linux. The Docker
|
||||
CLI image also contains OpenSSL. You might be able to find
|
||||
[OpenSSL binaries for Windows](https://wiki.openssl.org/index.php/Binaries)
|
||||
on the OpenSSL wiki.
|
||||
|
||||
Note that all commandlines, environment variables and resource file URLs
|
||||
which are stored by the Azure Batch Service are encrypted by the service.
|
||||
|
|
|
|||
|
|
@ -172,9 +172,8 @@ on how to generate an SSH keypair for use with Batch Shipyard.
|
|||
the compute nodes to expire. The default is 30 days from invocation time.
|
||||
* (optional) `ssh_public_key` is the path to an existing SSH public key to
|
||||
use. If not specified, an RSA public/private keypair will be automatically
|
||||
generated only on Linux. On Windows only, if this is option is not
|
||||
specified, the SSH keys are not auto-generated and the user is not
|
||||
created. This option cannot be specified with `ssh_public_key_data`.
|
||||
generated if `ssh-keygen` or `ssh-keygen.exe` can be found on the `PATH`.
|
||||
This option cannot be specified with `ssh_public_key_data`.
|
||||
* (optional) `ssh_public_key_data` is the raw RSA public key data in OpenSSH
|
||||
format, e.g., a string starting with `ssh-rsa ...`. Only one key may be
|
||||
specified. This option cannot be specified with `ssh_public_key`.
|
||||
|
|
|
|||
|
|
@ -175,7 +175,6 @@ optional in this configuration as it is in the pool specification. If you are
|
|||
running Batch Shipyard on Windows, please refer to
|
||||
[these instructions](85-batch-shipyard-ssh-docker-tunnel.md#ssh-keygen)
|
||||
on how to generate an SSH keypair for use with Batch Shipyard.
|
||||
|
||||
* (required) `username` is the admin user to create on all virtual machines
|
||||
* (optional) `ssh_public_key` is the path to a pre-existing ssh public
|
||||
key to use. If this is not specified, an RSA public/private key pair will
|
||||
|
|
|
|||
|
|
@ -417,17 +417,13 @@ EOF
|
|||
fi
|
||||
# install dependencies for storage cluster mount
|
||||
if [ ! -z $sc_args ]; then
|
||||
nfs_installed=0
|
||||
glusterfs_installed=0
|
||||
for sc_arg in ${sc_args[@]}; do
|
||||
IFS=':' read -ra sc <<< "$sc_arg"
|
||||
server_type=${sc[0]}
|
||||
if [ $server_type == "nfs" ] && [ $nfs_installed -eq 0 ]; then
|
||||
if [ $server_type == "nfs" ]; then
|
||||
apt-get install -y -q --no-install-recommends nfs-common nfs4-acl-tools
|
||||
nfs_installed=1
|
||||
elif [ $server_type == "glusterfs" ] && [ $glusterfs_installed -eq 0 ]; then
|
||||
elif [ $server_type == "glusterfs" ]; then
|
||||
apt-get install -y -q --no-install-recommends glusterfs-client acl
|
||||
glusterfs_installed=1
|
||||
else
|
||||
echo "Unknown file server type ${sc[0]} for ${sc[1]}"
|
||||
exit 1
|
||||
|
|
@ -511,22 +507,18 @@ elif [[ $offer == centos* ]] || [[ $offer == "rhel" ]] || [[ $offer == "oracle-l
|
|||
fi
|
||||
# install dependencies for storage cluster mount
|
||||
if [ ! -z $sc_args ]; then
|
||||
nfs_installed=0
|
||||
glusterfs_installed=0
|
||||
for sc_arg in ${sc_args[@]}; do
|
||||
IFS=':' read -ra sc <<< "$sc_arg"
|
||||
server_type=${sc[0]}
|
||||
if [ $server_type == "nfs" ] && [ $nfs_installed -eq 0 ]; then
|
||||
if [ $server_type == "nfs" ]; then
|
||||
yum install -y nfs-utils nfs4-acl-tools
|
||||
systemctl daemon-reload
|
||||
$rpcbindenable
|
||||
systemctl start rpcbind
|
||||
nfs_installed=1
|
||||
elif [ $server_type == "glusterfs" ] && [ $glusterfs_installed -eq 0 ]; then
|
||||
elif [ $server_type == "glusterfs" ]; then
|
||||
yum install -y epel-release centos-release-gluster38
|
||||
sed -i -e "s/enabled=1/enabled=0/g" /etc/yum.repos.d/CentOS-Gluster-3.8.repo
|
||||
yum install -y --enablerepo=centos-gluster38,epel glusterfs-client acl
|
||||
glusterfs_installed=1
|
||||
else
|
||||
echo "Unknown file server type ${sc[0]} for ${sc[1]}"
|
||||
exit 1
|
||||
|
|
@ -603,22 +595,18 @@ elif [[ $offer == opensuse* ]] || [[ $offer == sles* ]]; then
|
|||
fi
|
||||
# install dependencies for storage cluster mount
|
||||
if [ ! -z $sc_args ]; then
|
||||
nfs_installed=0
|
||||
glusterfs_installed=0
|
||||
for sc_arg in ${sc_args[@]}; do
|
||||
IFS=':' read -ra sc <<< "$sc_arg"
|
||||
server_type=${sc[0]}
|
||||
if [ $server_type == "nfs" ] && [ $nfs_installed -eq 0 ]; then
|
||||
if [ $server_type == "nfs" ]; then
|
||||
zypper -n in nfs-client nfs4-acl-tools
|
||||
systemctl daemon-reload
|
||||
systemctl enable rpcbind
|
||||
systemctl start rpcbind
|
||||
nfs_installed=1
|
||||
elif [ $server_type == "glusterfs" ] && [ $glusterfs_installed -eq 0 ]; then
|
||||
elif [ $server_type == "glusterfs" ]; then
|
||||
zypper addrepo http://download.opensuse.org/repositories/filesystems/$repodir/filesystems.repo
|
||||
zypper -n --gpg-auto-import-keys ref
|
||||
zypper -n in glusterfs acl
|
||||
glusterfs_installed=1
|
||||
else
|
||||
echo "Unknown file server type ${sc[0]} for ${sc[1]}"
|
||||
exit 1
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче