summaryrefslogtreecommitdiffstats
path: root/foreman/ci/deploy.sh
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2015-09-17 22:23:28 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-09-17 22:23:29 +0000
commitf04b553aedbd2c7d72e392ac8f2e4b6d033bb53e (patch)
treec87aea74729b5b0cd87fc2bbb236024dad60f815 /foreman/ci/deploy.sh
parent67bcb6b3596fe99a7ec59aa66593c218c6241355 (diff)
parent7dc718a545c2da1b7bf150bf652705aeb98b245c (diff)
Merge "Corrects the default route on controllers"
Diffstat (limited to 'foreman/ci/deploy.sh')
-rwxr-xr-xforeman/ci/deploy.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/foreman/ci/deploy.sh b/foreman/ci/deploy.sh
index 83d1b81..6fffeca 100755
--- a/foreman/ci/deploy.sh
+++ b/foreman/ci/deploy.sh
@@ -593,6 +593,7 @@ configure_network() {
subnet_mask=$(find_netmask $interface)
if [ "$if_counter" -eq 0 ]; then
admin_subnet_mask=$subnet_mask
+ admin_ip=$new_ip
if ! verify_subnet_size $admin_subnet_mask 5; then
echo "${red} Not enough IPs in admin subnet: ${interface_ip_arr[$if_counter]} ${admin_subnet_mask}. Need at least 5 IPs. Please resize subnet! Exiting ${reset}"
exit 1
@@ -887,6 +888,13 @@ configure_network() {
done <<< "$public_output"
fi
+ ##replace admin_network param for bare metal deployments
+ if [ -z "$virtual" ]; then
+ admin_subnet=$(find_subnet $admin_ip $admin_subnet_mask)
+ sed -i 's/^.*admin_network:.*$/ admin_network:'" $admin_subnet"'/' opnfv_ksgen_settings.yml
+ else
+ sed -i 's/^.*admin_network:.*$/ admin_network:'" \"false\""'/' opnfv_ksgen_settings.yml
+ fi
##replace public_network param
public_subnet=$(find_subnet $next_public_ip $public_subnet_mask)
sed -i 's/^.*public_network:.*$/ public_network:'" $public_subnet"'/' opnfv_ksgen_settings.yml