From b47344fdd4d78b206b149d458f07c7d360dfb73b Mon Sep 17 00:00:00 2001
From: =?utf8?q?S=C3=A9bastien=20Han?= <seb@redhat.com>
Date: Thu, 30 Jul 2015 11:33:08 +0200
Subject: [PATCH] Cleanup and change_when watch
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sébastien Han <seb@redhat.com>
---
 roles/ceph-mds/tasks/docker/fetch_configs.yml |  1 +
 roles/ceph-mon/tasks/docker.yml               | 65 -------------------
 roles/ceph-mon/tasks/docker/fetch_configs.yml |  1 +
 roles/ceph-osd/tasks/docker/fetch_configs.yml |  1 +
 .../tasks/docker/fetch_configs.yml            |  1 +
 roles/ceph-rgw/tasks/docker/fetch_configs.yml |  1 +
 6 files changed, 5 insertions(+), 65 deletions(-)
 delete mode 100644 roles/ceph-mon/tasks/docker.yml

diff --git a/roles/ceph-mds/tasks/docker/fetch_configs.yml b/roles/ceph-mds/tasks/docker/fetch_configs.yml
index 68c130a72..7617c1d67 100644
--- a/roles/ceph-mds/tasks/docker/fetch_configs.yml
+++ b/roles/ceph-mds/tasks/docker/fetch_configs.yml
@@ -23,6 +23,7 @@
     owner=root
     group=root
     mode=644
+  changed_when: false
   with_together:
     - ceph_config_keys
     - statconfig.results
diff --git a/roles/ceph-mon/tasks/docker.yml b/roles/ceph-mon/tasks/docker.yml
deleted file mode 100644
index a8fdb9fcf..000000000
--- a/roles/ceph-mon/tasks/docker.yml
+++ /dev/null
@@ -1,65 +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
-      - /var/lib/ceph/bootstrap-rgw/ceph.keyring
-      - /var/lib/ceph/bootstrap-mds/ceph.keyring
-
-- name: create bootstrap directories
-  file: >
-    path=/var/lib/ceph/bootstrap-{{ item }}
-    state=directory
-  with_items:
-    - osd
-    - mds
-    - rgw
-
-# NOTE (leseb): for 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
-  local_action: stat path={{ item }}
-  with_items: ceph_config_keys
-  changed_when: false
-  sudo: false
-  failed_when: false
-  register: statconfig
-
-- name: try to fetch ceph config and keys
-  copy: >
-    src=fetch/docker_mon_files/{{ item.0 }}
-    dest={{ item.0 }}
-    owner=root
-    group=root
-    mode=644
-  with_together:
-    - ceph_config_keys
-    - statconfig.results
-  when: item.1.stat.exists == true
-
-- name: run the ceph monitor docker image
-  docker: >
-    image="{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}"
-    name="{{ ansible_hostname }}"
-    net="host"
-    state="running"
-    env="MON_IP={{ hostvars[inventory_hostname]['ansible_' + ceph_mon_docker_interface]['ipv4']['address'] }},CEPH_DAEMON=MON,CEPH_PUBLIC_NETWORK={{ ceph_mon_docker_subnet }},{{ ceph_mon_extra_envs }}"
-    volumes="/var/lib/ceph:/var/lib/ceph,/etc/ceph:/etc/ceph"
-
-- name: push ceph files to the ansible server
-  fetch: >
-    src={{ item.0 }}
-    dest=fetch/docker_mon_files/{{ item.0 }}
-    flat=yes
-  with_together:
-    - ceph_config_keys
-    - statconfig.results
-  when: item.1.stat.exists == false
diff --git a/roles/ceph-mon/tasks/docker/fetch_configs.yml b/roles/ceph-mon/tasks/docker/fetch_configs.yml
index e9f146edb..4f040be54 100644
--- a/roles/ceph-mon/tasks/docker/fetch_configs.yml
+++ b/roles/ceph-mon/tasks/docker/fetch_configs.yml
@@ -25,6 +25,7 @@
     owner=root
     group=root
     mode=644
+  changed_when: false
   with_together:
     - ceph_config_keys
     - statconfig.results
diff --git a/roles/ceph-osd/tasks/docker/fetch_configs.yml b/roles/ceph-osd/tasks/docker/fetch_configs.yml
index e241c5da4..aaab3c28f 100644
--- a/roles/ceph-osd/tasks/docker/fetch_configs.yml
+++ b/roles/ceph-osd/tasks/docker/fetch_configs.yml
@@ -20,6 +20,7 @@
     owner=root
     group=root
     mode=644
+  changed_when: false
   with_together:
     - ceph_config_keys
     - statconfig.results
diff --git a/roles/ceph-restapi/tasks/docker/fetch_configs.yml b/roles/ceph-restapi/tasks/docker/fetch_configs.yml
index 962ab958e..1ff61b6b4 100644
--- a/roles/ceph-restapi/tasks/docker/fetch_configs.yml
+++ b/roles/ceph-restapi/tasks/docker/fetch_configs.yml
@@ -20,6 +20,7 @@
     owner=root
     group=root
     mode=644
+  changed_when: false
   with_together:
     - ceph_config_keys
     - statconfig.results
diff --git a/roles/ceph-rgw/tasks/docker/fetch_configs.yml b/roles/ceph-rgw/tasks/docker/fetch_configs.yml
index a7ffd9b37..12cc19175 100644
--- a/roles/ceph-rgw/tasks/docker/fetch_configs.yml
+++ b/roles/ceph-rgw/tasks/docker/fetch_configs.yml
@@ -20,6 +20,7 @@
     owner=root
     group=root
     mode=644
+  changed_when: false
   with_together:
     - ceph_config_keys
     - statconfig.results
-- 
2.39.5