X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=env%2Flib%2Fcommon.sh;h=52d4f616f92523411c498838a7179f377681dbec;hb=330beeba6da6f89791d68f5dcfa76f2e7e110b24;hp=09b548e5c9f05807fcdf1e69620d7e4463d10413;hpb=c3b53a32784bfcb07e6d5dbe84b1b365ff691a4a;p=icn.git diff --git a/env/lib/common.sh b/env/lib/common.sh index 09b548e..52d4f61 100755 --- a/env/lib/common.sh +++ b/env/lib/common.sh @@ -1,9 +1,5 @@ #!/bin/bash -ICNDIR="$(dirname "$(dirname "$PWD")")" -echo $ICNDIR -source $ICNDIR/user_config.sh - #supported OS version UBUNTU_BIONIC=${UBUNTU_BIONIC:-Ubuntu 18.04.2 LTS} @@ -25,6 +21,10 @@ BS_DHCP_INTERFACE=${BS_DHCP_INTERFACE:-} BS_DHCP_INTERFACE_IP=${BS_DHCP_INTERFACE_IP:-} BS_DHCP_DIR=${BS_DHCP_DIR:-$DOWNLOAD_PATH/dhcp} +#User Provider Network configuration +PROVIDER_NETWORK_GATEWAY=${PROVIDER_NETWORK_GATEWAY:-} +PROVIDER_NETWORK_DNS=${PROVIDER_NETWORK_DNS:-} + #Ironic variables IRONIC_IMAGE=${IRONIC_IMAGE:-"quay.io/metal3-io/ironic:master"} IRONIC_INSPECTOR_IMAGE=${IRONIC_INSPECTOR_IMAGE:-"quay.io/metal3-io/ironic-inspector"}