diff options
| author |   Nate Potter <nathaniel.potteR@intel.com> | 2018-01-17 09:29:35 -0800 |
|---|---|---|
| committer | Nate Potter <nathaniel.potteR@intel.com> | 2018-01-18 06:01:07 -0800 |
| commit | fdf88f32579d606cd82deadd3c89fac77b6aa472 (patch) | |
| tree | ae120553c8eaf915e0383f194e2ec233a6c2b968 /bootstrap/vagrant-onap/lib | |
| parent | 65759ac8168e02a91bdb1fa9de9b297feb61f362 (diff) | |
Add kolla internal vip to no_proxy
The internal vip value is calculated at deploy time when
bringing up the OpenStack VM, and isn't able to be included
in the proxy values in the Vagrantfile. Because of this, we
need to add it to no_proxy after it's calculated so that users
and other services can access it in a proxy environment.
Signed-off-by: Nathaniel Potter <nathaniel.potter@intel.com>
Issue-ID: INT-383
Change-Id: Ifed792a4f7e6f4f5a227848486e8165be4a30fc7
Diffstat (limited to 'bootstrap/vagrant-onap/lib')
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/functions | 14 | ||||
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/openstack | 4 |
2 files changed, 18 insertions, 0 deletions
diff --git a/bootstrap/vagrant-onap/lib/functions b/bootstrap/vagrant-onap/lib/functions index c2c6d76a5..47966f1b2 100755 --- a/bootstrap/vagrant-onap/lib/functions +++ b/bootstrap/vagrant-onap/lib/functions @@ -382,3 +382,17 @@ EOF mount ${dev_name}1 $mount_dir echo "${dev_name}1 $mount_dir ext4 errors=remount-ro,noatime,barrier=0 0 1" >> /etc/fstab } + +# add no_proxy values to environment, used for internal IPs generated at deploy time +function add_no_proxy_value { + if [[ `grep "no_proxy" /etc/environment` ]]; then + sed -i.bak "s/^no_proxy.*$/&,$1/" /etc/environment + else + echo "no_proxy=$1" >> /etc/environment + fi + if [[ `grep "NO_PROXY" /etc/environment` ]]; then + sed -i.bak "s/^NO_PROXY.*$/&,$1/" /etc/environment + else + echo "NO_PROXY=$1" >> /etc/environment + fi +} diff --git a/bootstrap/vagrant-onap/lib/openstack b/bootstrap/vagrant-onap/lib/openstack index 205d7ae80..5e5189086 100755 --- a/bootstrap/vagrant-onap/lib/openstack +++ b/bootstrap/vagrant-onap/lib/openstack @@ -32,6 +32,10 @@ function configure_deploy { ip_address=$(ip route get $network_id | awk '{ print $6; exit }') internal_vip_address=$(get_next_ip $ip_address) + if [[ `env | grep -i "proxy"` ]]; then + add_no_proxy_value $internal_vip_address + fi + mkdir -p $kolla_config cp /var/onap/files/globals.yml $kolla_globals cp /var/onap/files/passwords.yml $kolla_passwords |