diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2017-08-10 16:41:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-08-10 16:41:05 +0000 |
| commit | 7c07560d896fb62eb9b5a461a184e8296f299a0f (patch) | |
| tree | ee6fea8ccb8a4bb8b7dfc0d470d8fb77543272e5 | |
| parent | 47a6f470675ef28c5c7d5e9826fe6696fa139d14 (diff) | |
| parent | 2a2d04d8b977d3090f2c57a18c39c770804d97f1 (diff) | |
Merge "Externalize IP_ADDRESS variable"
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/functions | 1 | ||||
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/policy | 1 | ||||
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/portal | 1 | ||||
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/sdc | 1 |
4 files changed, 1 insertions, 3 deletions
diff --git a/bootstrap/vagrant-onap/lib/functions b/bootstrap/vagrant-onap/lib/functions index d0a7d9787..9b903d92a 100755 --- a/bootstrap/vagrant-onap/lib/functions +++ b/bootstrap/vagrant-onap/lib/functions @@ -12,6 +12,7 @@ git_src_folder=/opt # export_env_vars() - Export environment variables function export_env_vars { export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' |sort -n | head -1) + export IP_ADDRESS=$(ifconfig eth0 | grep "inet addr" | tr -s ' ' | cut -d' ' -f3 | cut -d':' -f2) } # configure_dns() - DNS/GW IP address configuration diff --git a/bootstrap/vagrant-onap/lib/policy b/bootstrap/vagrant-onap/lib/policy index b987c4c96..f4dc5fb20 100755 --- a/bootstrap/vagrant-onap/lib/policy +++ b/bootstrap/vagrant-onap/lib/policy @@ -44,7 +44,6 @@ function install_policy { fi pushd $src_folder/docker chmod +x config/drools/drools-tweaks.sh - IP_ADDRESS=$(ifconfig eth0 | grep "inet addr" | tr -s ' ' | cut -d' ' -f3 | cut -d':' -f2) echo $IP_ADDRESS > config/pe/ip_addr.txt install_docker_compose /opt/docker/docker-compose up -d diff --git a/bootstrap/vagrant-onap/lib/portal b/bootstrap/vagrant-onap/lib/portal index 6c8e7d0a9..8bd39b7e9 100755 --- a/bootstrap/vagrant-onap/lib/portal +++ b/bootstrap/vagrant-onap/lib/portal @@ -55,7 +55,6 @@ function install_portal { sleep 180 if [ ! -e /opt/config/boot.txt ]; then - IP_ADDRESS=$(ifconfig eth0 | grep "inet addr" | tr -s ' ' | cut -d' ' -f3 | cut -d':' -f2) install_package mysql-client mysql -u root -p'Aa123456' -h $IP_ADDRESS < Apps_Users_OnBoarding_Script.sql echo "yes" > /opt/config/boot.txt diff --git a/bootstrap/vagrant-onap/lib/sdc b/bootstrap/vagrant-onap/lib/sdc index 626d9d731..d3619f569 100755 --- a/bootstrap/vagrant-onap/lib/sdc +++ b/bootstrap/vagrant-onap/lib/sdc @@ -67,7 +67,6 @@ function compile_all_sdc_repos { # install_sdc() - Function that pull templates and executes function install_sdc { - IP_ADDRESS=$(ifconfig eth0 | grep "inet addr" | tr -s ' ' | cut -d' ' -f3 | cut -d':' -f2) local ENV_NAME=$dmaap_topic local MR_IP_ADDR='10.0.11.1' local RELEASE=$docker_version |