diff options
Diffstat (limited to 'fuel/build/f_isoroot/f_kscfg/ks.cfg.orig')
| -rw-r--r-- | fuel/build/f_isoroot/f_kscfg/ks.cfg.orig | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/fuel/build/f_isoroot/f_kscfg/ks.cfg.orig b/fuel/build/f_isoroot/f_kscfg/ks.cfg.orig index cf8cf80d1..c284d813a 100644 --- a/fuel/build/f_isoroot/f_kscfg/ks.cfg.orig +++ b/fuel/build/f_isoroot/f_kscfg/ks.cfg.orig @@ -251,8 +251,9 @@ daemonize dhcp docker-io fuel-bootstrap-image +fuel-bootstrap-image-builder fuel-createmirror -fuel-target-centos-images +fuel-target-centos-images6.6 fuel-package-updates fuelmenu fuel-docker-images @@ -328,7 +329,7 @@ esac set -x function save_cfg { - scrFile="/etc/sysconfig/network-scripts/ifcfg-$device" + scrFile="/etc/sysconfig/network-scripts/ifcfg-$admin_interface" search="domain $domain\nsearch $domain" sed -i -e 's#^\(HOSTNAME=\).*$#\1'"$hostname"'#' /etc/sysconfig/network grep -q "^\s*$ip\s+$hostname" /etc/hosts || echo "$ip $hostname" >> /etc/hosts @@ -338,7 +339,7 @@ function save_cfg { [ $dns2 ] && echo "nameserver $dns2" >> /etc/resolv.conf [ $dns2 ] && echo "nameserver $dns2" >> /etc/dnsmasq.upstream - echo DEVICE=$device > $scrFile + echo DEVICE=$admin_interface > $scrFile echo ONBOOT=yes >> $scrFile echo NM_CONTROLLED=no >> $scrFile echo HWADDR=$hwaddr >> $scrFile @@ -353,7 +354,7 @@ function save_cfg { fi scrDHCPFile="/etc/sysconfig/network-scripts/ifcfg-$dhcp_interface" #Ignore gateway and set up DHCP if it is used, otherwise apply it - if [ $dhcp_interface ] && [ "$dhcp_interface" != "$device" ]; then + if [ $dhcp_interface ] && [ "$dhcp_interface" != "$admin_interface" ]; then echo "DEVICE=$dhcp_interface" > $scrDHCPFile echo "BOOTPROTO=dhcp" >> $scrDHCPFile echo "ONBOOT=yes" >> $scrDHCPFile @@ -373,10 +374,11 @@ domain=${hostname#*.} ip=$ip netmask=$netmask gw=$gw -device="eth0" -hwaddr=`ifconfig $device | grep -i hwaddr | sed -e 's#^.*hwaddr[[:space:]]*##I'` +admin_interface=${admin_interface:-"eth0"} +hwaddr=`ifconfig $admin_interface | grep -i hwaddr | sed -e 's#^.*hwaddr[[:space:]]*##I'` dhcp_interface=$dhcp_interface build_images=$build_images +wait_for_external_config=$wait_for_external_config save_cfg # Mounting installation source @@ -484,7 +486,7 @@ on master node and change default repository settings: * Ubuntu: fuel-createmirror (see --help for options) Please refer to the following guide for more information: -https://docs.mirantis.com/openstack/fuel/fuel-6.1/reference-architecture.html#fuel-rep-mirror +https://docs.mirantis.com/openstack/fuel/fuel-7.0/reference-architecture.html#fuel-rep-mirror EOF @@ -506,12 +508,20 @@ cp ${SOURCE}/version.yaml /etc/fuel/release_versions/`cat ${SOURCE}/openstack_v # Generete Fuel UUID uuidgen > /etc/fuel/fuel-uuid -###Run fuel menu +# Run fuel menu [ -z "$showmenu" ] && showmenu="no" -cat > /root/.showfuelmenu << EOF + +# Pause during bootstrap_admin_node to wait for external config +[ -z "$wait_for_external_config" ] && wait_for_external_config="no" + + +# Prepare bootstrap_admin_node config +cat > /etc/fuel/bootstrap_admin_node.conf << EOF #Set to yes to run Fuel Setup #Set to no to accept default settings -showmenu=$showmenu +ADMIN_INTERFACE=${admin_interface} +showmenu=${showmenu} +wait_for_external_config=${wait_for_external_config} EOF # Prepare custom /etc/issue logon banner and script for changing IP in it @@ -522,7 +532,7 @@ cat > /etc/issue << EOF Server is running on \m platform Fuel UI is available on: -http://:8000 +https://:8443 Default administrator login: root Default administrator password: r00tme @@ -539,17 +549,17 @@ cat >> '/etc/rc.local' << EOF first=yes for ip in \$(ip -o -4 addr | grep "eth." | awk '{print \$4 }' | cut -d/ -f1); do if [ "\$first" = "yes" ]; then - ipstr="Fuel UI is available on: http://\$ip:8000" + ipstr="Fuel UI is available on: https://\$ip:8443" first=no else - ipstr=\$(printf "%s\n%25s%s" "\$ipstr" " " "http://\$ip:8000") + ipstr=\$(printf "%s\n%25s%s" "\$ipstr" " " "https://\$ip:8443") fi done tmpissue=\$(mktemp) while read -r line; do if [[ "\$line" =~ "Fuel UI is available on" ]]; then echo -e "\$ipstr" >> \$tmpissue - elif [[ "\$line" =~ :8000$ ]]; then + elif [[ "\$line" =~ :8443$ ]]; then : else echo -e "\$line" >> \$tmpissue |