Remove unused environment variables

Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Change-Id: I00414ce17c3ad3b3a3c925f02876b941338c8992

diff --git a/deploy/metal3-vm/lib/common.sh b/deploy/metal3-vm/lib/common.sh
index a767358..cc48dd6 100644 (file)
--- a/deploy/metal3-vm/lib/common.sh
+++ b/deploy/metal3-vm/lib/common.sh
@@ -31,8 +31,6 @@ MANAGE_PRO_BRIDGE=${MANAGE_PRO_BRIDGE:-y}
 MANAGE_INT_BRIDGE=${MANAGE_INT_BRIDGE:-y}
 # Internal interface, to bridge virbr0
 INT_IF=${INT_IF:-}
-#Root disk to deploy coreOS - use /dev/sda on BM
-ROOT_DISK_NAME=${ROOT_DISK_NAME-"/dev/sda"}
 #Container runtime
 CONTAINER_RUNTIME=${CONTAINER_RUNTIME:-"docker"}
 

diff --git a/env/lib/common.sh b/env/lib/common.sh
index c0a1bc9..86332d3 100755 (executable)
--- a/env/lib/common.sh
+++ b/env/lib/common.sh
@@ -1,22 +1,13 @@
 #!/usr/bin/env bash
 set -eu -o pipefail
 
-#supported OS version
-UBUNTU_BIONIC=${UBUNTU_BIONIC:-Ubuntu 18.04.2 LTS}
-
 DOWNLOAD_PATH=${DOWNLOAD_PATH:-/opt/icn}
 
-#set variables
-#Todo include over all variables here
-KUBE_VERSION=${KUBE_VERSION:-"v1.15.0"}
-POD_NETWORK_CIDR=${POD_NETWORK_CIDR:-"10.244.0.0/16"}
-
 #Ironic variables
 IRONIC_IMAGE=${IRONIC_IMAGE:-"integratedcloudnative/ironic:v1.0-icn"}
 IRONIC_INSPECTOR_IMAGE=${IRONIC_INSPECTOR_IMAGE:-"integratedcloudnative/ironic-inspector:v1.0-icn"}
 IRONIC_BAREMETAL_IMAGE=${IRONIC_BAREMETAL_IMAGE:-"integratedcloudnative/baremetal-operator:v2.0-icn"}
 IPA_DOWNLOADER_IMAGE=${IPA_DOWNLOADER_IMAGE:-"integratedcloudnative/ironic-ipa-downloader:v1.0-icn"}
-IRONIC_BAREMETAL_SOCAT_IMAGE=${IRONIC_BAREMETAL_SOCAT_IMAGE:-"alpine/socat:latest"}
 
 IRONIC_DATA_DIR=${IRONIC_DATA_DIR:-"/opt/ironic"}
 #IRONIC_PROVISIONING_INTERFACE is required to be provisioning, don't change it