From: Sébastien Han <seb@redhat.com>
Date: Mon, 3 Aug 2015 21:53:08 +0000 (+0200)
Subject: Fix the sudoer template
X-Git-Tag: v1.0.0~137^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f671e91e6195cb903cba4438adc15885d395f29c;p=ceph-ansible.git

Fix the sudoer template

+ cleanup the docker.yml from OSD.

Signed-off-by: Sébastien Han <seb@redhat.com>
---

diff --git a/roles/ceph-common/templates/ceph.j2 b/roles/ceph-common/templates/ceph.j2
deleted file mode 100644
index d0d31dc00..000000000
--- a/roles/ceph-common/templates/ceph.j2
+++ /dev/null
@@ -1,2 +0,0 @@
-# {{ ansible_managed }}
-Defaults:{{ radosgw_user }} !requiretty
diff --git a/roles/ceph-osd/tasks/scenarios/docker.yml b/roles/ceph-osd/tasks/scenarios/docker.yml
deleted file mode 100644
index fa934b770..000000000
--- a/roles/ceph-osd/tasks/scenarios/docker.yml
+++ /dev/null
@@ -1,52 +0,0 @@
----
-- name: set config and keys paths
-  set_fact:
-    ceph_config_keys:
-      - /etc/ceph/ceph.client.admin.keyring
-      - /etc/ceph/ceph.conf
-      - /etc/ceph/monmap
-      - /etc/ceph/ceph.mon.keyring
-      - /var/lib/ceph/bootstrap-osd/ceph.keyring
-
-# NOTE (leseb): force version 1.1.0 because https://github.com/ansible/ansible-modules-core/issues/1227
-- name: install docker-py
-  pip: >
-    name=docker-py
-    version=1.1.0
-
-- name: stat for ceph config and keys
-  stat: >
-    path={{ item }}
-  with_items: ceph_config_keys
-  failed_when: false
-  register: statconfig
-
-- name: try to fetch ceph config and keys
-  copy: >
-    src=fetch/docker_mon_files/"{{ item }}"
-    dest=/etc/ceph/
-    owner=root
-    group=root
-    mode=600
-  with_together:
-    - ceph_config_keys
-    - statconfig.results
-  when: item.1.stat.exists == true
-
-- name: run the ceph osd docker image
-  docker: >
-    image="{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}"
-    name={{ ansible_hostname }}-osd-{{ item | regex_replace('/', '') }}
-    net=host
-    state=running
-    privileged=yes
-    env="CEPH_DAEMON=OSD_CEPH_DISK,OSD_DEVICE={{ item }}"
-    volumes="/var/lib/ceph:/var/lib/ceph,/etc/ceph:/etc/ceph,/dev/:/dev/"
-  with_items: ceph_osd_docker_devices
-
-- name: ensure ceph_osd service is running
-  docker: >
-    image="{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}"
-    name={{ ansible_hostname }}-osd-{{ item | regex_replace('/', '') }}
-    state=started
-  with_items: ceph_osd_docker_devices
diff --git a/roles/ceph-rgw/templates/ceph.j2 b/roles/ceph-rgw/templates/ceph.j2
new file mode 100644
index 000000000..d0d31dc00
--- /dev/null
+++ b/roles/ceph-rgw/templates/ceph.j2
@@ -0,0 +1,2 @@
+# {{ ansible_managed }}
+Defaults:{{ radosgw_user }} !requiretty