rgw: remove sudoers file

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 <seb@redhat.com>

diff --git a/group_vars/rgws.yml.sample b/group_vars/rgws.yml.sample
index 61152debc7a728c95cbd5bcf7649a5c4d66f66cf..21ea8d9cf5e1382f842a41804f8d74c31bf1d395 100644 (file)
--- 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 fb07dd456ab1ab553899d7d27be4eafbfbc45754..599870f466e75af9d38b1f7b96720ed36da9a65e 100644 (file)
--- 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 57a1bf3b0c092d34a90705b67ab6564dac1927ac..f80d14a4c6df8205ad8dba96250d833fdfa0efa3 100644 (file)
--- 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 (file)
index d0d31dc..0000000
--- a/roles/ceph-rgw/templates/ceph.j2
+++ /dev/null
@@ -1,2 +0,0 @@
-# {{ ansible_managed }}
-Defaults:{{ radosgw_user }} !requiretty