From fae5ba9e41eb56e37983cfb0f34db2bea70362e5 Mon Sep 17 00:00:00 2001 From: Alexander Lutay Date: Tue, 23 Sep 2014 16:32:35 +0200 Subject: [PATCH] MT#9191 Add all the Carrier 3.x node types --- templates/boot/grub/grub.cfg | 50 +++++++++++++-- templates/boot/isolinux/isolinux.cfg | 94 +++++++++++++++++++++++++--- 2 files changed, 131 insertions(+), 13 deletions(-) diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg index deacf17..39f8d90 100644 --- a/templates/boot/grub/grub.cfg +++ b/templates/boot/grub/grub.cfg @@ -156,21 +156,61 @@ source /boot/grub/sipwise_pro.cfg ## begin of Carrier 3.x menu {{{ submenu "Specific sip:Carrier 3.x releases ... ->" --class=submenu { -menuentry "sip:Carrier 3.x - first (mgmt/web01a) / trunk" { +menuentry "sip:Carrier 3.x - web01a / trunk" { echo 'Loading kernel...' - linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ngcptrunk ngcpnoupload ngcpnw.dhcp ngcpnonwrecfg ngcpcrole=mgmt ngcphostname=web01a + linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ngcptrunk ngcpnoupload ngcpnw.dhcp ngcpcrole=mgmt ngcpnonwrecfg ngcphostname=web01a echo 'Loading initrd...' initrd /boot/%SHORT_NAME%/initrd.img } -menuentry "sip:Carrier 3.x - other / trunk release" { +menuentry "sip:Carrier 3.x - web01b / trunk" { echo 'Loading kernel...' - linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ngcptrunk ngcpnoupload ngcpnw.dhcp ngcpnonwrecfg ngcpcrole=[mgmt|db|proxy|lb] ngcphostname=FIXME01a ngcpmgmt=X.X.X.X + linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ngcptrunk ngcpnoupload ngcpnw.dhcp ngcpcrole=mgmt ngcphostname=web01b ngcpnonwrecfg ngcpmgmt=X.X.X.X echo 'Loading initrd...' initrd /boot/%SHORT_NAME%/initrd.img } -source /boot/grub/sipwise_pro.cfg +menuentry "sip:Carrier 3.x - db01a / trunk" { + echo 'Loading kernel...' + linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ngcptrunk ngcpnoupload ngcpnw.dhcp ngcpcrole=db ngcphostname=db01a ngcpnonwrecfg ngcpmgmt=X.X.X.X + echo 'Loading initrd...' + initrd /boot/%SHORT_NAME%/initrd.img +} + +menuentry "sip:Carrier 3.x - db01b / trunk" { + echo 'Loading kernel...' + linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ngcptrunk ngcpnoupload ngcpnw.dhcp ngcpcrole=db ngcphostname=db01b ngcpnonwrecfg ngcpmgmt=X.X.X.X + echo 'Loading initrd...' + initrd /boot/%SHORT_NAME%/initrd.img +} + +menuentry "sip:Carrier 3.x - lb01a / trunk" { + echo 'Loading kernel...' + linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ngcptrunk ngcpnoupload ngcpnw.dhcp ngcpcrole=lb ngcphostname=lb01a ngcpnonwrecfg ngcpmgmt=X.X.X.X + echo 'Loading initrd...' + initrd /boot/%SHORT_NAME%/initrd.img +} + +menuentry "sip:Carrier 3.x - lb01b / trunk" { + echo 'Loading kernel...' + linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ngcptrunk ngcpnoupload ngcpnw.dhcp ngcpcrole=lb ngcphostname=lb01b ngcpnonwrecfg ngcpmgmt=X.X.X.X + echo 'Loading initrd...' + initrd /boot/%SHORT_NAME%/initrd.img +} + +menuentry "sip:Carrier 3.x - prx01a / trunk" { + echo 'Loading kernel...' + linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ngcptrunk ngcpnoupload ngcpnw.dhcp ngcpcrole=proxy ngcphostname=prx01a ngcpnonwrecfg ngcpmgmt=X.X.X.X + echo 'Loading initrd...' + initrd /boot/%SHORT_NAME%/initrd.img +} + +menuentry "sip:Carrier 3.x - prx01b / trunk" { + echo 'Loading kernel...' + linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ngcptrunk ngcpnoupload ngcpnw.dhcp ngcpcrole=proxy ngcphostname=prx01b ngcpnonwrecfg ngcpmgmt=X.X.X.X + echo 'Loading initrd...' + initrd /boot/%SHORT_NAME%/initrd.img +} } # Specific sip:providerCarrier 3.x releases diff --git a/templates/boot/isolinux/isolinux.cfg b/templates/boot/isolinux/isolinux.cfg index 6e6343f..c9107dd 100644 --- a/templates/boot/isolinux/isolinux.cfg +++ b/templates/boot/isolinux/isolinux.cfg @@ -357,27 +357,105 @@ menu label ^Back to main menu... menu exit menu separator -label carrierfirst - menu label Install sip:Carrier 3.x - mgmt/web01a (DHCP) +label carrierweb01a + menu label Install sip:Carrier 3.x - web01a / trunk (DHCP) kernel /boot/%SHORT_NAME%/vmlinuz - append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ngcpnw.dhcp ngcpnonwrecfg ngcpcrole=mgmt ngcphostname=web01a + append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ngcpnw.dhcp ngcpcrole=mgmt ngcphostname=web01a ngcpnonwrecfg text help Install sip:carrier edition. - Install first node of Carrier 3.x setup. + Install web01a node of Carrier 3.x setup. Retrieve network configuration via DHCP. endtext -label carrierother - menu label Install sip:Carrier 3.x - other nodes (DHCP) +label carrierweb01b + menu label Install sip:Carrier 3.x - web01b / trunk (DHCP) kernel /boot/%SHORT_NAME%/vmlinuz - append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ngcpnw.dhcp ngcpnonwrecfg ngcpcrole=[mgmt|db|proxy|lb] ngcphostname=FIXME01a ngcpmgmt=X.X.X.X + append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ngcpnw.dhcp ngcpcrole=mgmt ngcphostname=web01b ngcpnonwrecfg ngcpmgmt=X.X.X.X text help Install sip:carrier edition. - Install other nodes of Carrier 3.x setup. + Install web01b nodes of Carrier 3.x setup. + + Retrieve network configuration via DHCP. + endtext + + +label carrierdb01a + menu label Install sip:Carrier 3.x - db01a / trunk (DHCP) + kernel /boot/%SHORT_NAME%/vmlinuz + append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ngcpnw.dhcp ngcpcrole=db ngcphostname=db01a ngcpnonwrecfg ngcpmgmt=X.X.X.X + + text help + Install sip:carrier edition. + Install db01a node of Carrier 3.x setup. + + Retrieve network configuration via DHCP. + endtext + + +label carrierdb01b + menu label Install sip:Carrier 3.x - db01b / trunk (DHCP) + kernel /boot/%SHORT_NAME%/vmlinuz + append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ngcpnw.dhcp ngcpcrole=db ngcphostname=db01b ngcpnonwrecfg ngcpmgmt=X.X.X.X + + text help + Install sip:carrier edition. + Install db01b nodes of Carrier 3.x setup. + + Retrieve network configuration via DHCP. + endtext + + +label carrierlb01a + menu label Install sip:Carrier 3.x - lb01a / trunk (DHCP) + kernel /boot/%SHORT_NAME%/vmlinuz + append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ngcpnw.dhcp ngcpcrole=lb ngcphostname=lb01a ngcpnonwrecfg ngcpmgmt=X.X.X.X + + text help + Install sip:carrier edition. + Install lb01a node of Carrier 3.x setup. + + Retrieve network configuration via DHCP. + endtext + + +label carrierlb01b + menu label Install sip:Carrier 3.x - lb01b / trunk (DHCP) + kernel /boot/%SHORT_NAME%/vmlinuz + append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ngcpnw.dhcp ngcpcrole=lb ngcphostname=lb01b ngcpnonwrecfg ngcpmgmt=X.X.X.X + + text help + Install sip:carrier edition. + Install lb01b nodes of Carrier 3.x setup. + + Retrieve network configuration via DHCP. + endtext + + +label carrierprx01a + menu label Install sip:Carrier 3.x - prx01a / trunk (DHCP) + kernel /boot/%SHORT_NAME%/vmlinuz + append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ngcpnw.dhcp ngcpcrole=proxy ngcphostname=prx01a ngcpnonwrecfg ngcpmgmt=X.X.X.X + + text help + Install sip:carrier edition. + Install prx01a node of Carrier 3.x setup. + + Retrieve network configuration via DHCP. + endtext + + +label carrierprx01b + menu label Install sip:Carrier 3.x - prx01b / trunk (DHCP) + kernel /boot/%SHORT_NAME%/vmlinuz + append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ngcpnw.dhcp ngcpcrole=proxy ngcphostname=prx01b ngcpnonwrecfg ngcpmgmt=X.X.X.X + + text help + Install sip:carrier edition. + Install prx01b nodes of Carrier 3.x setup. Retrieve network configuration via DHCP. endtext