From e6b5deef9fbd99a8a8843c9c798ed66f6b623c98 Mon Sep 17 00:00:00 2001
From: James Slagle <jslagle@redhat.com>
Date: Tue, 22 Oct 2019 19:51:24 -0400
Subject: [PATCH] Deprecate deployed-server-roles-data.yaml

This roles file is now the same content as roles_data.yaml as no special
roles are needed for deployed-server. The file is now deprecated.

Note that the intent is to backport this patch to stable/train.

Change-Id: I9407cac224bfba6ae1c6477ff55f2c15937bcd10
---
 deployed-server/deployed-server-roles-data.yaml             | 6 +++---
 ...recated-deployed-server-roles-data-464b3147ae7434d3.yaml | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/deprecated-deployed-server-roles-data-464b3147ae7434d3.yaml

diff --git a/deployed-server/deployed-server-roles-data.yaml b/deployed-server/deployed-server-roles-data.yaml
index adfa478223..7f59f89246 100644
--- a/deployed-server/deployed-server-roles-data.yaml
+++ b/deployed-server/deployed-server-roles-data.yaml
@@ -1,6 +1,6 @@
-###############################################################################
-# File generated by TripleO
-###############################################################################
+# DEPRECATED: The deployed-server-roles-data.yaml file is deprecated in train
+# and will be removed in ussuri. It's contents are now the same as
+# roles_data.yaml.
 ###############################################################################
 # Role: Controller                                                            #
 ###############################################################################
diff --git a/releasenotes/notes/deprecated-deployed-server-roles-data-464b3147ae7434d3.yaml b/releasenotes/notes/deprecated-deployed-server-roles-data-464b3147ae7434d3.yaml
new file mode 100644
index 0000000000..e19b6b0167
--- /dev/null
+++ b/releasenotes/notes/deprecated-deployed-server-roles-data-464b3147ae7434d3.yaml
@@ -0,0 +1,6 @@
+---
+deprecations:
+  - |
+    The roles file at deployed-server/deployed-server-roles-data.yaml is
+    deprecated in train. It's contents are the same as roles_data.yaml, and no
+    special roles files are needed when using deployed-server.