diff options
author | Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com> | 2016-02-16 20:24:56 +0100 |
---|---|---|
committer | Jörgen Karlsson <jorgen.w.karlsson@ericsson.com> | 2016-02-17 16:51:55 +0000 |
commit | c3666affeae842e3c2d8f9191928f3ae4437bc59 (patch) | |
tree | 00862a0718f455a912eff25e63f27c7dfa49da4e /ci/prepare_env.sh | |
parent | eb018b61e8c50e8ce8431c2af62ec66d90b0595a (diff) |
ci: Freeze pip requirements + cleanups
Freeze pip requirements for brahmaputra release to make sure we
keep track of dependencies.
Fixes internalURL problem with ericsson-virtual1
Add check to verify that nova, glance and heat services are functional
Change-Id: I15c3d215596eaad31f8e260d129b8e07a7d63976
Signed-off-by: Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com>
(cherry picked from commit 3b7c8d522d1ef0950d5c79232e161de05689fe53)
Diffstat (limited to 'ci/prepare_env.sh')
-rwxr-xr-x | ci/prepare_env.sh | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/ci/prepare_env.sh b/ci/prepare_env.sh index a51938c80..31a8e405b 100755 --- a/ci/prepare_env.sh +++ b/ci/prepare_env.sh @@ -13,8 +13,8 @@ : ${INSTALLER_TYPE:='fuel'} : ${INSTALLER_IP:='10.20.0.2'} -: ${NODE_NAME:='opnfv-jump-2'} -: ${EXTERNAL_NETWORK:='net04_ext'} +: ${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' @@ -26,10 +26,19 @@ 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 + fi + fi + source $OPENRC export EXTERNAL_NETWORK INSTALLER_TYPE NODE_NAME |