aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorMichal Skalski <mskalski@mirantis.com>2016-02-02 16:53:21 +0100
committerMichal Skalski <mskalski@mirantis.com>2016-02-03 02:25:56 +0100
commitc228fa041fe2402f53a6e2af3fbb1721fbdcd11a (patch)
tree16f672990bae779f15b1926e49230168afd89a78 /build
parentdfecc5ca877e322b7a766eb4e22ea27ff76a1ddc (diff)
Sync with upstream repository
Revert to default Fuel partition schema which is now based on percentage usage. Change-Id: I04884dc0e33f8fc7198334db1cb1f7364669b22c Signed-off-by: Michal Skalski <mskalski@mirantis.com>
Diffstat (limited to 'build')
-rw-r--r--build/f_isoroot/f_isolinux/isolinux.cfg2
-rw-r--r--build/f_isoroot/f_isolinux/isolinux.cfg.orig2
-rw-r--r--build/f_isoroot/f_kscfg/ks.cfg12
-rwxr-xr-x[-rw-r--r--]build/f_isoroot/f_kscfg/ks.cfg.orig12
4 files changed, 14 insertions, 14 deletions
diff --git a/build/f_isoroot/f_isolinux/isolinux.cfg b/build/f_isoroot/f_isolinux/isolinux.cfg
index 0948c95ac..3e100134d 100644
--- a/build/f_isoroot/f_isolinux/isolinux.cfg
+++ b/build/f_isoroot/f_isolinux/isolinux.cfg
@@ -29,4 +29,4 @@ label nailgunifname
label usbboot
menu label ^3. USB Fuel Install (Static IP)
kernel vmlinuz
- append initrd=initrd.img biosdevname=0 repo=hd:LABEL=OpenStack_Fuel:/ ks=hd:LABEL=OpenStack_Fuel:/ks.cfg ip=10.20.0.2 gw=10.20.0.1 dns1=10.20.0.1 netmask=255.255.255.0 hostname=fuel.domain.tld showmenu=yes
+ append initrd=initrd.img net.ifnames=0 biosdevname=0 repo=hd:LABEL=OpenStack_Fuel:/ ks=hd:LABEL=OpenStack_Fuel:/ks.cfg ip=10.20.0.2::10.20.0.1:255.255.255.0:fuel.domain.tld:eth0:off::: dns1=10.20.0.1 showmenu=yes
diff --git a/build/f_isoroot/f_isolinux/isolinux.cfg.orig b/build/f_isoroot/f_isolinux/isolinux.cfg.orig
index 2b3e7e307..c92ddd891 100644
--- a/build/f_isoroot/f_isolinux/isolinux.cfg.orig
+++ b/build/f_isoroot/f_isolinux/isolinux.cfg.orig
@@ -29,4 +29,4 @@ label nailgunifname
label usbboot
menu label ^3. USB Fuel Install (Static IP)
kernel vmlinuz
- append initrd=initrd.img biosdevname=0 repo=hd:LABEL=OpenStack_Fuel:/ ks=hd:LABEL=OpenStack_Fuel:/ks.cfg ip=10.20.0.2 gw=10.20.0.1 dns1=10.20.0.1 netmask=255.255.255.0 hostname=fuel.domain.tld showmenu=yes
+ append initrd=initrd.img net.ifnames=0 biosdevname=0 repo=hd:LABEL=OpenStack_Fuel:/ ks=hd:LABEL=OpenStack_Fuel:/ks.cfg ip=10.20.0.2::10.20.0.1:255.255.255.0:fuel.domain.tld:eth0:off::: dns1=10.20.0.1 showmenu=yes
diff --git a/build/f_isoroot/f_kscfg/ks.cfg b/build/f_isoroot/f_kscfg/ks.cfg
index 12cb2cd71..c93babed7 100644
--- a/build/f_isoroot/f_kscfg/ks.cfg
+++ b/build/f_isoroot/f_kscfg/ks.cfg
@@ -221,9 +221,9 @@ if [ "$format_confirmed" != "yes" ] ; then
chvt 1
fi
-# verify tgtdrive is at least 41GB
+# verify tgtdrive is at least 45GB
tgtdrivesize=$(( $(cat "/sys/class/block/${tgtdrive}/size") / 2 / 1024 ))
-if [ $tgtdrivesize -lt 41984 ]; then
+if [ $tgtdrivesize -lt 46080 ]; then
exec < /dev/tty3 > /dev/tty3 2>&1
chvt 3
clear
@@ -231,7 +231,7 @@ if [ $tgtdrivesize -lt 41984 ]; then
echo '********************************************************************'
echo '* E R R O R *'
echo '* *'
- echo '* Your disk is under 41GB in size. Installation cannot continue. *'
+ echo '* Your disk is under 45GB in size. Installation cannot continue. *'
echo '* Restart installation with a larger disk. *'
echo '* *'
echo '********************************************************************'
@@ -277,14 +277,14 @@ fi
cat << EOF > /tmp/partition.ks
part /boot --onpart=/dev/${bootdev}3
part /boot/efi --onpart=/dev/${bootdev}2
-part pv.001 --ondisk=${tgtdrive} --size=1 --grow
+part pv.001 --ondisk=${tgtdrive} --size=25000 --grow
part pv.002 --ondisk=${tgtdrive} --size=20000
volgroup os pv.001
volgroup docker pv.002
logvol swap --vgname=os --recommended --name=swap
logvol / --vgname=os --size=10000 --name=root --fstype=ext4
-logvol /var --vgname=os --size=15000 --name=var --fstype=ext4
-logvol /var/log --vgname=os --size=4000 --grow --name=varlog --fstype=ext4
+logvol /var --vgname=os --grow --percent 40 --name=var --fstype=ext4
+logvol /var/log --vgname=os --grow --percent 60 --name=varlog --fstype=ext4
EOF
diff --git a/build/f_isoroot/f_kscfg/ks.cfg.orig b/build/f_isoroot/f_kscfg/ks.cfg.orig
index 54aabf003..f8a43daa0 100644..100755
--- a/build/f_isoroot/f_kscfg/ks.cfg.orig
+++ b/build/f_isoroot/f_kscfg/ks.cfg.orig
@@ -221,9 +221,9 @@ if [ "$format_confirmed" != "yes" ] ; then
chvt 1
fi
-# verify tgtdrive is at least 41GB
+# verify tgtdrive is at least 45GB
tgtdrivesize=$(( $(cat "/sys/class/block/${tgtdrive}/size") / 2 / 1024 ))
-if [ $tgtdrivesize -lt 41984 ]; then
+if [ $tgtdrivesize -lt 46080 ]; then
exec < /dev/tty3 > /dev/tty3 2>&1
chvt 3
clear
@@ -231,7 +231,7 @@ if [ $tgtdrivesize -lt 41984 ]; then
echo '********************************************************************'
echo '* E R R O R *'
echo '* *'
- echo '* Your disk is under 41GB in size. Installation cannot continue. *'
+ echo '* Your disk is under 45GB in size. Installation cannot continue. *'
echo '* Restart installation with a larger disk. *'
echo '* *'
echo '********************************************************************'
@@ -277,14 +277,14 @@ fi
cat << EOF > /tmp/partition.ks
part /boot --onpart=/dev/${bootdev}3
part /boot/efi --onpart=/dev/${bootdev}2
-part pv.001 --ondisk=${tgtdrive} --size=1 --grow
+part pv.001 --ondisk=${tgtdrive} --size=25000 --grow
part pv.002 --ondisk=${tgtdrive} --size=20000
volgroup os pv.001
volgroup docker pv.002
logvol swap --vgname=os --recommended --name=swap
logvol / --vgname=os --size=10000 --name=root --fstype=ext4
-logvol /var --vgname=os --size=10000 --name=var --fstype=ext4
-logvol /var/log --vgname=os --size=4000 --grow --name=varlog --fstype=ext4
+logvol /var --vgname=os --grow --percent 40 --name=var --fstype=ext4
+logvol /var/log --vgname=os --grow --percent 60 --name=varlog --fstype=ext4
EOF