From 273159da4ca729caa008a65d27c22e4add233d70 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Fri, 17 Jul 2020 19:55:25 +0200
Subject: [PATCH] Include changelogs/changelog.yaml in distribution. (#70260)
 (#70266)

(cherry picked from commit ebd20ddca66224e4614a031ccc972452dcc0dd20)
---
 MANIFEST.in                             | 1 +
 changelogs/fragments/changelog-yaml.yml | 2 ++
 test/sanity/code-smell/package-data.py  | 1 -
 3 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/fragments/changelog-yaml.yml

diff --git a/MANIFEST.in b/MANIFEST.in
index cae39e21d78..1b421d00ce2 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -32,5 +32,6 @@ recursive-include test/units *
 include Makefile
 include MANIFEST.in
 include changelogs/CHANGELOG*.rst
+include changelogs/changelog.yaml
 recursive-include hacking/build_library *.py
 include hacking/build-ansible.py
diff --git a/changelogs/fragments/changelog-yaml.yml b/changelogs/fragments/changelog-yaml.yml
new file mode 100644
index 00000000000..7db9c363c66
--- /dev/null
+++ b/changelogs/fragments/changelog-yaml.yml
@@ -0,0 +1,2 @@
+bugfixes:
+- "The machine-readable changelog ``changelogs/changelog.yaml`` is now contained in the release."
diff --git a/test/sanity/code-smell/package-data.py b/test/sanity/code-smell/package-data.py
index 4ef0be3c978..37f243bec13 100755
--- a/test/sanity/code-smell/package-data.py
+++ b/test/sanity/code-smell/package-data.py
@@ -37,7 +37,6 @@ def assemble_files_to_ship(complete_file_list):
     ignore_files = frozenset((
         # Developer-only tools
         'changelogs/config.yaml',
-        'changelogs/changelog.yaml',
         'hacking/README.md',
         'hacking/ansible-profile',
         'hacking/cgroup_perf_recap_graph.py',