From 02a172994e13ff950607d5f9e6ad51a1afec765a Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Wed, 4 Jul 2018 11:16:04 -0700 Subject: [PATCH] Update Fedora Atomic from 27 to 28 on bare-metal --- CHANGES.md | 4 +++ .../kickstart/fedora-atomic.ks.tmpl | 4 +-- .../fedora-atomic/kubernetes/profiles.tf | 2 +- .../fedora-atomic/kubernetes/variables.tf | 2 +- docs/atomic/bare-metal.md | 27 ++++++++++--------- 5 files changed, 22 insertions(+), 17 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 7461eead4..0715f2ea1 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -13,6 +13,10 @@ Notable changes between versions. * Update from Fedora Atomic 27 to 28 ([#258](https://github.com/poseidon/typhoon/pull/258)) +#### Bare-Metal + +* Update from Fedora Atomic 27 to 28 ([#263](https://github.com/poseidon/typhoon/pull/263)) + #### Google * Promote Google Cloud to stable diff --git a/bare-metal/fedora-atomic/kubernetes/kickstart/fedora-atomic.ks.tmpl b/bare-metal/fedora-atomic/kubernetes/kickstart/fedora-atomic.ks.tmpl index 19cdcbcd7..66e80a7cc 100644 --- a/bare-metal/fedora-atomic/kubernetes/kickstart/fedora-atomic.ks.tmpl +++ b/bare-metal/fedora-atomic/kubernetes/kickstart/fedora-atomic.ks.tmpl @@ -17,7 +17,7 @@ network --bootproto=dhcp --device=link --activate --onboot=on bootloader --timeout=1 --append="ds=nocloud\;seedfrom=/var/cloud-init/" services --enabled=cloud-init,cloud-init-local,cloud-config,cloud-final -ostreesetup --osname="fedora-atomic" --remote="fedora-atomic" --url="${atomic_assets_endpoint}/repo" --ref=fedora/27/x86_64/atomic-host --nogpg +ostreesetup --osname="fedora-atomic" --remote="fedora-atomic" --url="${atomic_assets_endpoint}/repo" --ref=fedora/28/x86_64/atomic-host --nogpg reboot @@ -27,7 +27,7 @@ curl --retry 10 "${matchbox_http_endpoint}/generic?mac=${mac}&os=installed" -o / echo "instance-id: iid-local01" > /var/cloud-init/meta-data rm -f /etc/ostree/remotes.d/fedora-atomic.conf -ostree remote add fedora-atomic https://kojipkgs.fedoraproject.org/atomic/27 --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-27-primary +ostree remote add fedora-atomic https://dl.fedoraproject.org/atomic/repo/ --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-28-primary # lock root user passwd -l root diff --git a/bare-metal/fedora-atomic/kubernetes/profiles.tf b/bare-metal/fedora-atomic/kubernetes/profiles.tf index 3409cfc2e..bdaf13d34 100644 --- a/bare-metal/fedora-atomic/kubernetes/profiles.tf +++ b/bare-metal/fedora-atomic/kubernetes/profiles.tf @@ -1,5 +1,5 @@ locals { - default_assets_endpoint = "${var.matchbox_http_endpoint}/assets/fedora/27" + default_assets_endpoint = "${var.matchbox_http_endpoint}/assets/fedora/28" atomic_assets_endpoint = "${var.atomic_assets_endpoint != "" ? var.atomic_assets_endpoint : local.default_assets_endpoint}" } diff --git a/bare-metal/fedora-atomic/kubernetes/variables.tf b/bare-metal/fedora-atomic/kubernetes/variables.tf index 5e3205209..110bbe382 100644 --- a/bare-metal/fedora-atomic/kubernetes/variables.tf +++ b/bare-metal/fedora-atomic/kubernetes/variables.tf @@ -17,7 +17,7 @@ variable "atomic_assets_endpoint" { description = <