From 8ebf4e7a72b55f9d7a49195ed7398e9059c82cf0 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 16 Sep 2019 14:53:41 +0000
Subject: [PATCH] manifest: Move versioning and fedora-coreos-pinger to
 toplevel

The version numbering is more clearly `fedora-coreos` level.
Similarly, I think we only want `fedora-coreos-pinger` for
things that are actually FCOS.
---
 fedora-coreos-base.yaml |  6 ------
 fedora-coreos.yaml      | 10 ++++++++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/fedora-coreos-base.yaml b/fedora-coreos-base.yaml
index f79c9ac62c..58c997c75f 100644
--- a/fedora-coreos-base.yaml
+++ b/fedora-coreos-base.yaml
@@ -18,10 +18,6 @@ initramfs-args:
   - --omit=multipath
   - --omit=iscsi
 
-releasever: "30"
-automatic-version-prefix: "${releasever}.<date:%Y%m%d>.dev"
-mutate-os-release: "${releasever}"
-
 # Be minimal
 recommends: false
 
@@ -141,8 +137,6 @@ packages:
   - whois-nls
   # Updates
   - zincati
-  # User metrics
-  - fedora-coreos-pinger
   # Parsing/Interacting with JSON data
   - jq
 
diff --git a/fedora-coreos.yaml b/fedora-coreos.yaml
index b844e5209b..facb968b5b 100644
--- a/fedora-coreos.yaml
+++ b/fedora-coreos.yaml
@@ -1,8 +1,18 @@
+# This manifest file defines things that should really only go
+# into "official" builds of Fedora CoreOS (such as including `fedora-release-coreos`)
+# or are very "opinionated" like disabling SSH passwords by default.
+
 include: fedora-coreos-base.yaml
 
+releasever: "30"
+automatic-version-prefix: "${releasever}.<date:%Y%m%d>.dev"
+mutate-os-release: "${releasever}"
+
 packages:
   - fedora-release-coreos
   - fedora-repos-ostree
+  # User metrics
+  - fedora-coreos-pinger
 
 # XXX: this is used by coreos-assembler for artifact naming...
 rojig: