From: Dimitri Savineau Date: Wed, 12 Feb 2020 19:34:30 +0000 (-0500) Subject: ceph-defaults: remove bootstrap_dirs_xxx vars X-Git-Tag: v4.0.15~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=df43f322489f7093c7eec0cc2dd336fa7e8f71fb;p=ceph-ansible.git ceph-defaults: remove bootstrap_dirs_xxx vars Both bootstrap_dirs_owner and bootstrap_dirs_group variables aren't used anymore in the code. Signed-off-by: Dimitri Savineau (cherry picked from commit c644ea904108b302a40f3ced77cf5a6ccaee6fa4) --- diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 34778b97f..41c972fb1 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -101,13 +101,6 @@ dummy: # Note that this selection is currently ignored on containerized deployments #ntp_daemon_type: chronyd - -# Set uid/gid to default '64045' for bootstrap directories. -# '64045' is used for debian based distros. It must be set to 167 in case of rhel based distros. -# These values have to be set according to the base OS used by the container image, NOT the host. -#bootstrap_dirs_owner: "64045" -#bootstrap_dirs_group: "64045" - # This variable determines if ceph packages can be updated. If False, the # package resources will use "state=present". If True, they will use # "state=latest". diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample index e1a0a6f58..654f551d1 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -101,13 +101,6 @@ fetch_directory: ~/ceph-ansible-keys # Note that this selection is currently ignored on containerized deployments #ntp_daemon_type: chronyd - -# Set uid/gid to default '64045' for bootstrap directories. -# '64045' is used for debian based distros. It must be set to 167 in case of rhel based distros. -# These values have to be set according to the base OS used by the container image, NOT the host. -#bootstrap_dirs_owner: "64045" -#bootstrap_dirs_group: "64045" - # This variable determines if ceph packages can be updated. If False, the # package resources will use "state=present". If True, they will use # "state=latest". diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml index 9f74fc1ce..87d64ac9e 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -93,13 +93,6 @@ ntp_service_enabled: true # Note that this selection is currently ignored on containerized deployments ntp_daemon_type: chronyd - -# Set uid/gid to default '64045' for bootstrap directories. -# '64045' is used for debian based distros. It must be set to 167 in case of rhel based distros. -# These values have to be set according to the base OS used by the container image, NOT the host. -bootstrap_dirs_owner: "64045" -bootstrap_dirs_group: "64045" - # This variable determines if ceph packages can be updated. If False, the # package resources will use "state=present". If True, they will use # "state=latest".