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.