Merge pull request #255 from mvollman/CEPHSTORA-441

rcbops · Oct 25, 2018 · f562258 · f562258
2 parents 08c2cd7 + c8869f6
commit f562258
Show file tree

Hide file tree

Showing 14 changed files with 604 additions and 205 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ versions of ``ceph-ansible`` used in RPC deployments.
 
 ## Current versions of ceph-ansible & Ansible
 
-### **ceph-ansible version:** v3.0.46
+### **ceph-ansible version:** v3.1.9
 
 ### **Ansible version:** 2.4.4.0
 

diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml
@@ -1,7 +1,7 @@
 - name: ceph-ansible
   scm: git
   src: https://github.com/ceph/ceph-ansible
-  version: v3.0.46
+  version: v3.1.9
 - name: rsyslog_client
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client

diff --git a/gating/update_dependencies/run b/gating/update_dependencies/run
@@ -4,7 +4,7 @@ set -ex
 ## For use when updating the versions of upstream projects inside rpc-ceph.
 ## NB This will NOT upgrade a deployed environment, and should not be used in
 ## production
-CEPH_MAJOR_VERSION="v3\.0"
+CEPH_MAJOR_VERSION="v3\.1"
 OSA_MAJOR_VERSION="17\."
 export REL_NOTE_FILE="IHaventCreatedOneYet"
 

diff --git a/inventory-sample b/inventory-sample
@@ -14,4 +14,3 @@
 
 [all:vars]
 ansible_ssh_extra_args=-o BatchMode=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null
-ansible_python_interpreter=/usr/bin/python3
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,4 +14,3 @@

		[all:vars]
		ansible_ssh_extra_args=-o BatchMode=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null
		ansible_python_interpreter=/usr/bin/python3