diff options
| author |   Jonas Bjurel <jonas.bjurel@ericsson.com> | 2016-03-22 20:27:13 +0100 |
|---|---|---|
| committer |   Ana Cunha <ana.cunha@ericsson.com> | 2016-04-26 12:43:58 +0000 |
| commit | 7175303a7e140c45fa64263aee7d3834aa8319db (patch) | |
| tree | 145c11e6c95f4d0758163565a7d75f4f5cdbd41d | |
| parent | b99dd26ea6a9abae5f226a1141213050efd16e78 (diff) | |
Introduction of a new environment variable indicating a virtual environment
This patch introduces a new environment variable: DEPLOY_TYPE [bm | virt],
indicating if the opnfv stack is deployed bare-metal or virtualized.
This can be used for several purposes, but in this patch it is used
to tell "fetch_os_creds.sh" wheather it is a BM or virt deployment.
Also see: https://gerrit.opnfv.org/gerrit/#/c/11541/
NOT VERIFIED
CAN MERGE AS SOON AS VERIFIED
Change-Id: I2d4385dc9a2786ce51e44081967a77736276696e
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
| -rwxr-xr-x | ci/prepare_env.sh | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/ci/prepare_env.sh b/ci/prepare_env.sh index 31a8e405b..8f9f58087 100755 --- a/ci/prepare_env.sh +++ b/ci/prepare_env.sh @@ -12,10 +12,12 @@ : ${INSTALLER_TYPE:='fuel'} : ${INSTALLER_IP:='10.20.0.2'} +: ${DEPLOY_TYPE:='bm'} # Can be any of 'bm' (Bare Metal) or 'virt' (Virtual) : ${NODE_NAME:='unknown'} : ${EXTERNAL_NETWORK:='admin_floating_net'} + # Extract network name from EXTERNAL_NETWORK # e.g. EXTERNAL_NETWORK='ext-net;flat;192.168.0.2;192.168.0.253;192.168.0.1;192.168.0.0/24' export EXTERNAL_NETWORK=$(echo $EXTERNAL_NETWORK | cut -f1 -d \;) @@ -26,19 +28,16 @@ echo "INFO: Creating openstack credentials .." # Create openstack credentials OPENRC=/home/opnfv/openrc if [ ! -f $OPENRC ]; then - - $RELENG_REPO_DIR/utils/fetch_os_creds.sh \ - -d $OPENRC \ - -i ${INSTALLER_TYPE} -a ${INSTALLER_IP} - - # Fuel virtual need a fix - if [ "$NODE_NAME" == "ericsson-virtual1" ]; then - echo "INFO: Changing: internalURL -> publicURL in openrc" - sed -i 's/internalURL/publicURL/' $OPENRC + if [ "$DEPLOY_TYPE" == "virt" ]; then + FETCH_CRED_ARG="-v -d $OPENRC -i ${INSTALLER_TYPE} -a ${INSTALLER_IP}" + else + FETCH_CRED_ARG="-d $OPENRC -i ${INSTALLER_TYPE} -a ${INSTALLER_IP}" fi + $RELENG_REPO_DIR/utils/fetch_os_creds.sh $FETCH_CRED_ARG + fi source $OPENRC -export EXTERNAL_NETWORK INSTALLER_TYPE NODE_NAME +export EXTERNAL_NETWORK INSTALLER_TYPE DEPLOY_TYPE NODE_NAME |