From 88c6296fa20761b75348cdbeb7cdeabf6f77296d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Thu, 2 Mar 2017 14:59:21 +0100 Subject: [PATCH] rgw: remove sudoers file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was needed for Hammer and older version, not needed anymore since we have a 'ceph' user to run ceph processes. Signed-off-by: Sébastien Han --- group_vars/rgws.yml.sample | 5 ----- roles/ceph-rgw/defaults/main.yml | 5 ----- roles/ceph-rgw/tasks/pre_requisite.yml | 9 --------- roles/ceph-rgw/templates/ceph.j2 | 2 -- 4 files changed, 21 deletions(-) delete mode 100644 roles/ceph-rgw/templates/ceph.j2 diff --git a/group_vars/rgws.yml.sample b/group_vars/rgws.yml.sample index 61152debc..21ea8d9cf 100644 --- a/group_vars/rgws.yml.sample +++ b/group_vars/rgws.yml.sample @@ -25,11 +25,6 @@ dummy: # #cephx: true -# Used for the sudo exception while starting the radosgw process -# a new entry /etc/sudoers.d/ceph will be created -# allowing root to not require tty -#radosgw_user: root - # Multi-site remote pull URL variables #rgw_pull_port: "{{ radosgw_civetweb_port }}" #rgw_pull_proto: "http" diff --git a/roles/ceph-rgw/defaults/main.yml b/roles/ceph-rgw/defaults/main.yml index fb07dd456..599870f46 100644 --- a/roles/ceph-rgw/defaults/main.yml +++ b/roles/ceph-rgw/defaults/main.yml @@ -17,11 +17,6 @@ copy_admin_key: false # cephx: true -# Used for the sudo exception while starting the radosgw process -# a new entry /etc/sudoers.d/ceph will be created -# allowing root to not require tty -radosgw_user: root - # Multi-site remote pull URL variables rgw_pull_port: "{{ radosgw_civetweb_port }}" rgw_pull_proto: "http" diff --git a/roles/ceph-rgw/tasks/pre_requisite.yml b/roles/ceph-rgw/tasks/pre_requisite.yml index 57a1bf3b0..f80d14a4c 100644 --- a/roles/ceph-rgw/tasks/pre_requisite.yml +++ b/roles/ceph-rgw/tasks/pre_requisite.yml @@ -40,12 +40,3 @@ group: "ceph" mode: "0600" when: cephx - -- name: generate rados gateway sudoers file - template: - src: ceph.j2 - dest: /etc/sudoers.d/ceph - owner: root - group: root - mode: 0400 - when: ansible_distribution != "Ubuntu" diff --git a/roles/ceph-rgw/templates/ceph.j2 b/roles/ceph-rgw/templates/ceph.j2 deleted file mode 100644 index d0d31dc00..000000000 --- a/roles/ceph-rgw/templates/ceph.j2 +++ /dev/null @@ -1,2 +0,0 @@ -# {{ ansible_managed }} -Defaults:{{ radosgw_user }} !requiretty