Update ceph release to octopus
We do not install ceph-mgr for CentOS7 as it's not supported upstream. Depends-On: https://review.opendev.org/729329 Change-Id: I5efdae4de2b52fe7048c77066a6e17ce0b3b0031
This commit is contained in:
parent
9ff56201c9
commit
2679b80f2b
@ -276,8 +276,8 @@
|
|||||||
- name: ceph-ansible
|
- name: ceph-ansible
|
||||||
scm: git
|
scm: git
|
||||||
src: https://github.com/ceph/ceph-ansible
|
src: https://github.com/ceph/ceph-ansible
|
||||||
version: stable-4.0
|
version: stable-5.0
|
||||||
trackbranch: stable-4.0
|
trackbranch: stable-5.0
|
||||||
- name: opendaylight
|
- name: opendaylight
|
||||||
scm: git
|
scm: git
|
||||||
src: https://github.com/opendaylight/integration-packaging-ansible-opendaylight
|
src: https://github.com/opendaylight/integration-packaging-ansible-opendaylight
|
||||||
|
@ -27,7 +27,7 @@ ceph_repository: community
|
|||||||
# The _stable_release var is used by both the OSA ceph_client role and the
|
# 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
|
# ceph-ansible roles. It is defaulted in ceph_client but set here to keep the
|
||||||
# OSA/ceph-ansible integrations in sync.
|
# OSA/ceph-ansible integrations in sync.
|
||||||
ceph_stable_release: nautilus
|
ceph_stable_release: octopus
|
||||||
fetch_directory: "{{ openstack_config_dir }}/ceph-fetch/"
|
fetch_directory: "{{ openstack_config_dir }}/ceph-fetch/"
|
||||||
# tries to create /var/log/ceph as a directory and fails if the log link already
|
# 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
|
# exists. we handle the log dir creation so this is not something we need
|
||||||
|
@ -33,7 +33,6 @@ ceph_conf_overrides: "{{ (ceph_conf_overrides_rgw | default({})) | combine(ceph_
|
|||||||
nfs_file_gw: "{{ (('ceph-nfs' in groups) and ('ceph-mds' in groups)) }}"
|
nfs_file_gw: "{{ (('ceph-nfs' in groups) and ('ceph-mds' in groups)) }}"
|
||||||
nfs_obj_gw: False
|
nfs_obj_gw: False
|
||||||
nfs_ganesha_stable: "{{ (ansible_distribution_release != 'bionic') }}"
|
nfs_ganesha_stable: "{{ (ansible_distribution_release != 'bionic') }}"
|
||||||
nfs_ganesha_stable_branch: V2.8-stable
|
|
||||||
|
|
||||||
# NTP in an OSA environment is handled by ansible-hardening using chrony
|
# NTP in an OSA environment is handled by ansible-hardening using chrony
|
||||||
# ceph-ansible's default enabling of ntpd conflicts with the OSA defaults
|
# ceph-ansible's default enabling of ntpd conflicts with the OSA defaults
|
||||||
@ -65,3 +64,4 @@ openstack_cephfs_metadata_pool:
|
|||||||
|
|
||||||
cephfs_data_pool: "{{ openstack_cephfs_data_pool }}"
|
cephfs_data_pool: "{{ openstack_cephfs_data_pool }}"
|
||||||
cephfs_metadata_pool: "{{ openstack_cephfs_metadata_pool }}"
|
cephfs_metadata_pool: "{{ openstack_cephfs_metadata_pool }}"
|
||||||
|
dashboard_enabled: "{{ not (ansible_os_family | lower == 'redhat' and ansible_distribution_major_version is version('7', '=')) }}"
|
||||||
|
@ -40,3 +40,25 @@
|
|||||||
apt_pinned_packages: [{ package: '*', release: 'ceph.com' }]
|
apt_pinned_packages: [{ package: '*', release: 'ceph.com' }]
|
||||||
when:
|
when:
|
||||||
- ansible_pkg_mgr == 'apt'
|
- ansible_pkg_mgr == 'apt'
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# We need to have PyYAML for ceph-ansible roles
|
||||||
|
- block:
|
||||||
|
- name: Install python3-yaml
|
||||||
|
package:
|
||||||
|
name: "{{ (ansible_os_family | lower == 'debian') | ternary('python3-yaml', 'python3-pyyaml') }}"
|
||||||
|
state: present
|
||||||
|
# Rescue is mainly for CentOS 7
|
||||||
|
rescue:
|
||||||
|
# Installing both pip's not to fail
|
||||||
|
- name: Installing pip
|
||||||
|
package:
|
||||||
|
name:
|
||||||
|
- python-pip
|
||||||
|
- python3-pip
|
||||||
|
state: present
|
||||||
|
|
||||||
|
- name: Install PyYAML
|
||||||
|
pip:
|
||||||
|
name: PyYAML
|
||||||
|
@ -15,9 +15,7 @@
|
|||||||
|
|
||||||
ceph_conf_overrides:
|
ceph_conf_overrides:
|
||||||
global:
|
global:
|
||||||
log_file: none
|
|
||||||
log_to_syslog: true
|
log_to_syslog: true
|
||||||
err_to_syslog: true
|
err_to_syslog: true
|
||||||
mon:
|
mon:
|
||||||
mon_cluster_log_to_syslog: true
|
mon_cluster_log_to_syslog: true
|
||||||
mon_cluster_log_file: none
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user