diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-04-28 18:24:42 -0400 |
|---|---|---|
| committer | Dan Radez <dradez@redhat.com> | 2016-04-28 18:24:42 -0400 |
| commit | d93d2992ff5de7f60c47fd3c31e429e5c06f6bce (patch) | |
| tree | f8740e8883134db10b272f586f84c4861296d128 | |
| parent | 40d7cd35fd1106235459ac872db1be5a158b3a5e (diff) | |
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 <dradez@redhat.com>
| -rwxr-xr-x | ci/clean.sh | 2 | ||||
| -rwxr-xr-x | ci/deploy.sh | 4 | ||||
| -rw-r--r-- | ci/util.sh | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ci/clean.sh b/ci/clean.sh index dc76f323..42090069 100755 --- a/ci/clean.sh +++ b/ci/clean.sh @@ -13,7 +13,7 @@ #author: Tim Rozet (trozet@redhat.com) # Use default if no param passed -CONFIG=${1-"/var/opt/opnfv"} +CONFIG=${CONFIG:-'/var/opt/opnfv'} ##LIBRARIES source $CONFIG/lib/common-functions.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" @@ -2,7 +2,7 @@ # Utility script used to interact with a deployment # @author Tim Rozet (trozet@redhat.com) -CONFIG=/var/opt/opnfv +CONFIG=${CONFIG:-'/var/opt/opnfv'} VALID_CMDS="undercloud debug-stack -h --help" source $CONFIG/utility-functions.sh @@ -72,4 +72,4 @@ main() { parse_cmdline "$@" } -main "$@"
\ No newline at end of file +main "$@" |