From d93d2992ff5de7f60c47fd3c31e429e5c06f6bce Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Thu, 28 Apr 2016 18:24:42 -0400 Subject: Standarizing CONFIG and RESOURCES - first stage in standarizing how custom config values are passed in by moving to using ENV vars to pass in custom params - next stage is to remove the -r and -c options in deploy.sh Moving this direction will reduce managment of custom parameters and rely on ENV vars to make the customizations for development Change-Id: Ibbc171d5e6801b27c1b62ca65c2a9f7830483b97 Signed-off-by: Dan Radez --- ci/deploy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ci/deploy.sh') diff --git a/ci/deploy.sh b/ci/deploy.sh index a9a9509e..ebcde335 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -38,8 +38,8 @@ declare -A NET_MAP SSH_OPTIONS=(-o StrictHostKeyChecking=no -o GlobalKnownHostsFile=/dev/null -o UserKnownHostsFile=/dev/null -o LogLevel=error) DEPLOY_OPTIONS="" -RESOURCES=/var/opt/opnfv/images -CONFIG=/var/opt/opnfv +RESOURCES=${RESOURCES:-'/var/opt/opnfv/images'} +CONFIG=${CONFIG:-'/var/opt/opnfv'} OPNFV_NETWORK_TYPES="admin_network private_network public_network storage_network" # Netmap used to map networks to OVS bridge names NET_MAP['admin_network']="br-admin" -- cgit 1.2.3-korg