From cc9e9996c3863767330d8b10bd955a1d48923fd4 Mon Sep 17 00:00:00 2001
From: Florian Haas <florian@citynetwork.eu>
Date: Thu, 8 Nov 2018 10:32:55 +0100
Subject: [PATCH] Reset ceph-ansible to the current HEAD of stable-3.1

* Instead of pointing at v3.2.0beta1-130, use the current HEAD of
  stable-3.1.
* Add a release note detailing specific considerations
  related to this change.
* Bump openstack_release to 18.1.0.

Change-Id: Ibd8f64d9889009cf6e80b92254fd580ff559b1be
Closes-Bug: 1802195
---
 ansible-role-requirements.yml                 |  2 +-
 inventory/group_vars/all/all.yml              |  2 +-
 .../ceph-stable-3.1-12985e1446665872.yaml     | 21 +++++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/ceph-stable-3.1-12985e1446665872.yaml

diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml
index 596f6dde7b..a771ff113e 100644
--- a/ansible-role-requirements.yml
+++ b/ansible-role-requirements.yml
@@ -185,7 +185,7 @@
 - name: ceph-ansible
   scm: git
   src: https://github.com/ceph/ceph-ansible
-  version: 217f35dbdb5036274be4674e9b0be2127b8875d7
+  version: a5aca6ebbc341feb34b9ec0d73e16aeeedae63ac
 - name: opendaylight
   scm: git
   src: https://github.com/opendaylight/integration-packaging-ansible-opendaylight
diff --git a/inventory/group_vars/all/all.yml b/inventory/group_vars/all/all.yml
index bb0d7f8385..5fcfe480f0 100644
--- a/inventory/group_vars/all/all.yml
+++ b/inventory/group_vars/all/all.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 ## OpenStack Source Code Release
-openstack_release: 18.0.1
+openstack_release: 18.1.0
 
 ## Verbosity Options
 debug: False
diff --git a/releasenotes/notes/ceph-stable-3.1-12985e1446665872.yaml b/releasenotes/notes/ceph-stable-3.1-12985e1446665872.yaml
new file mode 100644
index 0000000000..0f171af4f3
--- /dev/null
+++ b/releasenotes/notes/ceph-stable-3.1-12985e1446665872.yaml
@@ -0,0 +1,21 @@
+---
+issues:
+  - The original ``stable/rocky`` release (18.0.x) contained a
+    reference to a pre-release state of the ceph-ansible role (its
+    3.2.0beta1 release). That role --- and hence, any OpenStack-Ansible
+    ``stable/rocky`` release prior to 18.1.0 --- should not be used to
+    deploy production Ceph clusters. As of this release,
+    ``stable/rocky`` tracks the ceph-ansible role's ``stable-3.1``
+    branch.
+upgrade:
+  - Configurations using the ``ceph-ansible`` role (that is, those
+    applying the ``ceph-install.yml`` or ``ceph-rgw-install.yml``
+    playbooks) should be very carefully reviewed if you are upgrading
+    from prior ``stable/rocky`` releases. Those releases shipped a
+    pre-release version of ``ceph-ansible`` that was unintentionally
+    included in ``ansible-role-requirements.yml``.
+fixes:
+  - The ``ansible-role-requirements.yml`` reference to the
+    ``ceph-ansible`` role has been fixed to refer to the current
+    ``HEAD`` of that role's ``stable-3.1`` branch. It previously
+    pointed to the pre-release 3.2.0beta1 version.
\ No newline at end of file