From 7fc0c8fd95d3f404f7897d7c752e8f32bef3abe8 Mon Sep 17 00:00:00 2001 From: davidplunkett Date: Fri, 15 Mar 2019 21:25:10 +0000 Subject: [PATCH] update templates to ubuntu 16.04.6 Change-Id: If0f49222628547b89b9cd623d7a64f9cc4a36c23 Signed-off-by: davidplunkett --- tools/aknode30rc | 91 ---------------------------------------------------- tools/aknode40rc | 91 ---------------------------------------------------- tools/j2/serverrc.j2 | 4 +-- 3 files changed, 2 insertions(+), 184 deletions(-) delete mode 100644 tools/aknode30rc delete mode 100644 tools/aknode40rc diff --git a/tools/aknode30rc b/tools/aknode30rc deleted file mode 100644 index 5330e71..0000000 --- a/tools/aknode30rc +++ /dev/null @@ -1,91 +0,0 @@ -############################################################################## -# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. # -# # -# Licensed under the Apache License, Version 2.0 (the "License"); you may # -# not use this file except in compliance with the License. # -# # -# You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# Unless required by applicable law or agreed to in writing, software # -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT # -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # -# See the License for the specific language governing permissions and # -# limitations under the License. # -############################################################################## - -# Add proxy settings if required for your environment -# export http_proxy=http://your.proxy.com:8080/ -# export https_proxy=http://your.proxy.com:8080/ -# - -# host name for server -SRV_NAME=aknode30 - -# server oem - Dell or HPE (case sensitive) -SRV_OEM=HPE - -# out of band interface information for server (idrac/ilo/etc) -SRV_OOB_IP=192.168.41.130 -SRV_OOB_USR=Administrator -SRV_OOB_PWD=Admin123 - -# mac address of server to be used during the build - not required for Dell servers -SRV_MAC=3c:fd:fe:aa:90:b0 - -# name of network interface used during build when ipxe.efi is booted and when os is booted -# ipxe numbers ports from 0-n in pci bus order. -# the netx value will depend on how many nics are in the server -# and which pci device number is assigned to the slot -SRV_IPXE_INF=net4 - -# the build interface is the nic used by the Ubuntu installed to load the OS -SRV_BLD_INF=ens3f0 - -# the boot device is the device name on which the OS will be loaded -SRV_BOOT_DEVICE=sdj -SRV_CEPH_DEVICE=sdk - -# ipxe script to use - based on the os version and kernel to install -# valid options are script-hwe-16.04.4-amd64.ipxe or script-16.04.4-amd64.ipxe -SRV_BLD_SCRIPT=script-hwe-16.04.5-amd64.ipxe - -# template xml file to set bios and raid configuration settings -SRV_BIOS_TEMPLATE=hpe_dl380_g10_uefi_base.json.template -SRV_BOOT_TEMPLATE=hpe_dl380_g10_uefi_httpboot.json.template -SRV_HTTP_BOOT_DEV=NIC.Slot.3-1-1 - -# tempalte to run to configure OS after first boot -# current options are: firstboot.sh.template, firstboot-genesis.sh.tempate or firstboot-airship-iab.sh.template -SRV_FIRSTBOOT_TEMPLATE=firstboot-genesis.sh.template - -# VLAN to use during build and for final network configuration -SRV_VLAN=41 -SRV_STORAGE_VLAN=42 -SRV_CALICO_VLAN=44 -SRV_NEUTRON_VLAN=45 -SRV_PXE_INF=eno1 - -# basic network information for dhcp config and final server network settings -SRV_MTU=9000 -SRV_IP=192.168.2.30 -SRV_STORAGE_IP=172.31.1.30 -SRV_CALICO_IP=172.29.1.30 -SRV_NEUTRON_IP=10.0.101.30 -SRV_PXE_IP=172.30.1.30 -SRV_SUBNET=192.168.2.0 -SRV_NETMASK=255.255.255.0 -SRV_GATEWAY=192.168.2.200 -SRV_DNS="192.168.2.85 8.8.8.8 8.8.4.4" -SRV_DOMAIN=lab.akraino.org -SRV_DNSSEARCH=lab.akraino.org -SRV_NTP=ntp.ubuntu.org - -# root password for server being built -SRV_PWD=akraino,d - -# network bond information -SRV_BOND=bond0 -SRV_SLAVE1=ens3f0 -SRV_SLAVE2=ens3f1 - diff --git a/tools/aknode40rc b/tools/aknode40rc deleted file mode 100644 index 6b79c88..0000000 --- a/tools/aknode40rc +++ /dev/null @@ -1,91 +0,0 @@ -############################################################################## -# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. # -# # -# Licensed under the Apache License, Version 2.0 (the "License"); you may # -# not use this file except in compliance with the License. # -# # -# You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# Unless required by applicable law or agreed to in writing, software # -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT # -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # -# See the License for the specific language governing permissions and # -# limitations under the License. # -############################################################################## - -# Add proxy settings if required for your environment -# export http_proxy=http://your.proxy.com:8080/ -# export https_proxy=http://your.proxy.com:8080/ -# - -# host name for server -SRV_NAME=aknode40 - -# server oem - Dell or HPE (case sensitive) -SRV_OEM=Dell - -# out of band interface information for server (idrac/ilo/etc) -SRV_OOB_IP=192.168.41.40 -SRV_OOB_USR=root -SRV_OOB_PWD=calvin - -# mac address of server to be used during the build - not required for Dell servers -SRV_MAC= - -# name of network interface used during build when ipxe.efi is booted and when os is booted -# ipxe numbers ports from 0-n in pci bus order. -# the netx value will depend on how many nics are in the server -# and which pci device number is assigned to the slot -SRV_IPXE_INF=net4 - -# the build interface is the nic used by the Ubuntu installed to load the OS -SRV_BLD_INF=enp94s0f0 - -# the boot device is the device name on which the OS will be loaded -SRV_BOOT_DEVICE=sdg -SRV_CEPH_DEVICE=sdh - -# ipxe script to use - based on the os version and kernel to install -# valid options are script-hwe-16.04.4-amd64.ipxe or script-16.04.4-amd64.ipxe -SRV_BLD_SCRIPT=script-hwe-16.04.5-amd64.ipxe - -# template xml file to set bios and raid configuration settings -SRV_BIOS_TEMPLATE=dell_r740_g14_uefi_base.xml.template -SRV_BOOT_TEMPLATE=dell_r740_g14_uefi_httpboot.xml.template -SRV_HTTP_BOOT_DEV=NIC.Slot.2-1-1 - -# tempalte to run to configure OS after first boot -# current options are: firstboot.sh.template, firstboot-genesis.sh.tempate or firstboot-airship-iab.sh.template -SRV_FIRSTBOOT_TEMPLATE=firstboot-genesis.sh.template - -# VLAN to use during build and for final network configuration -SRV_VLAN=41 -SRV_STORAGE_VLAN=42 -SRV_CALICO_VLAN=44 -SRV_NEUTRON_VLAN=45 -SRV_PXE_INF=eno3 - -# basic network information for dhcp config and final server network settings -SRV_MTU=9000 -SRV_IP=192.168.2.40 -SRV_STORAGE_IP=172.31.2.40 -SRV_CALICO_IP=172.29.1.40 -SRV_NEUTRON_IP=10.0.102.40 -SRV_PXE_IP=172.30.2.40 -SRV_SUBNET=192.168.2.0 -SRV_NETMASK=255.255.255.0 -SRV_GATEWAY=192.168.2.200 -SRV_DNS="192.168.2.85 8.8.8.8 8.8.4.4" -SRV_DOMAIN=lab.akraino.org -SRV_DNSSEARCH=lab.akraino.org -SRV_NTP=ntp.ubuntu.org - -# root password for server being built -SRV_PWD=akraino,d - -# network bond information -SRV_BOND=bond0 -SRV_SLAVE1=enp94s0f0 -SRV_SLAVE2=enp94s0f1 - diff --git a/tools/j2/serverrc.j2 b/tools/j2/serverrc.j2 index 3f68e92..d5dd32f 100644 --- a/tools/j2/serverrc.j2 +++ b/tools/j2/serverrc.j2 @@ -49,8 +49,8 @@ SRV_BOOT_DEVICE={{yaml.disks[0].name}} SRV_CEPH_DEVICE={{yaml.disks[1].name}} # ipxe script to use - based on the os version and kernel to install -# valid options are script-hwe-16.04.4-amd64.ipxe or script-16.04.4-amd64.ipxe -SRV_BLD_SCRIPT=script-hwe-16.04.5-amd64.ipxe +# valid options are script-hwe-16.04.6-amd64.ipxe or script-16.04.6-amd64.ipxe +SRV_BLD_SCRIPT=script-hwe-16.04.6-amd64.ipxe # template xml file to set bios and raid configuration settings SRV_BIOS_TEMPLATE={{yaml.genesis.bios_template}} -- 2.16.6