mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-22 06:01:41 +02:00
*: Remove support for interoute OEM
This commit is contained in:
Krzesimir Nowak
parent
3a879fb7c2
commit
ad0360e744
@ -134,13 +134,6 @@
|
||||
"type":"0fc63daf-8483-4772-8e79-3d69d8477de4",
|
||||
"blocks":"12582912"
|
||||
}
|
||||
},
|
||||
"interoute":{
|
||||
"9":{
|
||||
"label":"ROOT",
|
||||
"fs_label":"ROOT",
|
||||
"blocks":"33845248"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,109 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--Generated by VMware ovftool 4.0.0 (build-2301625), UTC time: 2015-08-28T15:12:13.106013Z-->
|
||||
<Envelope vmw:buildId="build-2301625" xmlns="http://schemas.dmtf.org/ovf/envelope/1" xmlns:cim="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vmw="http://www.vmware.com/schema/ovf" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<References>
|
||||
<File ovf:href="@@VMDK_FILE_NAME@@" ovf:id="file1" ovf:size="@@VMDK_FILE_SIZE@@"/>
|
||||
</References>
|
||||
<DiskSection>
|
||||
<Info>Virtual disk information</Info>
|
||||
<Disk ovf:capacity="@@VMDK_CAPACITY@@" ovf:capacityAllocationUnits="byte" ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" ovf:populatedSize="0"/>
|
||||
</DiskSection>
|
||||
<NetworkSection>
|
||||
<Info>The list of logical networks</Info>
|
||||
<Network ovf:name="VM Network">
|
||||
<Description>The VM Network network</Description>
|
||||
</Network>
|
||||
</NetworkSection>
|
||||
<VirtualSystem ovf:id="@@NAME@@">
|
||||
<Info>A virtual machine</Info>
|
||||
<Name>@@NAME@@</Name>
|
||||
<OperatingSystemSection ovf:id="100" vmw:osType="other26xLinux64Guest">
|
||||
<Info>The kind of installed guest operating system</Info>
|
||||
</OperatingSystemSection>
|
||||
<VirtualHardwareSection>
|
||||
<Info>Virtual hardware requirements</Info>
|
||||
<System>
|
||||
<vssd:ElementName>Virtual Hardware Family</vssd:ElementName>
|
||||
<vssd:InstanceID>0</vssd:InstanceID>
|
||||
<vssd:VirtualSystemIdentifier>@@NAME@@</vssd:VirtualSystemIdentifier>
|
||||
<vssd:VirtualSystemType>vmx-08</vssd:VirtualSystemType>
|
||||
</System>
|
||||
<Item>
|
||||
<rasd:AllocationUnits>hertz * 10^6</rasd:AllocationUnits>
|
||||
<rasd:Description>Number of Virtual CPUs</rasd:Description>
|
||||
<rasd:ElementName>@@NUM_CPUS@@ virtual CPU(s)</rasd:ElementName>
|
||||
<rasd:InstanceID>1</rasd:InstanceID>
|
||||
<rasd:ResourceType>3</rasd:ResourceType>
|
||||
<rasd:VirtualQuantity>@@NUM_CPUS@@</rasd:VirtualQuantity>
|
||||
</Item>
|
||||
<Item>
|
||||
<rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits>
|
||||
<rasd:Description>Memory Size</rasd:Description>
|
||||
<rasd:ElementName>@@MEM_SIZE@@MB of memory</rasd:ElementName>
|
||||
<rasd:InstanceID>2</rasd:InstanceID>
|
||||
<rasd:ResourceType>4</rasd:ResourceType>
|
||||
<rasd:VirtualQuantity>@@MEM_SIZE@@</rasd:VirtualQuantity>
|
||||
</Item>
|
||||
<Item>
|
||||
<rasd:Address>0</rasd:Address>
|
||||
<rasd:Description>SCSI Controller</rasd:Description>
|
||||
<rasd:ElementName>scsiController0</rasd:ElementName>
|
||||
<rasd:InstanceID>3</rasd:InstanceID>
|
||||
<rasd:ResourceSubType>lsilogic</rasd:ResourceSubType>
|
||||
<rasd:ResourceType>6</rasd:ResourceType>
|
||||
</Item>
|
||||
<Item>
|
||||
<rasd:Address>1</rasd:Address>
|
||||
<rasd:Description>IDE Controller</rasd:Description>
|
||||
<rasd:ElementName>ideController1</rasd:ElementName>
|
||||
<rasd:InstanceID>4</rasd:InstanceID>
|
||||
<rasd:ResourceType>5</rasd:ResourceType>
|
||||
</Item>
|
||||
<Item ovf:required="false">
|
||||
<rasd:AddressOnParent>0</rasd:AddressOnParent>
|
||||
<rasd:AutomaticAllocation>false</rasd:AutomaticAllocation>
|
||||
<rasd:ElementName>cdrom0</rasd:ElementName>
|
||||
<rasd:InstanceID>5</rasd:InstanceID>
|
||||
<rasd:Parent>4</rasd:Parent>
|
||||
<rasd:ResourceType>15</rasd:ResourceType>
|
||||
</Item>
|
||||
<Item>
|
||||
<rasd:AddressOnParent>0</rasd:AddressOnParent>
|
||||
<rasd:ElementName>disk0</rasd:ElementName>
|
||||
<rasd:HostResource>ovf:/disk/vmdisk1</rasd:HostResource>
|
||||
<rasd:InstanceID>6</rasd:InstanceID>
|
||||
<rasd:Parent>3</rasd:Parent>
|
||||
<rasd:ResourceType>17</rasd:ResourceType>
|
||||
</Item>
|
||||
<Item>
|
||||
<rasd:AddressOnParent>2</rasd:AddressOnParent>
|
||||
<rasd:AutomaticAllocation>true</rasd:AutomaticAllocation>
|
||||
<rasd:Connection>VM Network</rasd:Connection>
|
||||
<rasd:Description>E1000 ethernet adapter on "VM Network"</rasd:Description>
|
||||
<rasd:ElementName>ethernet0</rasd:ElementName>
|
||||
<rasd:InstanceID>7</rasd:InstanceID>
|
||||
<rasd:ResourceSubType>E1000</rasd:ResourceSubType>
|
||||
<rasd:ResourceType>10</rasd:ResourceType>
|
||||
<vmw:Config ovf:required="false" vmw:key="wakeOnLanEnabled" vmw:value="false"/>
|
||||
</Item>
|
||||
<Item ovf:required="false">
|
||||
<rasd:AutomaticAllocation>false</rasd:AutomaticAllocation>
|
||||
<rasd:ElementName>video</rasd:ElementName>
|
||||
<rasd:InstanceID>8</rasd:InstanceID>
|
||||
<rasd:ResourceType>24</rasd:ResourceType>
|
||||
</Item>
|
||||
<Item ovf:required="false">
|
||||
<rasd:AutomaticAllocation>false</rasd:AutomaticAllocation>
|
||||
<rasd:ElementName>vmci</rasd:ElementName>
|
||||
<rasd:InstanceID>9</rasd:InstanceID>
|
||||
<rasd:ResourceSubType>vmware.vmci</rasd:ResourceSubType>
|
||||
<rasd:ResourceType>1</rasd:ResourceType>
|
||||
</Item>
|
||||
<vmw:Config ovf:required="false" vmw:key="powerOpInfo.powerOffType" vmw:value="soft"/>
|
||||
<vmw:Config ovf:required="false" vmw:key="powerOpInfo.resetType" vmw:value="soft"/>
|
||||
<vmw:Config ovf:required="false" vmw:key="powerOpInfo.suspendType" vmw:value="soft"/>
|
||||
<vmw:Config ovf:required="false" vmw:key="tools.syncTimeWithHost" vmw:value="true"/>
|
||||
<vmw:Config ovf:required="false" vmw:key="tools.toolsUpgradePolicy" vmw:value="upgradeAtPowerCycle"/>
|
||||
</VirtualHardwareSection>
|
||||
</VirtualSystem>
|
||||
</Envelope>
|
||||
@ -17,7 +17,6 @@ VALID_IMG_TYPES=(
|
||||
exoscale
|
||||
gce
|
||||
hyperv
|
||||
interoute
|
||||
iso
|
||||
niftycloud
|
||||
openstack
|
||||
@ -53,7 +52,6 @@ VALID_OEM_PACKAGES=(
|
||||
exoscale
|
||||
gce
|
||||
hyperv
|
||||
interoute
|
||||
niftycloud
|
||||
packet
|
||||
qemu
|
||||
@ -306,13 +304,6 @@ IMG_cloudsigma_OEM_PACKAGE=oem-cloudsigma
|
||||
## packet
|
||||
IMG_packet_OEM_PACKAGE=oem-packet
|
||||
|
||||
## interoute
|
||||
IMG_interoute_DISK_FORMAT=vmdk_stream
|
||||
IMG_interoute_DISK_LAYOUT=interoute
|
||||
IMG_interoute_CONF_FORMAT=interoute
|
||||
IMG_interoute_OEM_PACKAGE=oem-interoute
|
||||
IMG_interoute_BUNDLE_FORMAT=ova
|
||||
|
||||
###########################################################
|
||||
|
||||
# Print the default vm type for the specified board
|
||||
@ -1162,25 +1153,6 @@ _write_ovf_vmware_conf() {
|
||||
VM_GENERATED_FILES+=( "$ovf" )
|
||||
}
|
||||
|
||||
_write_interoute_conf() {
|
||||
local vm_mem="${1:-$(_get_vm_opt MEM)}"
|
||||
local vm_cpus="$(_get_vm_opt CPUS)"
|
||||
local vmdk_file_size=$(du --bytes "${VM_DST_IMG}" | cut -f1)
|
||||
local vmdk_capacity=$(vmdk-convert -i "${VM_DST_IMG}" | jq .capacity)
|
||||
local ovf="$(_dst_path ".ovf")"
|
||||
|
||||
sed "${BUILD_LIBRARY_DIR}/template_interoute.ovf" \
|
||||
-e "s/@@NAME@@/$(_dst_name)/g" \
|
||||
-e "s/@@VMDK_FILE_NAME@@/$(basename ${VM_DST_IMG})/g" \
|
||||
-e "s/@@VMDK_FILE_SIZE@@/${vmdk_file_size}/g" \
|
||||
-e "s/@@VMDK_CAPACITY@@/${vmdk_capacity}/g" \
|
||||
-e "s/@@NUM_CPUS@@/${vm_cpus}/g" \
|
||||
-e "s/@@MEM_SIZE@@/${vm_mem}/g" \
|
||||
> "${ovf}"
|
||||
|
||||
VM_GENERATED_FILES+=( "$ovf" )
|
||||
}
|
||||
|
||||
# If this is a bundled format generate it!
|
||||
write_vm_bundle() {
|
||||
local bundle_format=$(_get_vm_opt BUNDLE_FORMAT)
|
||||
|
||||
@ -1,61 +0,0 @@
|
||||
#cloud-config
|
||||
|
||||
coreos:
|
||||
units:
|
||||
- name: vmtoolsd.service
|
||||
command: start
|
||||
content: |
|
||||
[Unit]
|
||||
Description=VMware Tools Agent
|
||||
Documentation=http://open-vm-tools.sourceforge.net/
|
||||
ConditionVirtualization=vmware
|
||||
|
||||
[Service]
|
||||
ExecStartPre=/usr/bin/ln -sfT /oem/vmware-tools /etc/vmware-tools
|
||||
ExecStart=/oem/bin/vmtoolsd
|
||||
TimeoutStopSec=5
|
||||
- name: cloudstack-ssh-key.service
|
||||
command: restart
|
||||
runtime: yes
|
||||
content: |
|
||||
[Unit]
|
||||
Description=Sets SSH key from metadata
|
||||
Requires=flatcar-setup-environment.service
|
||||
After=flatcar-setup-environment.service
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
StandardOutput=journal+console
|
||||
EnvironmentFile=/etc/environment
|
||||
ExecStart=/oem/bin/cloudstack-ssh-key
|
||||
- name: cloudstack-cloudinit.service
|
||||
command: restart
|
||||
runtime: yes
|
||||
content: |
|
||||
[Unit]
|
||||
Description=Cloudinit from CloudStack-style metadata
|
||||
Requires=flatcar-setup-environment.service
|
||||
After=flatcar-setup-environment.service
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
EnvironmentFile=/etc/environment
|
||||
ExecStart=/oem/bin/cloudstack-coreos-cloudinit
|
||||
- name: cloudstack-set-guest-password.service
|
||||
runtime: yes
|
||||
content: |
|
||||
[Unit]
|
||||
Description=CloudStack Guest Password Reset
|
||||
Requires=flatcar-setup-environment.service
|
||||
After=flatcar-setup-environment.service
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStart=/oem/bin/cloudstack-set-guest-password
|
||||
EnvironmentFile=/etc/environment
|
||||
oem:
|
||||
id: interoute
|
||||
name: Interoute
|
||||
version-id: @@OEM_VERSION_ID@@
|
||||
home-url: http://interoute.com/
|
||||
bug-report-url: https://issues.flatcar.org
|
||||
@ -1,7 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
DHCP_SERVER=${NIC_1_GATEWAY}
|
||||
USERDATA_URL="http://${DHCP_SERVER}/latest/user-data"
|
||||
|
||||
block-until-url "${USERDATA_URL}"
|
||||
coreos-cloudinit --from-url="${USERDATA_URL}"
|
||||
@ -1,101 +0,0 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# Licensed to the Apache Software Foundation (ASF) under one
|
||||
# or more contributor license agreements. See the NOTICE file
|
||||
# distributed with this work for additional information
|
||||
# regarding copyright ownership. The ASF licenses this file
|
||||
# to you 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.
|
||||
#
|
||||
# Installation steps (ArchLinux using base/dhcpcd-6.0.5-1)
|
||||
#
|
||||
# Install "wget" and "dhcpcd"
|
||||
# $ pacman -S wget dhcpcd
|
||||
# $ systemctl enable dhcpcd@eth0
|
||||
# Copy script to /usr/lib/systemd/scripts/
|
||||
# $ cp -v cloudstack-set-guest-password \
|
||||
# /usr/lib/systemd/scripts/
|
||||
# Copy the service file to /usr/lib/systemd/system/
|
||||
# $ cp -v cloudstack-set-guest-password.service \
|
||||
# /usr/lib/systemd/system/
|
||||
# Enable the service
|
||||
# $ systemctl enable cloudstack-set-guest-password.service
|
||||
|
||||
# Modified: Dong Xie, 02-09-2015
|
||||
|
||||
user=root
|
||||
password_received=0
|
||||
|
||||
if [ ! -x /usr/sbin/chpasswd ]; then
|
||||
logger -t "cloudstack" "$0 requires /usr/sbin/chpasswd command"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
PASSWORD_SERVER_IP=${NIC_1_GATEWAY}
|
||||
|
||||
if [ -n $PASSWORD_SERVER_IP ]; then
|
||||
logger -t "cloudstack" "Found password server IP $PASSWORD_SERVER_IP"
|
||||
logger -t "cloudstack" "Sending request to password server at $PASSWORD_SERVER_IP"
|
||||
password=$(wget -q -t 3 -T 20 -O - --header "DomU_Request: send_my_password" $PASSWORD_SERVER_IP:8080)
|
||||
if [ $? -ne 0 ]; then
|
||||
logger -t "cloudstack" "Failed to run wget correctly. Network not ready?"
|
||||
exit 1
|
||||
fi
|
||||
password=$(echo $password | tr -d '\r')
|
||||
logger -t "cloudstack" "Got password as - $password - "
|
||||
|
||||
if [ $? -eq 0 ]; then
|
||||
logger -t "cloudstack" "Got response from server at $PASSWORD_SERVER_IP"
|
||||
|
||||
case $password in
|
||||
"")
|
||||
logger -t "cloudstack" "Password server at $PASSWORD_SERVER_IP did not have any password for the VM"
|
||||
;;
|
||||
|
||||
"bad_request")
|
||||
logger -t "cloudstack" "VM sent an invalid request to password server at $PASSWORD_SERVER_IP"
|
||||
;;
|
||||
|
||||
"saved_password")
|
||||
logger -t "cloudstack" "VM has already saved a password from the password server at $PASSWORD_SERVER_IP"
|
||||
;;
|
||||
|
||||
*)
|
||||
logger -t "cloudstack" "VM got a valid password from server at $PASSWORD_SERVER_IP"
|
||||
password_received=1
|
||||
;;
|
||||
esac
|
||||
else
|
||||
logger -t "cloudstack" "Failed to send request to password server at $PASSWORD_SERVER_IP"
|
||||
fi
|
||||
else
|
||||
logger -t "cloudstack" "Could not find password server IP for $interface"
|
||||
fi
|
||||
|
||||
if [ "$password_received" == "1" ]; then
|
||||
logger -t "cloudstack" "Changing password ..."
|
||||
echo $user:$password | /usr/sbin/chpasswd
|
||||
|
||||
if [ $? -gt 0 ]; then
|
||||
logger -t "cloudstack" "Failed to change password for user $user"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
logger -t "cloudstack" "Successfully changed password for user $user"
|
||||
logger -t "cloudstack" "Sending acknowledgment to password server at $PASSWORD_SERVER_IP"
|
||||
|
||||
wget -t 3 -T 20 -O - --header "DomU_Request: saved_password" $PASSWORD_SERVER_IP:8080
|
||||
fi
|
||||
|
||||
exit 0
|
||||
# vim: set ts=2 sw=2 expandtab
|
||||
@ -1,7 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
DHCP_SERVER=${NIC_1_GATEWAY}
|
||||
KEY_URL="http://${DHCP_SERVER}/latest/meta-data/public-keys"
|
||||
|
||||
block-until-url "${KEY_URL}"
|
||||
curl --fail -s "${KEY_URL}" | update-ssh-keys -a cloudstack
|
||||
@ -1,64 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
ENV=$1
|
||||
leases_dir="/run/systemd/netif/leases"
|
||||
|
||||
if [[ -z "$ENV" ]]; then
|
||||
echo "usage: $0 /etc/environment" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Make sure that the file is writable
|
||||
touch $ENV
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "$0: unable to modify ${ENV}" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Clean up values
|
||||
sed -i -e '/^COREOS_PUBLIC_IPV4=/d' \
|
||||
-e '/^COREOS_PRIVATE_IPV4=/d' \
|
||||
"${ENV}"
|
||||
|
||||
sed -i -e '/^NIC_[0-9]*_IPV4=/d' \
|
||||
-e '/^NIC_[0-9]*_GATEWAY=/d' \
|
||||
"${ENV}"
|
||||
|
||||
# Fetch number of NIC
|
||||
nic_count=$(ip link show | grep ens | wc -l)
|
||||
|
||||
# Loop until all lease files ready
|
||||
while true; do
|
||||
if [[ $(find "${leases_dir}" -maxdepth 1 -type f -size +1c | wc -l) -ge $nic_count ]]; then
|
||||
break
|
||||
fi
|
||||
sleep .5
|
||||
done
|
||||
|
||||
# Get leases in var
|
||||
leases=$(find "${leases_dir}" -type f | sort)
|
||||
|
||||
# Take first lease which should be the default NIC
|
||||
default_lease=$(echo "${leases}" | head -n1)
|
||||
DHCP_SERVER=$(cat $default_lease | awk -F= '/SERVER_ADDRESS/ { print $2 }')
|
||||
METADATA_URL="http://${DHCP_SERVER}/latest/meta-data/"
|
||||
|
||||
block-until-url "${METADATA_URL}"
|
||||
|
||||
PUBLIC_IP=$(curl --fail -s "${METADATA_URL}public-ipv4")
|
||||
echo COREOS_PUBLIC_IPV4=${PUBLIC_IP} >> $ENV
|
||||
|
||||
PRIVATE_IP=$(curl --fail -s "${METADATA_URL}local-ipv4")
|
||||
echo COREOS_PRIVATE_IPV4=${PRIVATE_IP} >> $ENV
|
||||
|
||||
# Loop to export interoute style info into ENV
|
||||
count=1
|
||||
for lease in $leases;
|
||||
do
|
||||
ip=$(cat $lease | awk -F= '/^ADDRESS/ { print $2 }')
|
||||
gateway=$(cat $lease | awk -F= '/SERVER_ADDRESS/ { print $2 }')
|
||||
echo "NIC_${count}_IPV4"=${ip} >> $ENV
|
||||
echo "NIC_${count}_GATEWAY"=${gateway} >> $ENV
|
||||
count=$(expr $count + 1)
|
||||
done
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
# Flatcar GRUB settings
|
||||
|
||||
set oem_id="interoute"
|
||||
@ -1,43 +0,0 @@
|
||||
#
|
||||
# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
|
||||
# Copyright (c) 2014 CoreOS, Inc.. All rights reserved.
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header:$
|
||||
#
|
||||
|
||||
EAPI=7
|
||||
|
||||
DESCRIPTION="OEM suite for Interoute images"
|
||||
HOMEPAGE=""
|
||||
SRC_URI=""
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
app-emulation/open-vm-tools
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
# no source directory
|
||||
S="${WORKDIR}"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \
|
||||
"${FILESDIR}/cloud-config.yml" > "${T}/cloud-config.yml" || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
into "/oem"
|
||||
dobin "${FILESDIR}/cloudstack-set-guest-password"
|
||||
dobin "${FILESDIR}/cloudstack-ssh-key"
|
||||
dobin "${FILESDIR}/cloudstack-coreos-cloudinit"
|
||||
dobin "${FILESDIR}/flatcar-setup-environment"
|
||||
|
||||
insinto "/oem"
|
||||
doins "${T}/cloud-config.yml"
|
||||
doins "${FILESDIR}/grub.cfg"
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
From 24b862a90711a3e1564cba7548defdcf5114ab0f Mon Sep 17 00:00:00 2001
|
||||
From 74ae0f953d21fea4368e6b007b0b4015aadd73c9 Mon Sep 17 00:00:00 2001
|
||||
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
|
||||
Date: Fri, 24 Feb 2023 09:08:13 +0100
|
||||
Subject: [PATCH 01/21] *: sed `s/coreos/flatcar/`
|
||||
@ -6355,5 +6355,5 @@ index bec64866..ed027604 100644
|
||||
|
||||
var (
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From d0ea026754fbd7ed889fa4af457308157c29570b Mon Sep 17 00:00:00 2001
|
||||
From b71a858e20878b09149f3b490e204aec738e2ed9 Mon Sep 17 00:00:00 2001
|
||||
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
|
||||
Date: Fri, 24 Feb 2023 09:13:33 +0100
|
||||
Subject: [PATCH 02/21] mod: add flatcar/ignition@0.36.2
|
||||
@ -41,5 +41,5 @@ index 85b3e34e..b109532e 100644
|
||||
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
|
||||
google.golang.org/appengine v1.6.7 // indirect
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 9efd744fd662898a459ba9a4e8ff9f60f57a16a2 Mon Sep 17 00:00:00 2001
|
||||
From e028524c08935766822c3a1760124a14f6eb090c Mon Sep 17 00:00:00 2001
|
||||
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
|
||||
Date: Fri, 24 Feb 2023 09:14:03 +0100
|
||||
Subject: [PATCH 03/21] sum: go mod tidy
|
||||
@ -119,5 +119,5 @@ index 087ef0ad..bb95e1fe 100644
|
||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From a9f374dae80f4a5f645d6612174fea0c7304436b Mon Sep 17 00:00:00 2001
|
||||
From 338d08aaa3a001b0c6c9ba07c8c987cde055a8a2 Mon Sep 17 00:00:00 2001
|
||||
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
|
||||
Date: Fri, 24 Feb 2023 09:14:24 +0100
|
||||
Subject: [PATCH 04/21] vendor: go mod vendor
|
||||
@ -17091,5 +17091,5 @@ index 9b01b083..1e050725 100644
|
||||
## explicit; go 1.17
|
||||
golang.org/x/net/context
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 2389f49fc382025631d0f650409692f306032883 Mon Sep 17 00:00:00 2001
|
||||
From d377780c3294d9a7f86d0e02296fffb1084323d1 Mon Sep 17 00:00:00 2001
|
||||
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
|
||||
Date: Mon, 26 Sep 2022 12:12:04 +0200
|
||||
Subject: [PATCH 05/21] config: add ignition translation
|
||||
@ -2621,5 +2621,5 @@ index 00000000..e81f6bed
|
||||
+ }
|
||||
+}
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 2d2b1b11cbe56702c09748f1a2d4afa19c4e30c0 Mon Sep 17 00:00:00 2001
|
||||
From ddbbaf9d0c3c997b0040d42e79055fc29bd63d19 Mon Sep 17 00:00:00 2001
|
||||
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
|
||||
Date: Wed, 25 May 2022 10:20:09 +0200
|
||||
Subject: [PATCH 06/21] config/v3_5: convert ignition 2.x to 3.x
|
||||
@ -72,5 +72,5 @@ index f0d4bb84..dccc5c4c 100644
|
||||
return Parse(raw)
|
||||
}
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From ab20557f947cf2f7c583b5938b7ab7f5d6fc0582 Mon Sep 17 00:00:00 2001
|
||||
From 049ed96101d50d0a5303d1b54b3e7fb8e543b513 Mon Sep 17 00:00:00 2001
|
||||
From: Mathieu Tortuyaux <mathieu@kinvolk.io>
|
||||
Date: Fri, 30 Jul 2021 14:21:31 +0200
|
||||
Subject: [PATCH 07/21] internal/prv/cmdline: backport flatcar patch
|
||||
@ -36,5 +36,5 @@ index f09e6fcb..b6de99d5 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 2cd551059f26f53efe469bed811117f9132ad783 Mon Sep 17 00:00:00 2001
|
||||
From acd94e7ce33771252491f25a0dcb0e45ad5b908a Mon Sep 17 00:00:00 2001
|
||||
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
|
||||
Date: Fri, 24 Feb 2023 09:40:01 +0100
|
||||
Subject: [PATCH 08/21] provider/qemu: apply fw_cfg patch
|
||||
@ -159,5 +159,5 @@ index f8bf820e..89515187 100644
|
||||
+ return types.Config{}, report.Report{}, iErrors.ErrEmpty
|
||||
}
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 904c831a553fbb1cf36b29cd80ed8839e1316c2e Mon Sep 17 00:00:00 2001
|
||||
From 63e54cff2a72f07ca5c3b15d507c552d681622aa Mon Sep 17 00:00:00 2001
|
||||
From: Mathieu Tortuyaux <mathieu@kinvolk.io>
|
||||
Date: Thu, 2 Sep 2021 11:03:17 +0200
|
||||
Subject: [PATCH 09/21] config/3_5/test: add ignition 2.x test cases
|
||||
@ -40,5 +40,5 @@ index 7e10866e..58423719 100644
|
||||
in: in{config: []byte(`{"ignition": {"version": "3.0.0"}}`)},
|
||||
out: out{config: types.Config{Ignition: types.Ignition{Version: types.MaxVersion.String()}}},
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From b97c1d2e96a66d6b7d02ff5c2535e9c34b6336e1 Mon Sep 17 00:00:00 2001
|
||||
From 35d2df7eb82eb83c015aaa714fd66ecddf65282b Mon Sep 17 00:00:00 2001
|
||||
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
|
||||
Date: Wed, 22 Sep 2021 14:53:49 +0200
|
||||
Subject: [PATCH 10/21] internal/disk/fs: ignore fs format mismatches for the
|
||||
@ -35,5 +35,5 @@ index 18103f38..72baf50d 100644
|
||||
(fs.UUID == nil || canonicalizeFilesystemUUID(info.Type, info.UUID) == canonicalizeFilesystemUUID(fileSystemFormat, *fs.UUID)) {
|
||||
s.Logger.Info("filesystem at %q is already correctly formatted. Skipping mkfs...", fs.Device)
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From d27cd61764a2386d1a15c5b0d176d4d311d62302 Mon Sep 17 00:00:00 2001
|
||||
From fb84b45f0499fc2cdc4cb7ea72cc7639bbcf7c98 Mon Sep 17 00:00:00 2001
|
||||
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
|
||||
Date: Wed, 25 May 2022 10:34:32 +0200
|
||||
Subject: [PATCH 11/21] VMware: Fix guestinfo.*.config.data and *.config.url
|
||||
@ -166,5 +166,5 @@ index b41b54bc..5a660b6c 100644
|
||||
|
||||
func DelConfig(f *resource.Fetcher) error {
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 9b4f7c3d346a41581bc13eaebe366528bfaaceeb Mon Sep 17 00:00:00 2001
|
||||
From 1c6a110cc09e7cc99f760628f70ad2c08acb64bd Mon Sep 17 00:00:00 2001
|
||||
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
|
||||
Date: Wed, 2 Feb 2022 13:27:18 +0100
|
||||
Subject: [PATCH 12/21] config/version: handle configuration version 1
|
||||
@ -49,5 +49,5 @@ index 3b9bb22f..f81056fa 100644
|
||||
return semver.Version{}, report.Report{}, errors.ErrInvalidVersion
|
||||
}
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 0370ca89e1fdcdcafcd0d1be5787272700f690bc Mon Sep 17 00:00:00 2001
|
||||
From a2ca1caba7445bf93c7bfd5d50c7c4f39054e2c6 Mon Sep 17 00:00:00 2001
|
||||
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
|
||||
Date: Tue, 22 Feb 2022 15:41:13 +0100
|
||||
Subject: [PATCH 13/21] config/util: add cloud init detection to initial
|
||||
@ -90,5 +90,5 @@ index 865d75d2..313d42ea 100644
|
||||
if err == nil {
|
||||
return report.Report{}, nil
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From fb26081aa46b3edd9d878630ef52aea2d4ea8613 Mon Sep 17 00:00:00 2001
|
||||
From 469c4eddc01603ae65f7bbbc3e8233e99f4ac902 Mon Sep 17 00:00:00 2001
|
||||
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
|
||||
Date: Wed, 25 May 2022 10:38:16 +0200
|
||||
Subject: [PATCH 14/21] Revert "*: drop OEM URI support"
|
||||
@ -509,5 +509,5 @@ index d5bd3fe7..ea4ff6ab 100644
|
||||
Env []string // Environment variables for Ignition
|
||||
Config string
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From ff3662f4364fb6f4d51d7d5e97b850db5e0ed3d2 Mon Sep 17 00:00:00 2001
|
||||
From c38cba8cd7303ec1d2d2559ba4e34fc52f1ca84a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Kai=20L=C3=BCke?= <kailuke@microsoft.com>
|
||||
Date: Wed, 7 Jul 2021 18:40:52 +0200
|
||||
Subject: [PATCH 15/21] internal/resource/url: support btrfs as OEM partition
|
||||
@ -35,5 +35,5 @@ index 3f5fb4ab..3fbda7a7 100644
|
||||
|
||||
return nil
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 7508b2275b19b8226fbeeed5e27f7fb9ca5023bb Mon Sep 17 00:00:00 2001
|
||||
From f39a78c6a9dd787c31fe02fbf098150b87c8cbc7 Mon Sep 17 00:00:00 2001
|
||||
From: Kai Lueke <kailuke@microsoft.com>
|
||||
Date: Fri, 11 Feb 2022 15:41:12 +0100
|
||||
Subject: [PATCH 16/21] internal/exec/stages/disks: prevent races with udev
|
||||
@ -193,5 +193,5 @@ index 41f98a41..d22f604c 100644
|
||||
|
||||
return nil
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 1e99b1eb24b6c6b00d3b6de9e8aa01e93696dcbf Mon Sep 17 00:00:00 2001
|
||||
From cf5ed759582236d6935eb9ab167f46671a7c038d Mon Sep 17 00:00:00 2001
|
||||
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
|
||||
Date: Thu, 10 Nov 2022 11:58:49 +0100
|
||||
Subject: [PATCH 17/21] translation: support OEM and oem
|
||||
@ -157,5 +157,5 @@ index e81f6bed..68c07109 100644
|
||||
+ }
|
||||
+}
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From cee296c017c4b654d637e38a81c1725b23338bc1 Mon Sep 17 00:00:00 2001
|
||||
From 31b8b62de7c0b617d03fc85b7190fb99048d941f Mon Sep 17 00:00:00 2001
|
||||
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
|
||||
Date: Wed, 21 Dec 2022 17:25:02 +0100
|
||||
Subject: [PATCH 18/21] revert: internal/oem: drop noop OEMs
|
||||
@ -7,11 +7,11 @@ This reverts: https://github.com/coreos/ignition/commit/26828f92e00060aa8ebf2197
|
||||
|
||||
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
|
||||
---
|
||||
internal/platform/platform.go | 28 ++++++++++++++++++++++++++++
|
||||
1 file changed, 28 insertions(+)
|
||||
internal/platform/platform.go | 24 ++++++++++++++++++++++++
|
||||
1 file changed, 24 insertions(+)
|
||||
|
||||
diff --git a/internal/platform/platform.go b/internal/platform/platform.go
|
||||
index 51bf5174..3169536c 100644
|
||||
index 51bf5174..64f6d364 100644
|
||||
--- a/internal/platform/platform.go
|
||||
+++ b/internal/platform/platform.go
|
||||
@@ -132,6 +132,10 @@ func init() {
|
||||
@ -25,7 +25,7 @@ index 51bf5174..3169536c 100644
|
||||
configs.Register(Config{
|
||||
name: "cloudstack",
|
||||
fetch: cloudstack.FetchConfig,
|
||||
@@ -152,10 +156,18 @@ func init() {
|
||||
@@ -152,6 +156,10 @@ func init() {
|
||||
name: "gcp",
|
||||
fetch: gcp.FetchConfig,
|
||||
})
|
||||
@ -36,15 +36,7 @@ index 51bf5174..3169536c 100644
|
||||
configs.Register(Config{
|
||||
name: "ibmcloud",
|
||||
fetch: ibmcloud.FetchConfig,
|
||||
})
|
||||
+ configs.Register(Config{
|
||||
+ name: "interoute",
|
||||
+ fetch: noop.FetchConfig,
|
||||
+ })
|
||||
configs.Register(Config{
|
||||
name: "kubevirt",
|
||||
fetch: kubevirt.FetchConfig,
|
||||
@@ -164,6 +176,10 @@ func init() {
|
||||
@@ -164,6 +172,10 @@ func init() {
|
||||
name: "metal",
|
||||
fetch: noop.FetchConfig,
|
||||
})
|
||||
@ -55,7 +47,7 @@ index 51bf5174..3169536c 100644
|
||||
configs.Register(Config{
|
||||
name: "nutanix",
|
||||
fetch: nutanix.FetchConfig,
|
||||
@@ -185,6 +201,18 @@ func init() {
|
||||
@@ -185,6 +197,18 @@ func init() {
|
||||
name: "qemu",
|
||||
fetch: qemu.FetchConfig,
|
||||
})
|
||||
@ -75,5 +67,5 @@ index 51bf5174..3169536c 100644
|
||||
name: "virtualbox",
|
||||
fetch: virtualbox.FetchConfig,
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
From 14e02dfa9ed7dd7d0d6e47960cf08011edb46861 Mon Sep 17 00:00:00 2001
|
||||
From 2325c44516e3a1e7ecadc0f0a04ad438d69319af Mon Sep 17 00:00:00 2001
|
||||
From: Krzesimir Nowak <knowak@microsoft.com>
|
||||
Date: Fri, 14 Apr 2023 11:37:20 +0200
|
||||
Subject: [PATCH 19/21] docs: Add re-added platforms to docs to pass tests
|
||||
|
||||
---
|
||||
docs/supported-platforms.md | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
docs/supported-platforms.md | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/docs/supported-platforms.md b/docs/supported-platforms.md
|
||||
index f7bb4b40..90df6c6a 100644
|
||||
index f7bb4b40..242296d0 100644
|
||||
--- a/docs/supported-platforms.md
|
||||
+++ b/docs/supported-platforms.md
|
||||
@@ -12,18 +12,25 @@ Ignition is currently only supported for the following platforms:
|
||||
@@ -12,18 +12,24 @@ Ignition is currently only supported for the following platforms:
|
||||
* [Microsoft Azure Stack] (`azurestack`) - Ignition will read its configuration from the custom data provided to the instance. Cloud SSH keys are handled separately.
|
||||
* Bare Metal - Use the `ignition.config.url` kernel parameter to provide a URL to the configuration. The URL can use the `http://`, `https://`, `tftp://`, `s3://`, or `gs://` schemes to specify a remote config or the `oem://` scheme to specify a local config, rooted in `/usr/share/oem`.
|
||||
* [Brightbox] (`brightbox`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately.
|
||||
@ -22,7 +22,6 @@ index f7bb4b40..90df6c6a 100644
|
||||
* [Google Cloud] (`gcp`) - Ignition will read its configuration from the instance metadata entry named "user-data". Cloud SSH keys are handled separately.
|
||||
+* `hyperv` - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately.
|
||||
* [IBM Cloud] (`ibmcloud`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately.
|
||||
+* `interoute` - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately.
|
||||
* [KubeVirt] (`kubevirt`) - Ignition will read its configuration from the instance userdata via config drive. Cloud SSH keys are handled separately.
|
||||
* Bare Metal (`metal`) - Use the `ignition.config.url` kernel parameter to provide a URL to the configuration. The URL can use the `http://`, `https://`, `tftp://`, `s3://`, `arn:`, or `gs://` schemes to specify a remote config.
|
||||
+* `niftycloud` - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately.
|
||||
@ -38,5 +37,5 @@ index f7bb4b40..90df6c6a 100644
|
||||
* [VMware] (`vmware`) - Use the VMware Guestinfo variables `ignition.config.data` and `ignition.config.data.encoding` to provide the config and its encoding to the virtual machine. Valid encodings are "", "base64", and "gzip+base64". Guestinfo variables can be provided directly or via an OVF environment, with priority given to variables specified directly.
|
||||
* [Vultr] (`vultr`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately.
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 080e4db8eabd64c12a049b9382c195675b16a189 Mon Sep 17 00:00:00 2001
|
||||
From b366b5c0e1e30e0743d387d6f5f100214149293e Mon Sep 17 00:00:00 2001
|
||||
From: Krzesimir Nowak <knowak@microsoft.com>
|
||||
Date: Tue, 4 Apr 2023 12:12:42 +0200
|
||||
Subject: [PATCH 20/21] /usr/share/oem -> /oem
|
||||
@ -23,7 +23,7 @@ index 347d148c..d4c057b2 100644
|
||||
// generate a new path
|
||||
fsMap[name] = "/tmp/" + name + "-ign" + strconv.FormatUint(addedSuffixCounter, 10)
|
||||
diff --git a/docs/supported-platforms.md b/docs/supported-platforms.md
|
||||
index 90df6c6a..7867ba09 100644
|
||||
index 242296d0..4ba98af5 100644
|
||||
--- a/docs/supported-platforms.md
|
||||
+++ b/docs/supported-platforms.md
|
||||
@@ -10,7 +10,7 @@ Ignition is currently only supported for the following platforms:
|
||||
@ -52,5 +52,5 @@ index 644c42c4..9e96166e 100644
|
||||
|
||||
// Helper programs
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From d5fc344638287f835bf7d4793b46f166c7277950 Mon Sep 17 00:00:00 2001
|
||||
From 0fe25f0aae40f2fe273dd48bdc9fe9c051471af8 Mon Sep 17 00:00:00 2001
|
||||
From: Krzesimir Nowak <knowak@microsoft.com>
|
||||
Date: Tue, 16 May 2023 17:43:43 +0200
|
||||
Subject: [PATCH 21/21] internal/exec/stages/mount: Mount /oem
|
||||
@ -28,5 +28,5 @@ index 8074dbe6..b8cdc5cb 100644
|
||||
if err := checkForNonDirectories(path); err != nil {
|
||||
return err
|
||||
--
|
||||
2.34.1
|
||||
2.25.1
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user