X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=foreman%2Fci%2Fdeploy.sh;h=6fffeca7d80b7d5d5afb2ac595586905b82cc109;hb=27369695b4503ae4f3b17c7b0785d2490bd83298;hp=83d1b817ddd356aebac56a625e2eb7e00927e064;hpb=c7dbe0fad10db9fe178ce18bbe501f8e678285a2;p=genesis.git

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