Merge pull request #22 from jdeathe/issue/12

CLOSES #12: Removes unused variables from Makefile and scmi.

Author: jdeathe

CHANGELOG.md

@@ -20,6 +20,7 @@ CentOS-7 7.5.1804 x86_64 - Redis 4.0.
 - Removes X-Fleet section from etcd register template unit-file.
 - Removes the unused group element from the default container name.
 - Removes the node element from the default container name.
+- Removes unused environment variables from Makefile and scmi configuration.
 
 ### 2.0.1 - 2018-11-19
 

environment.mk

@@ -22,7 +22,6 @@ SYSCTL_NET_IPV4_ROUTE_FLUSH ?= 1
 DOCKER_CONTAINER_OPTS ?=
 DOCKER_IMAGE_TAG ?= latest
 DOCKER_NAME ?= redis.1
-DOCKER_PORT_MAP_TCP_22 ?= NULL
 DOCKER_PORT_MAP_TCP_6379 ?= 6379
 DOCKER_PORT_MAP_UDP_6379 ?= NULL
 DOCKER_RESTART_POLICY ?= always
@@ -39,20 +38,6 @@ STARTUP_TIME ?= 2
 # ------------------------------------------------------------------------------
 # Application container configuration
 # ------------------------------------------------------------------------------
-SSH_AUTHORIZED_KEYS ?=
-SSH_AUTOSTART_SSHD ?= false
-SSH_AUTOSTART_SSHD_BOOTSTRAP ?= false
-SSH_CHROOT_DIRECTORY ?= %h
-SSH_INHERIT_ENVIRONMENT ?= false
-SSH_SUDO ?= ALL=(ALL) ALL
-SSH_USER ?= app-admin
-SSH_USER_FORCE_SFTP ?= false
-SSH_USER_HOME ?= /home/%u
-SSH_USER_ID ?= 500:500
-SSH_USER_PASSWORD ?=
-SSH_USER_PASSWORD_HASHED ?= false
-SSH_USER_SHELL ?= /bin/bash
-# ------------------------------------------------------------------------------
 REDIS_AUTOSTART_REDIS_BOOTSTRAP ?= true
 REDIS_AUTOSTART_REDIS_WRAPPER ?= true
 REDIS_MAXMEMORY ?= 64mb

src/opt/scmi/environment.sh

@@ -16,7 +16,6 @@ readonly DOCKER_IMAGE_RELEASE_TAG_PATTERN='^(1|2|centos-(6-1|7-2))\.[0-9]+\.[0-9
 DOCKER_CONTAINER_OPTS="${DOCKER_CONTAINER_OPTS:-}"
 DOCKER_IMAGE_TAG="${DOCKER_IMAGE_TAG:-latest}"
 DOCKER_NAME="${DOCKER_NAME:-redis.1}"
-DOCKER_PORT_MAP_TCP_22="${DOCKER_PORT_MAP_TCP_22:-NULL}"
 DOCKER_PORT_MAP_TCP_6379="${DOCKER_PORT_MAP_TCP_6379:-6379}"
 DOCKER_PORT_MAP_UDP_6379="${DOCKER_PORT_MAP_UDP_6379:-NULL}"
 DOCKER_RESTART_POLICY="${DOCKER_RESTART_POLICY:-always}"
@@ -43,20 +42,6 @@ REGISTER_UPDATE_INTERVAL="${REGISTER_UPDATE_INTERVAL:-55}"
 # ------------------------------------------------------------------------------
 # Application container configuration
 # ------------------------------------------------------------------------------
-SSH_AUTHORIZED_KEYS="${SSH_AUTHORIZED_KEYS:-}"
-SSH_AUTOSTART_SSHD="${SSH_AUTOSTART_SSHD:-true}"
-SSH_AUTOSTART_SSHD_BOOTSTRAP="${SSH_AUTOSTART_SSHD_BOOTSTRAP:-true}"
-SSH_CHROOT_DIRECTORY="${SSH_CHROOT_DIRECTORY:-%h}"
-SSH_INHERIT_ENVIRONMENT="${SSH_INHERIT_ENVIRONMENT:-false}"
-SSH_SUDO="${SSH_SUDO:-ALL=(ALL) ALL}"
-SSH_USER="${SSH_USER:-app-admin}"
-SSH_USER_FORCE_SFTP="${SSH_USER_FORCE_SFTP:-false}"
-SSH_USER_HOME="${SSH_USER_HOME:-/home/%u}"
-SSH_USER_ID="${SSH_USER_ID:-500:500}"
-SSH_USER_PASSWORD="${SSH_USER_PASSWORD:-}"
-SSH_USER_PASSWORD_HASHED="${SSH_USER_PASSWORD_HASHED:-false}"
-SSH_USER_SHELL="${SSH_USER_SHELL:-/bin/bash}"
-# ------------------------------------------------------------------------------
 REDIS_AUTOSTART_REDIS_BOOTSTRAP="${REDIS_AUTOSTART_REDIS_BOOTSTRAP:-true}"
 REDIS_AUTOSTART_REDIS_WRAPPER="${REDIS_AUTOSTART_REDIS_WRAPPER:-true}"
 REDIS_MAXMEMORY="${REDIS_MAXMEMORY:-64mb}"

test/shpec/operation_shpec.sh

@@ -3,7 +3,6 @@ readonly TEST_DIRECTORY="test"
 
 # These should ideally be a static value but hosts might be using this port so 
 # need to allow for alternatives.
-DOCKER_PORT_MAP_TCP_22="${DOCKER_PORT_MAP_TCP_22:-NULL}"
 DOCKER_PORT_MAP_TCP_6379="${DOCKER_PORT_MAP_TCP_6379:-6379}"
 
 function __destroy ()