summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTao Liu <tao.liu@windriver.com>2019-01-31 08:45:01 -0600
committerTao Liu <tao.liu@windriver.com>2019-02-06 16:04:07 -0600
commit5a44b5be490d3a3db567a13f58fccb3e82247680 (patch)
tree444c51005c8116b43c19e6a2fcffd5ac5596b0c8
parent0760eb2c4dc2971d1eb769860b1dbafa3f7c754b (diff)
Configurable Host HTTP/HTTPS Port Binding
Update pxeboot-update script to accept parameter for installer base URL Add a common function to parse the port number from inst.repo Update pxeboot and kickstart URLs to support a configurable HTTP port Story: 2004642 Task: 28593 Depends-On: https://review.openstack.org/#/c/634237/ Change-Id: Ibd66e89e49794ca57b938eb43d227860eda6674a Signed-off-by: Tao Liu <tao.liu@windriver.com>
Notes
Notes (review): Code-Review+2: John Kung <john.kung@windriver.com> Code-Review+2: Eric MacDonald <eric.macdonald@windriver.com> Workflow+1: Eric MacDonald <eric.macdonald@windriver.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 07 Feb 2019 19:26:14 +0000 Reviewed-on: https://review.openstack.org/634255 Project: openstack/stx-metal Branch: refs/heads/master
-rw-r--r--bsp-files/kickstarts/functions.sh5
-rw-r--r--bsp-files/kickstarts/post_common.cfg6
-rwxr-xr-xbsp-files/kickstarts/post_net_common.cfg19
-rw-r--r--bsp-files/kickstarts/post_net_controller.cfg7
-rw-r--r--bsp-files/kickstarts/post_platform_conf_storage.cfg3
-rw-r--r--bsp-files/kickstarts/post_platform_conf_worker.cfg3
-rw-r--r--bsp-files/kickstarts/post_platform_conf_worker_lowlatency.cfg3
-rw-r--r--bsp-files/kickstarts/post_pxeboot_controller.cfg4
-rw-r--r--bsp-files/kickstarts/post_usb_controller.cfg4
-rw-r--r--bsp-files/kickstarts/post_yow_controller.cfg4
-rw-r--r--installer/pxe-network-installer/centos/build_srpm.data2
-rw-r--r--installer/pxe-network-installer/pxe-network-installer/centos-pxe-controller-install2
-rw-r--r--installer/pxe-network-installer/pxe-network-installer/centos-pxe-smallsystem-install2
-rw-r--r--installer/pxe-network-installer/pxe-network-installer/centos-pxe-smallsystem_lowlatency-install2
-rw-r--r--installer/pxe-network-installer/pxe-network-installer/centos-pxe-storage-install2
-rw-r--r--installer/pxe-network-installer/pxe-network-installer/centos-pxe-worker-install2
-rw-r--r--installer/pxe-network-installer/pxe-network-installer/centos-pxe-worker_lowlatency-install2
-rwxr-xr-xinstaller/pxe-network-installer/pxe-network-installer/efi-centos-pxe-controller-install2
-rwxr-xr-xinstaller/pxe-network-installer/pxe-network-installer/efi-centos-pxe-smallsystem-install2
-rwxr-xr-xinstaller/pxe-network-installer/pxe-network-installer/efi-centos-pxe-smallsystem_lowlatency-install2
-rwxr-xr-xinstaller/pxe-network-installer/pxe-network-installer/efi-centos-pxe-storage-install2
-rwxr-xr-xinstaller/pxe-network-installer/pxe-network-installer/efi-centos-pxe-worker-install2
-rwxr-xr-xinstaller/pxe-network-installer/pxe-network-installer/efi-centos-pxe-worker_lowlatency-install2
-rwxr-xr-xinstaller/pxe-network-installer/pxe-network-installer/pxeboot-update.sh11
-rw-r--r--kickstart/centos/build_srpm.data2
25 files changed, 70 insertions, 27 deletions
diff --git a/bsp-files/kickstarts/functions.sh b/bsp-files/kickstarts/functions.sh
index 41b48f6..0dbdfa1 100644
--- a/bsp-files/kickstarts/functions.sh
+++ b/bsp-files/kickstarts/functions.sh
@@ -68,5 +68,10 @@ EOF
68 exit 1 68 exit 1
69} 69}
70 70
71function get_http_port()
72{
73 echo \$(cat /proc/cmdline |xargs -n1 echo |grep '^inst.repo=' | sed -r 's#^[^/]*://[^/]*:([0-9]*)/.*#\1#')
74}
75
71END_FUNCTIONS 76END_FUNCTIONS
72 77
diff --git a/bsp-files/kickstarts/post_common.cfg b/bsp-files/kickstarts/post_common.cfg
index fa5ebe3..1e179bc 100644
--- a/bsp-files/kickstarts/post_common.cfg
+++ b/bsp-files/kickstarts/post_common.cfg
@@ -30,16 +30,16 @@ else
30 systemctl disable auditd 30 systemctl disable auditd
31fi 31fi
32 32
33 33. /etc/platform/platform.conf
34# Configure smart package manager channels 34# Configure smart package manager channels
35rm -rf /var/lib/smart 35rm -rf /var/lib/smart
36mkdir /var/lib/smart 36mkdir /var/lib/smart
37/usr/bin/smart channel -y \ 37/usr/bin/smart channel -y \
38 --add rpmdb type=rpm-sys name="RPM Database" 38 --add rpmdb type=rpm-sys name="RPM Database"
39/usr/bin/smart channel -y \ 39/usr/bin/smart channel -y \
40 --add base type=rpm-md name="Base" baseurl=http://controller/feed/rel-xxxPLATFORM_RELEASExxx 40 --add base type=rpm-md name="Base" baseurl=http://controller:${http_port:-8080}/feed/rel-xxxPLATFORM_RELEASExxx
41/usr/bin/smart channel -y \ 41/usr/bin/smart channel -y \
42 --add updates type=rpm-md name="Patches" baseurl=http://controller/updates/rel-xxxPLATFORM_RELEASExxx 42 --add updates type=rpm-md name="Patches" baseurl=http://controller:${http_port:-8080}/updates/rel-xxxPLATFORM_RELEASExxx
43 43
44# Configure smart to use rpm --nolinktos option 44# Configure smart to use rpm --nolinktos option
45/usr/bin/smart config --set rpm-nolinktos=true 45/usr/bin/smart config --set rpm-nolinktos=true
diff --git a/bsp-files/kickstarts/post_net_common.cfg b/bsp-files/kickstarts/post_net_common.cfg
index 2db90a4..29b7212 100755
--- a/bsp-files/kickstarts/post_net_common.cfg
+++ b/bsp-files/kickstarts/post_net_common.cfg
@@ -1,11 +1,26 @@
1repo --name=base --baseurl=http://pxecontroller/feed/rel-xxxPLATFORM_RELEASExxx/ 1%pre --erroronfail
2repo --name=updates --baseurl=http://pxecontroller/updates/rel-xxxPLATFORM_RELEASExxx/ 2
3# Source common functions
4. /tmp/ks-functions.sh
5
6http_port=$(get_http_port)
7echo "repo --name=base --baseurl=http://pxecontroller:${http_port:-8080}/feed/rel-xxxPLATFORM_RELEASExxx/" > /tmp/repo-include
8echo "repo --name=updates --baseurl=http://pxecontroller:${http_port:-8080}/updates/rel-xxxPLATFORM_RELEASExxx/" > /tmp/repo-include
9
10%end
11
12# Repository arguments from %pre
13%include /tmp/repo-include
14
3 15
4%post --erroronfail 16%post --erroronfail
5 17
6# Source common functions 18# Source common functions
7. /tmp/ks-functions.sh 19. /tmp/ks-functions.sh
8 20
21# Persist the http port to the platform configuration
22echo http_port=$(get_http_port) >> /etc/platform/platform.conf
23
9# Obtain the boot interface from the PXE boot 24# Obtain the boot interface from the PXE boot
10BOOTIF=`cat /proc/cmdline |xargs -n1 echo |grep BOOTIF=` 25BOOTIF=`cat /proc/cmdline |xargs -n1 echo |grep BOOTIF=`
11if [ -d /sys/firmware/efi ] ; then 26if [ -d /sys/firmware/efi ] ; then
diff --git a/bsp-files/kickstarts/post_net_controller.cfg b/bsp-files/kickstarts/post_net_controller.cfg
index e07cc90..4d8286e 100644
--- a/bsp-files/kickstarts/post_net_controller.cfg
+++ b/bsp-files/kickstarts/post_net_controller.cfg
@@ -3,8 +3,9 @@
3# Source common functions 3# Source common functions
4. /tmp/ks-functions.sh 4. /tmp/ks-functions.sh
5 5
6http_port=$(get_http_port)
6# Retrieve the installation uuid from the controller we booted from 7# Retrieve the installation uuid from the controller we booted from
7INSTALL_UUID=`curl -sf http://pxecontroller/feed/rel-xxxPLATFORM_RELEASExxx/install_uuid` 8INSTALL_UUID=`curl -sf http://pxecontroller:${http_port:-8080}/feed/rel-xxxPLATFORM_RELEASExxx/install_uuid`
8if [ $? -ne 0 ] 9if [ $? -ne 0 ]
9then 10then
10 INSTALL_UUID=unknown 11 INSTALL_UUID=unknown
@@ -17,7 +18,7 @@ fi
17 18
18cd /www/pages 19cd /www/pages
19# Sync software repository 20# Sync software repository
20feed_url=http://pxecontroller/feed/ 21feed_url=http://pxecontroller:${http_port:-8080}/feed/
21anaconda_logdir=/var/log/anaconda 22anaconda_logdir=/var/log/anaconda
22mkdir -p $anaconda_logdir 23mkdir -p $anaconda_logdir
23 24
@@ -26,7 +27,7 @@ wget --recursive --no-parent --no-host-directories --no-clobber --reject 'index.
26 || report_post_failure_with_logfile $anaconda_logdir/wget-feed-mirror.log 27 || report_post_failure_with_logfile $anaconda_logdir/wget-feed-mirror.log
27 28
28# Sync patching repository 29# Sync patching repository
29updates_url=http://pxecontroller/updates/ 30updates_url=http://pxecontroller:${http_port:-8080}/updates/
30wget --mirror --no-parent --no-host-directories --reject 'index.html*' --reject '*.log' $updates_url/ -o $anaconda_logdir/wget-updates-mirror.log \ 31wget --mirror --no-parent --no-host-directories --reject 'index.html*' --reject '*.log' $updates_url/ -o $anaconda_logdir/wget-updates-mirror.log \
31 || report_post_failure_with_logfile $anaconda_logdir/wget-updates-mirror.log 32 || report_post_failure_with_logfile $anaconda_logdir/wget-updates-mirror.log
32echo "Done" >/dev/console 33echo "Done" >/dev/console
diff --git a/bsp-files/kickstarts/post_platform_conf_storage.cfg b/bsp-files/kickstarts/post_platform_conf_storage.cfg
index 5b22f18..2710863 100644
--- a/bsp-files/kickstarts/post_platform_conf_storage.cfg
+++ b/bsp-files/kickstarts/post_platform_conf_storage.cfg
@@ -4,7 +4,8 @@
4. /tmp/ks-functions.sh 4. /tmp/ks-functions.sh
5 5
6# Retrieve the installation uuid from the controller we booted from 6# Retrieve the installation uuid from the controller we booted from
7INSTALL_UUID=`curl -sf http://pxecontroller/feed/rel-xxxPLATFORM_RELEASExxx/install_uuid` 7http_port=$(get_http_port)
8INSTALL_UUID=`curl -sf http://pxecontroller:${http_port:-8080}/feed/rel-xxxPLATFORM_RELEASExxx/install_uuid`
8if [ $? -ne 0 ] 9if [ $? -ne 0 ]
9then 10then
10 INSTALL_UUID=unknown 11 INSTALL_UUID=unknown
diff --git a/bsp-files/kickstarts/post_platform_conf_worker.cfg b/bsp-files/kickstarts/post_platform_conf_worker.cfg
index f7d9c91..e50a2ff 100644
--- a/bsp-files/kickstarts/post_platform_conf_worker.cfg
+++ b/bsp-files/kickstarts/post_platform_conf_worker.cfg
@@ -4,7 +4,8 @@
4. /tmp/ks-functions.sh 4. /tmp/ks-functions.sh
5 5
6# Retrieve the installation uuid from the controller we booted from 6# Retrieve the installation uuid from the controller we booted from
7INSTALL_UUID=`curl -sf http://pxecontroller/feed/rel-xxxPLATFORM_RELEASExxx/install_uuid` 7http_port=$(get_http_port)
8INSTALL_UUID=`curl -sf http://pxecontroller:${http_port:-8080}/feed/rel-xxxPLATFORM_RELEASExxx/install_uuid`
8if [ $? -ne 0 ] 9if [ $? -ne 0 ]
9then 10then
10 INSTALL_UUID=unknown 11 INSTALL_UUID=unknown
diff --git a/bsp-files/kickstarts/post_platform_conf_worker_lowlatency.cfg b/bsp-files/kickstarts/post_platform_conf_worker_lowlatency.cfg
index 7289398..63d5963 100644
--- a/bsp-files/kickstarts/post_platform_conf_worker_lowlatency.cfg
+++ b/bsp-files/kickstarts/post_platform_conf_worker_lowlatency.cfg
@@ -4,7 +4,8 @@
4. /tmp/ks-functions.sh 4. /tmp/ks-functions.sh
5 5
6# Retrieve the installation uuid from the controller we booted from 6# Retrieve the installation uuid from the controller we booted from
7INSTALL_UUID=`curl -sf http://pxecontroller/feed/rel-xxxPLATFORM_RELEASExxx/install_uuid` 7http_port=$(get_http_port)
8INSTALL_UUID=`curl -sf http://pxecontroller:${http_port:-8080}/feed/rel-xxxPLATFORM_RELEASExxx/install_uuid`
8if [ $? -ne 0 ] 9if [ $? -ne 0 ]
9then 10then
10 INSTALL_UUID=unknown 11 INSTALL_UUID=unknown
diff --git a/bsp-files/kickstarts/post_pxeboot_controller.cfg b/bsp-files/kickstarts/post_pxeboot_controller.cfg
index 69acb7f..d0ddf61 100644
--- a/bsp-files/kickstarts/post_pxeboot_controller.cfg
+++ b/bsp-files/kickstarts/post_pxeboot_controller.cfg
@@ -41,6 +41,10 @@ fi
41# overwritten when config_controller is run. 41# overwritten when config_controller is run.
42echo management_interface=$mgmt_dev >> /etc/platform/platform.conf 42echo management_interface=$mgmt_dev >> /etc/platform/platform.conf
43 43
44# persist the default http port number to platform configuration. This
45# will get overwritten when config_controller is run.
46echo http_port=8080 >> /etc/platform/platform.conf
47
44# Build networking scripts 48# Build networking scripts
45cat << EOF > /etc/sysconfig/network-scripts/ifcfg-lo 49cat << EOF > /etc/sysconfig/network-scripts/ifcfg-lo
46DEVICE=lo 50DEVICE=lo
diff --git a/bsp-files/kickstarts/post_usb_controller.cfg b/bsp-files/kickstarts/post_usb_controller.cfg
index f8d97c5..201208f 100644
--- a/bsp-files/kickstarts/post_usb_controller.cfg
+++ b/bsp-files/kickstarts/post_usb_controller.cfg
@@ -31,6 +31,10 @@ mgmt_dev=none
31# overwritten when config_controller is run. 31# overwritten when config_controller is run.
32echo management_interface=$mgmt_dev >> /etc/platform/platform.conf 32echo management_interface=$mgmt_dev >> /etc/platform/platform.conf
33 33
34# persist the default http port number to platform configuration. This
35# will get overwritten when config_controller is run.
36echo http_port=8080 >> /etc/platform/platform.conf
37
34# Build networking scripts 38# Build networking scripts
35cat << EOF > /etc/sysconfig/network-scripts/ifcfg-lo 39cat << EOF > /etc/sysconfig/network-scripts/ifcfg-lo
36DEVICE=lo 40DEVICE=lo
diff --git a/bsp-files/kickstarts/post_yow_controller.cfg b/bsp-files/kickstarts/post_yow_controller.cfg
index b8bd8e2..344e463 100644
--- a/bsp-files/kickstarts/post_yow_controller.cfg
+++ b/bsp-files/kickstarts/post_yow_controller.cfg
@@ -41,6 +41,10 @@ fi
41# overwritten when config_controller is run. 41# overwritten when config_controller is run.
42echo management_interface=$mgmt_dev >> /etc/platform/platform.conf 42echo management_interface=$mgmt_dev >> /etc/platform/platform.conf
43 43
44# persist the default http port number to platform configuration. This
45# will get overwritten when config_controller is run.
46echo http_port=8080 >> /etc/platform/platform.conf
47
44# Build networking scripts 48# Build networking scripts
45cat << EOF > /etc/sysconfig/network-scripts/ifcfg-lo 49cat << EOF > /etc/sysconfig/network-scripts/ifcfg-lo
46DEVICE=lo 50DEVICE=lo
diff --git a/installer/pxe-network-installer/centos/build_srpm.data b/installer/pxe-network-installer/centos/build_srpm.data
index f12953f..6f255a0 100644
--- a/installer/pxe-network-installer/centos/build_srpm.data
+++ b/installer/pxe-network-installer/centos/build_srpm.data
@@ -7,6 +7,6 @@ COPY_LIST="pxe-network-installer/* \
7 /import/mirrors/CentOS/stx-installer/vmlinuz \ 7 /import/mirrors/CentOS/stx-installer/vmlinuz \
8" 8"
9 9
10TIS_PATCH_VER=27 10TIS_PATCH_VER=28
11BUILD_IS_BIG=4 11BUILD_IS_BIG=4
12BUILD_IS_SLOW=4 12BUILD_IS_SLOW=4
diff --git a/installer/pxe-network-installer/pxe-network-installer/centos-pxe-controller-install b/installer/pxe-network-installer/pxe-network-installer/centos-pxe-controller-install
index 111051f..c2d21b6 100644
--- a/installer/pxe-network-installer/pxe-network-installer/centos-pxe-controller-install
+++ b/installer/pxe-network-installer/pxe-network-installer/centos-pxe-controller-install
@@ -22,6 +22,6 @@ LABEL 1
22 MENU LABEL ^1) Standard Controller 22 MENU LABEL ^1) Standard Controller
23 MENU DEFAULT 23 MENU DEFAULT
24 KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage 24 KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage
25 APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_controller_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx 25 APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_controller_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx
26 IPAPPEND 2 26 IPAPPEND 2
27 27
diff --git a/installer/pxe-network-installer/pxe-network-installer/centos-pxe-smallsystem-install b/installer/pxe-network-installer/pxe-network-installer/centos-pxe-smallsystem-install
index 717f4b4..3931ab1 100644
--- a/installer/pxe-network-installer/pxe-network-installer/centos-pxe-smallsystem-install
+++ b/installer/pxe-network-installer/pxe-network-installer/centos-pxe-smallsystem-install
@@ -22,6 +22,6 @@ LABEL 1
22 MENU LABEL ^1) All-in-one 22 MENU LABEL ^1) All-in-one
23 MENU DEFAULT 23 MENU DEFAULT
24 KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage 24 KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage
25 APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_smallsystem_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx 25 APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_smallsystem_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx
26 IPAPPEND 2 26 IPAPPEND 2
27 27
diff --git a/installer/pxe-network-installer/pxe-network-installer/centos-pxe-smallsystem_lowlatency-install b/installer/pxe-network-installer/pxe-network-installer/centos-pxe-smallsystem_lowlatency-install
index a4b339f..12f5fb1 100644
--- a/installer/pxe-network-installer/pxe-network-installer/centos-pxe-smallsystem_lowlatency-install
+++ b/installer/pxe-network-installer/pxe-network-installer/centos-pxe-smallsystem_lowlatency-install
@@ -22,6 +22,6 @@ LABEL 1
22 MENU LABEL ^1) All-in-one (lowlatency) 22 MENU LABEL ^1) All-in-one (lowlatency)
23 MENU DEFAULT 23 MENU DEFAULT
24 KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage 24 KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage
25 APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_smallsystem_lowlatency_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx 25 APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_smallsystem_lowlatency_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx
26 IPAPPEND 2 26 IPAPPEND 2
27 27
diff --git a/installer/pxe-network-installer/pxe-network-installer/centos-pxe-storage-install b/installer/pxe-network-installer/pxe-network-installer/centos-pxe-storage-install
index 58e924f..bb9f7b1 100644
--- a/installer/pxe-network-installer/pxe-network-installer/centos-pxe-storage-install
+++ b/installer/pxe-network-installer/pxe-network-installer/centos-pxe-storage-install
@@ -22,6 +22,6 @@ LABEL 1
22 MENU LABEL ^1) Storage 22 MENU LABEL ^1) Storage
23 MENU DEFAULT 23 MENU DEFAULT
24 KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage 24 KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage
25 APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_storage_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx 25 APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_storage_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx
26 IPAPPEND 2 26 IPAPPEND 2
27 27
diff --git a/installer/pxe-network-installer/pxe-network-installer/centos-pxe-worker-install b/installer/pxe-network-installer/pxe-network-installer/centos-pxe-worker-install
index a95bd77..8b7cf41 100644
--- a/installer/pxe-network-installer/pxe-network-installer/centos-pxe-worker-install
+++ b/installer/pxe-network-installer/pxe-network-installer/centos-pxe-worker-install
@@ -22,6 +22,6 @@ LABEL 1
22 MENU LABEL ^1) Worker 22 MENU LABEL ^1) Worker
23 MENU DEFAULT 23 MENU DEFAULT
24 KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage 24 KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage
25 APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_worker_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx 25 APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_worker_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx
26 IPAPPEND 2 26 IPAPPEND 2
27 27
diff --git a/installer/pxe-network-installer/pxe-network-installer/centos-pxe-worker_lowlatency-install b/installer/pxe-network-installer/pxe-network-installer/centos-pxe-worker_lowlatency-install
index 487446c..c224ead 100644
--- a/installer/pxe-network-installer/pxe-network-installer/centos-pxe-worker_lowlatency-install
+++ b/installer/pxe-network-installer/pxe-network-installer/centos-pxe-worker_lowlatency-install
@@ -22,6 +22,6 @@ LABEL 1
22 MENU LABEL ^1) Lowlatency Worker 22 MENU LABEL ^1) Lowlatency Worker
23 MENU DEFAULT 23 MENU DEFAULT
24 KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage 24 KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage
25 APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_worker_lowlatency_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx 25 APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_worker_lowlatency_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 xxxAPPEND_OPTIONSxxx
26 IPAPPEND 2 26 IPAPPEND 2
27 27
diff --git a/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-controller-install b/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-controller-install
index 189ef47..1c68ec6 100755
--- a/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-controller-install
+++ b/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-controller-install
@@ -4,6 +4,6 @@ GRUB_HIDDEN_TIMEOUT=0
4GRUB_TIMEOUT_STYLE='countdown' 4GRUB_TIMEOUT_STYLE='countdown'
5 5
6menuentry '1) UEFI Standard Controller' { 6menuentry '1) UEFI Standard Controller' {
7 linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_controller_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx 7 linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_controller_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx
8 initrdefi rel-xxxSW_VERSIONxxx/installer-initrd 8 initrdefi rel-xxxSW_VERSIONxxx/installer-initrd
9} 9}
diff --git a/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-smallsystem-install b/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-smallsystem-install
index 4382aec..a42fabc 100755
--- a/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-smallsystem-install
+++ b/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-smallsystem-install
@@ -4,6 +4,6 @@ GRUB_HIDDEN_TIMEOUT=0
4GRUB_TIMEOUT_STYLE='countdown' 4GRUB_TIMEOUT_STYLE='countdown'
5 5
6menuentry '1) UEFI All-in-one' { 6menuentry '1) UEFI All-in-one' {
7 linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_smallsystem_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx 7 linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_smallsystem_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx
8 initrdefi rel-xxxSW_VERSIONxxx/installer-initrd 8 initrdefi rel-xxxSW_VERSIONxxx/installer-initrd
9} 9}
diff --git a/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-smallsystem_lowlatency-install b/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-smallsystem_lowlatency-install
index d0cc674..c713cb1 100755
--- a/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-smallsystem_lowlatency-install
+++ b/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-smallsystem_lowlatency-install
@@ -4,6 +4,6 @@ GRUB_HIDDEN_TIMEOUT=0
4GRUB_TIMEOUT_STYLE='countdown' 4GRUB_TIMEOUT_STYLE='countdown'
5 5
6menuentry '1) UEFI All-in-one (lowlatency)' { 6menuentry '1) UEFI All-in-one (lowlatency)' {
7 linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_smallsystem_lowlatency_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx 7 linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_smallsystem_lowlatency_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx
8 initrdefi rel-xxxSW_VERSIONxxx/installer-initrd 8 initrdefi rel-xxxSW_VERSIONxxx/installer-initrd
9} 9}
diff --git a/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-storage-install b/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-storage-install
index 4a76af2..e0afdcd 100755
--- a/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-storage-install
+++ b/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-storage-install
@@ -4,6 +4,6 @@ GRUB_HIDDEN_TIMEOUT=0
4GRUB_TIMEOUT_STYLE='countdown' 4GRUB_TIMEOUT_STYLE='countdown'
5 5
6menuentry '1) UEFI Storage' { 6menuentry '1) UEFI Storage' {
7 linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_storage_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx 7 linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_storage_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx
8 initrdefi rel-xxxSW_VERSIONxxx/installer-initrd 8 initrdefi rel-xxxSW_VERSIONxxx/installer-initrd
9} 9}
diff --git a/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-worker-install b/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-worker-install
index 687430b..3304299 100755
--- a/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-worker-install
+++ b/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-worker-install
@@ -4,6 +4,6 @@ GRUB_HIDDEN_TIMEOUT=0
4GRUB_TIMEOUT_STYLE='countdown' 4GRUB_TIMEOUT_STYLE='countdown'
5 5
6menuentry '1) UEFI Worker' { 6menuentry '1) UEFI Worker' {
7 linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_worker_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx 7 linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_worker_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx
8 initrdefi rel-xxxSW_VERSIONxxx/installer-initrd 8 initrdefi rel-xxxSW_VERSIONxxx/installer-initrd
9} 9}
diff --git a/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-worker_lowlatency-install b/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-worker_lowlatency-install
index acdc652..2430abb 100755
--- a/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-worker_lowlatency-install
+++ b/installer/pxe-network-installer/pxe-network-installer/efi-centos-pxe-worker_lowlatency-install
@@ -4,6 +4,6 @@ GRUB_HIDDEN_TIMEOUT=0
4GRUB_TIMEOUT_STYLE='countdown' 4GRUB_TIMEOUT_STYLE='countdown'
5 5
6menuentry '1) UEFI Lowlatency Worker' { 6menuentry '1) UEFI Lowlatency Worker' {
7 linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/ inst.ks=http://pxecontroller/feed/rel-xxxSW_VERSIONxxx/net_worker_lowlatency_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx 7 linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage bootifonly=1 devfs=nomount inst.repo=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ inst.ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/net_worker_lowlatency_ks.cfg usbcore.autosuspend=-1 biosdevname=0 rd.net.timeout.dhcp=120 ksdevice=$net_default_mac BOOTIF=$net_default_mac xxxAPPEND_OPTIONSxxx
8 initrdefi rel-xxxSW_VERSIONxxx/installer-initrd 8 initrdefi rel-xxxSW_VERSIONxxx/installer-initrd
9} 9}
diff --git a/installer/pxe-network-installer/pxe-network-installer/pxeboot-update.sh b/installer/pxe-network-installer/pxe-network-installer/pxeboot-update.sh
index 3f84042..26c0201 100755
--- a/installer/pxe-network-installer/pxe-network-installer/pxeboot-update.sh
+++ b/installer/pxe-network-installer/pxe-network-installer/pxeboot-update.sh
@@ -30,11 +30,13 @@ Arguments:
30 -s <mode> : Specify Security Profile mode (optional) 30 -s <mode> : Specify Security Profile mode (optional)
31 -T <tboot value> : Specify whether or not to use tboot (optional) 31 -T <tboot value> : Specify whether or not to use tboot (optional)
32 -k <kernel args> : Specify any extra kernel boot arguments (optional) 32 -k <kernel args> : Specify any extra kernel boot arguments (optional)
33 -l <base url> : Specify installer base URL
33 34
34EOF 35EOF
35} 36}
36 37
37declare text_install="inst.text" 38declare text_install="inst.text"
39declare base_url="http://pxecontroller:8080"
38 40
39function generate_config { 41function generate_config {
40 input=$1 42 input=$1
@@ -55,7 +57,7 @@ function generate_config {
55 exit 1 57 exit 1
56 fi 58 fi
57 59
58 sed -e "s#xxxAPPEND_OPTIONSxxx#$APPEND_OPTIONS#" $input > $output 60 sed -e "s#xxxAPPEND_OPTIONSxxx#$APPEND_OPTIONS#;s#xxxBASE_URLxxx#$BASE_URL#g" $input > $output
59 61
60 if [ $? -ne 0 -o ! -f $output ]; then 62 if [ $? -ne 0 -o ! -f $output ]; then
61 logger --stderr -t $0 "Error: Failed to generate pxeboot file $output" 63 logger --stderr -t $0 "Error: Failed to generate pxeboot file $output"
@@ -66,7 +68,7 @@ function generate_config {
66parms=$@ 68parms=$@
67logger -t $0 " $parms" 69logger -t $0 " $parms"
68 70
69while getopts "i:o:tgc:b:r:u:s:T:k:h" opt 71while getopts "i:o:tgc:b:r:u:s:T:k:l:h" opt
70do 72do
71 case $opt in 73 case $opt in
72 i) 74 i)
@@ -107,6 +109,9 @@ do
107 k) 109 k)
108 kernal_extra_args=$OPTARG 110 kernal_extra_args=$OPTARG
109 ;; 111 ;;
112 l)
113 base_url=$OPTARG
114 ;;
110 h) 115 h)
111 usage 116 usage
112 exit 1 117 exit 1
@@ -158,6 +163,8 @@ if [ -n "$kernal_extra_args" ]; then
158 APPEND_OPTIONS="$APPEND_OPTIONS $kernal_extra_args" 163 APPEND_OPTIONS="$APPEND_OPTIONS $kernal_extra_args"
159fi 164fi
160 165
166BASE_URL=$base_url
167
161generate_config $input_file $output_file 168generate_config $input_file $output_file
162 169
163# for extended security profile UEFI boot only, 170# for extended security profile UEFI boot only,
diff --git a/kickstart/centos/build_srpm.data b/kickstart/centos/build_srpm.data
index cdd168b..1eb8a78 100644
--- a/kickstart/centos/build_srpm.data
+++ b/kickstart/centos/build_srpm.data
@@ -1,3 +1,3 @@
1SRC_DIR="${GIT_BASE}/bsp-files" 1SRC_DIR="${GIT_BASE}/bsp-files"
2COPY_LIST="$PKG_BASE/LICENSE" 2COPY_LIST="$PKG_BASE/LICENSE"
3TIS_PATCH_VER=2 3TIS_PATCH_VER=3