From 5b3e5a74e1395a02bd4c9bc36f5b1a5d67da5c24 Mon Sep 17 00:00:00 2001 From: Logan V Date: Wed, 13 Sep 2017 16:09:49 -0500 Subject: [PATCH] Upgrade ceph release to Luminous The Pike UCA repo has been bumped to include the recently released Ceph LTS, Luminous (12.x). Since the UCA repo is installed almost globally in our deployment, this creates package conflicts when we attempt to deploy the former Ceph LTS, Jewel (10.x) releases. We will bump our Ceph stable release to the Luminous release for Pike and later to avoid the package conflicts with UCA. This also adds the ceph-mgr role execution since the ceph-mgr service is required in Luminous. See http://docs.ceph.com/docs/master/mgr/ for more information. Change-Id: Ia3e2cd4eccf19f37442978ffe90cb54806b0a14b --- ansible-role-requirements.yml | 4 ++++ group_vars/all/ceph.yml | 3 ++- playbooks/ceph-install.yml | 3 +++ releasenotes/notes/ceph-luminous-d1ff5c08452a9887.yaml | 9 +++++++++ 4 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/ceph-luminous-d1ff5c08452a9887.yaml diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index 71889b5564..f18431f7ea 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -182,6 +182,10 @@ scm: git src: https://github.com/ceph/ansible-ceph-mon version: 235ea7526a2bb621317b5263f3841deef7ab49e6 +- name: ceph-mgr + scm: git + src: https://github.com/ceph/ansible-ceph-mgr + version: d9ddb83bae6b054549efa1c96b0a37c63073ebea - name: ceph-osd scm: git src: https://github.com/ceph/ansible-ceph-osd diff --git a/group_vars/all/ceph.yml b/group_vars/all/ceph.yml index aa5e3ae6cc..1be431822d 100644 --- a/group_vars/all/ceph.yml +++ b/group_vars/all/ceph.yml @@ -17,12 +17,13 @@ ceph_client_package_state: "{{ package_state }}" ## ceph-ansible configuration mon_group_name: ceph-mon +mgr_group_name: "{{ mon_group_name }}" osd_group_name: ceph-osd ceph_stable: true # The _stable_release var is used by both the OSA ceph_client role and the # ceph-ansible roles. It is defaulted in ceph_client but set here to keep the # OSA/ceph-ansible integrations in sync. -ceph_stable_release: jewel +ceph_stable_release: luminous fetch_directory: /etc/openstack_deploy/ceph-fetch/ # tries to create /var/log/ceph as a directory and fails if the log link already # exists. we handle the log dir creation so this is not something we need diff --git a/playbooks/ceph-install.yml b/playbooks/ceph-install.yml index ea406dabe6..e649bd2184 100644 --- a/playbooks/ceph-install.yml +++ b/playbooks/ceph-install.yml @@ -87,6 +87,9 @@ - role: "ceph-mon" tags: - skip_ansible_lint + - role: "ceph-mgr" + tags: + - skip_ansible_lint - role: "rsyslog_client" rsyslog_client_log_rotate_file: ceph_log_rotate rsyslog_client_log_dir: "/var/log/ceph" diff --git a/releasenotes/notes/ceph-luminous-d1ff5c08452a9887.yaml b/releasenotes/notes/ceph-luminous-d1ff5c08452a9887.yaml new file mode 100644 index 0000000000..3cdc17fa45 --- /dev/null +++ b/releasenotes/notes/ceph-luminous-d1ff5c08452a9887.yaml @@ -0,0 +1,9 @@ +--- +features: + - The Ceph stable release used by openstack-ansible and its ceph-ansible + integration has been changed to the recent `Ceph LTS + `_ Luminous release. +upgrade: + - The Ceph stable release used by openstack-ansible and its ceph-ansible + integration has been changed to the recent `Ceph LTS + `_ Luminous release.