diff --git a/0001-sshkeys-activate-service-on-OpenStack.patch b/0001-sshkeys-activate-service-on-OpenStack.patch new file mode 100644 index 0000000..916e49f --- /dev/null +++ b/0001-sshkeys-activate-service-on-OpenStack.patch @@ -0,0 +1,29 @@ +From b6f82c63b26bc0e9447b7f58829ddf9cce9e21ca Mon Sep 17 00:00:00 2001 +From: Luca BRUNO +Date: Mon, 28 Sep 2020 16:11:31 +0000 +Subject: [PATCH] sshkeys: activate service on OpenStack + +This adds triggering condition to SSH-keys service units on OpenStack. +--- + systemd/afterburn-sshkeys@.service.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/systemd/afterburn-sshkeys@.service.in b/systemd/afterburn-sshkeys@.service.in +index 741ca25..bee9b4a 100644 +--- a/systemd/afterburn-sshkeys@.service.in ++++ b/systemd/afterburn-sshkeys@.service.in +@@ -11,9 +11,10 @@ ConditionKernelCommandLine=|ignition.platform.id=azure + ConditionKernelCommandLine=|ignition.platform.id=digitalocean + ConditionKernelCommandLine=|ignition.platform.id=exoscale + ConditionKernelCommandLine=|ignition.platform.id=gcp ++ConditionKernelCommandLine=|ignition.platform.id=ibmcloud ++ConditionKernelCommandLine=|ignition.platform.id=openstack + ConditionKernelCommandLine=|ignition.platform.id=packet + ConditionKernelCommandLine=|ignition.platform.id=vultr +-ConditionKernelCommandLine=|ignition.platform.id=ibmcloud + + [Service] + Type=oneshot +-- +2.28.0 + diff --git a/rust-afterburn.spec b/rust-afterburn.spec index 7108164..cdac27f 100644 --- a/rust-afterburn.spec +++ b/rust-afterburn.spec @@ -8,7 +8,7 @@ Name: rust-%{crate} Version: 4.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Simple cloud provider agent # Upstream license specification: Apache-2.0 @@ -17,6 +17,8 @@ URL: https://crates.io/crates/afterburn Source: %{crates_source} # Initial patched metadata Patch0: afterburn-fix-metadata.diff +# https://github.com/coreos/afterburn/pull/493 +Patch1: 0001-sshkeys-activate-service-on-OpenStack.patch ExclusiveArch: %{rust_arches} @@ -114,6 +116,10 @@ cp -a dracut/* %{buildroot}%{dracutmodulesdir} %endif %changelog +* Wed Oct 14 2020 Dusty Mabe - 4.5.1-3 +- Backport patch to get afterburn sshkeys working on openstack. + - https://github.com/coreos/afterburn/pull/493 + * Wed Sep 30 2020 Fabio Valentini - 4.5.1-2 - Un-downgrade mockito to 0.27.