Make fetch directory configurable

Currently, the fetch directory is created in your working directory
(where ansible is run from).  We prefer to not keep any state in this
directory and would prefer to have the fetch directory configurable so
we can store it outside of our code checkout.

This commit creates a new variable in each role called
`fetch_directory` (defaulting to the previous value of 'fetch/'), and
then updates each reference to 'fetch' to use the new variable instead.

Closes issue #383

diff --git a/group_vars/all.sample b/group_vars/all.sample
index 52eabefd4acee2c459d66104f5e9780d03466e4a..603375cc3583693e5310fddcf90fa5fd31fcb5ce 100644 (file)
--- a/group_vars/all.sample
+++ b/group_vars/all.sample
@@ -4,6 +4,12 @@
 # Dummy variable to avoid error because ansible does not recognize the file as a good configuration file when no variable in it.
 dummy:
 
+###########
+# GENERAL #
+###########
+
+#fetch_directory: fetch/
+
 #########
 # INSTALL
 #########

diff --git a/group_vars/mdss.sample b/group_vars/mdss.sample
index 6b9eb58870fc383c32b2001b8c7b54713818f038..425e2ccee025cc384a6aa2e4bf4cc14850819d7d 100644 (file)
--- a/group_vars/mdss.sample
+++ b/group_vars/mdss.sample
@@ -1,8 +1,15 @@
 ---\r
+\r
 dummy:\r
 \r
+###########\r
+# GENERAL #\r
+###########\r
+\r
 #cephx: true\r
 \r
+#fetch_directory: fetch/\r
+\r
 \r
 ##########\r
 # DOCKER #\r

diff --git a/group_vars/mons.sample b/group_vars/mons.sample
index 6c35f81aa39c762af95fda66bec8307e05df657b..51ef6b3078e7cc7d97880427c9f5b905b46d9796 100644 (file)
--- a/group_vars/mons.sample
+++ b/group_vars/mons.sample
@@ -33,6 +33,8 @@ dummy:
 #  - nosizechange\r
 #\r
 \r
+#fetch_directory: fetch/\r
+\r
 #############\r
 # OPENSTACK #\r
 #############\r

diff --git a/group_vars/osds.sample b/group_vars/osds.sample
index 1f8f89e74ff86185b32215f6dfedf3561eac2cca..a5c07a2e04671744b3630d2622c121af2fdcb585 100644 (file)
--- a/group_vars/osds.sample
+++ b/group_vars/osds.sample
@@ -5,6 +5,12 @@
 # Dummy variable to avoid error because ansible does not recognize the file as a good configuration file when no variable in it.
 dummy:
 
+###########
+# GENERAL #
+###########
+
+#fetch_directory: fetch/
+
 ####################
 # OSD CRUSH LOCATION
 ####################

diff --git a/group_vars/restapis.sample b/group_vars/restapis.sample
index 777282943322e8c878d395c9e213ec79c9887505..42e4095b5c9a7e28ae5e684a54c0cc9531500386 100644 (file)
--- a/group_vars/restapis.sample
+++ b/group_vars/restapis.sample
@@ -4,6 +4,12 @@
 # Dummy variable to avoid error because ansible does not recognize the file as a good configuration file when no variable in it.
 dummy:
 
+###########
+# GENERAL #
+###########
+
+#fetch_directory: fetch/
+
 ##########
 # DOCKER #
 ##########

diff --git a/group_vars/rgws.sample b/group_vars/rgws.sample
index f0c930c5d7a82e952e711f86e6ca2eadca02ff6d..e00c3eaa03e70805d4c5983efbccb23bf1aa3d85 100644 (file)
--- a/group_vars/rgws.sample
+++ b/group_vars/rgws.sample
@@ -1,6 +1,10 @@
 ---\r
 dummy:\r
 \r
+###########\r
+# GENERAL #\r
+###########\r
+\r
 ## Ceph options\r
 #\r
 #cephx: true\r
@@ -10,6 +14,8 @@ dummy:
 # allowing root to not require tty\r
 #radosgw_user: root\r
 \r
+#fetch_directory: fetch/\r
+\r
 ##########\r
 # DOCKER #\r
 ##########\r

diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index ad62ed2d520f9561061a5609fd92ef1f8fed4239..1ed0af79233f6751909d2bf813e568a5c0e6408d 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -1,6 +1,12 @@
 ---\r
 # You can override vars by using host or group vars\r
 \r
+###########\r
+# GENERAL #\r
+###########\r
+\r
+fetch_directory: fetch/\r
+\r
 ###########\r
 # INSTALL #\r
 ###########\r

diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml
index a3a85fb72ab56bcd59b5dbc06131f6e337949670..15ccdd36e9aca77ab6c525608348e4366b29ddae 100644 (file)
--- a/roles/ceph-common/tasks/main.yml
+++ b/roles/ceph-common/tasks/main.yml
@@ -50,21 +50,21 @@
   register: socketrgw
 
 - name: create a local fetch directory if it doesn't exist
-  local_action: file path=fetch state=directory
+  local_action: file path={{ fetch_directory }} state=directory
   changed_when: false
   sudo: false
   run_once: true
 
 - name: generate cluster uuid
-  local_action: shell uuidgen | tee fetch/ceph_cluster_uuid.conf
-    creates=fetch/ceph_cluster_uuid.conf
+  local_action: shell uuidgen | tee {{ fetch_directory }}/ceph_cluster_uuid.conf
+    creates={{ fetch_directory }}/ceph_cluster_uuid.conf
   register: cluster_uuid
   sudo: false
   when: fsid != '4a158d27-f750-41d5-9e7f-26ce4c9d2d45'
 
 - name: read cluster uuid if it already exists
-  local_action: command cat fetch/ceph_cluster_uuid.conf
-    removes=fetch/ceph_cluster_uuid.conf
+  local_action: command cat {{ fetch_directory }}/ceph_cluster_uuid.conf
+    removes={{ fetch_directory }}/ceph_cluster_uuid.conf
   changed_when: false
   register: cluster_uuid
   sudo: false

diff --git a/roles/ceph-mds/defaults/main.yml b/roles/ceph-mds/defaults/main.yml
index c99be4fa52645cda842a3bf7f9ed5e7d9f15e1f9..a5d60a7e0dd0bf6058d0f5c4cbf59a6bb0132e79 100644 (file)
--- a/roles/ceph-mds/defaults/main.yml
+++ b/roles/ceph-mds/defaults/main.yml
@@ -1,6 +1,12 @@
 ---\r
 # You can override vars by using host or group vars\r
 \r
+###########\r
+# GENERAL #\r
+###########\r
+\r
+fetch_directory: fetch/\r
+\r
 cephx: true\r
 \r
 \r

diff --git a/roles/ceph-mds/tasks/docker/fetch_configs.yml b/roles/ceph-mds/tasks/docker/fetch_configs.yml
index 7617c1d67e738af85fd31c83e19a34232ef34d01..e4fe5f0a6b079cfa765a1e3bd8601d0b3b4c08a8 100644 (file)
--- a/roles/ceph-mds/tasks/docker/fetch_configs.yml
+++ b/roles/ceph-mds/tasks/docker/fetch_configs.yml
@@ -18,7 +18,7 @@
 
 - name: try to fetch ceph config and keys
   copy: >
-    src=fetch/docker_mon_files/{{ item.0 }}
+    src={{ fetch_directory }}/docker_mon_files/{{ item.0 }}
     dest={{ item.0 }}
     owner=root
     group=root

diff --git a/roles/ceph-mds/tasks/pre_requisite.yml b/roles/ceph-mds/tasks/pre_requisite.yml
index 177eda371ce8e69a475c8d0a9aa6c00680e60fd5..f48e7c72eab0d19cd1c29d9efcfd46df970ed2c5 100644 (file)
--- a/roles/ceph-mds/tasks/pre_requisite.yml
+++ b/roles/ceph-mds/tasks/pre_requisite.yml
@@ -3,7 +3,7 @@
 
 - name: copy mds bootstrap key
   copy: >
-    src=fetch/{{ fsid }}/var/lib/ceph/bootstrap-mds/ceph.keyring
+    src={{ fetch_directory }}/{{ fsid }}/var/lib/ceph/bootstrap-mds/ceph.keyring
     dest=/var/lib/ceph/bootstrap-mds/ceph.keyring
     owner=root
     group=root

diff --git a/roles/ceph-mon/defaults/main.yml b/roles/ceph-mon/defaults/main.yml
index d6e4e3ce22b03ee103854042d6f11f21ca257aa7..50fd1e5811db2fe60a11c12d8feab4460c5c79f6 100644 (file)
--- a/roles/ceph-mon/defaults/main.yml
+++ b/roles/ceph-mon/defaults/main.yml
@@ -5,6 +5,8 @@
 # GENERAL #\r
 ###########\r
 \r
+fetch_directory: fetch/\r
+\r
 rgw_group_name: rgws\r
 \r
 # ACTIVATE BOTH FSID AND MONITOR_SECRET VARIABLES FOR NON-VAGRANT DEPLOYMENT\r

diff --git a/roles/ceph-mon/tasks/ceph_keys.yml b/roles/ceph-mon/tasks/ceph_keys.yml
index 6b616a58cafc85bd0708141bafead48052d4bc23..886936d63fb0d955939114d1882bb761c1ff0c26 100644 (file)
--- a/roles/ceph-mon/tasks/ceph_keys.yml
+++ b/roles/ceph-mon/tasks/ceph_keys.yml
@@ -36,7 +36,7 @@
 - name: copy keys to the ansible server
   fetch: >
     src={{ item }}
-    dest=fetch/{{ fsid }}/{{ item }}
+    dest={{ fetch_directory }}/{{ fsid }}/{{ item }}
     flat=yes
   with_items:
     - "{{ ceph_keys.stdout_lines }}"

diff --git a/roles/ceph-mon/tasks/deploy_monitors.yml b/roles/ceph-mon/tasks/deploy_monitors.yml
index d0fbd40b99c7d757a4afd5a937dcc70498cb845b..cb178c2f4516c683b277179d1b1d0c84cf87fb84 100644 (file)
--- a/roles/ceph-mon/tasks/deploy_monitors.yml
+++ b/roles/ceph-mon/tasks/deploy_monitors.yml
@@ -1,16 +1,16 @@
 ---
 - name: generate monitor initial keyring
   local_action: >
-    shell python -c "import os ; import struct ; import time; import base64 ; key = os.urandom(16) ; header = struct.pack('<hiih',1,int(time.time()),0,len(key)) ; print base64.b64encode(header + key)" | tee fetch/monitor_keyring.conf
-    creates=fetch/monitor_keyring.conf
+    shell python -c "import os ; import struct ; import time; import base64 ; key = os.urandom(16) ; header = struct.pack('<hiih',1,int(time.time()),0,len(key)) ; print base64.b64encode(header + key)" | tee {{ fetch_directory }}/monitor_keyring.conf
+    creates={{ fetch_directory }}/monitor_keyring.conf
   register: monitor_keyring
   sudo: false
   when: monitor_secret != 'AQAWqilTCDh7CBAAawXt6kyTgLFCxSvJhTEmuw=='
 
 - name: read monitor initial keyring if it already exists
   local_action: >
-    command cat fetch/monitor_keyring.conf
-    removes=fetch/monitor_keyring.conf
+    command cat {{ fetch_directory }}/monitor_keyring.conf
+    removes={{ fetch_directory }}/monitor_keyring.conf
   changed_when: false
   register: monitor_keyring
   sudo: false

diff --git a/roles/ceph-mon/tasks/docker/copy_configs.yml b/roles/ceph-mon/tasks/docker/copy_configs.yml
index 74a912b567c724c53b8a90eae6288fe61ff9e185..cc68910aa6345db86baa52726c6de0ef374e5080 100644 (file)
--- a/roles/ceph-mon/tasks/docker/copy_configs.yml
+++ b/roles/ceph-mon/tasks/docker/copy_configs.yml
@@ -2,7 +2,7 @@
 - name: push ceph files to the ansible server
   fetch: >
     src={{ item.0 }}
-    dest=fetch/docker_mon_files/{{ item.0 }}
+    dest={{ fetch_directory }}/docker_mon_files/{{ item.0 }}
     flat=yes
   with_together:
     - ceph_config_keys

diff --git a/roles/ceph-mon/tasks/docker/fetch_configs.yml b/roles/ceph-mon/tasks/docker/fetch_configs.yml
index 4f040be54d2584a089896f700bebeb8df1fa9702..295724ce08bd1122c1b70a9e95ee9afeff2cc376 100644 (file)
--- a/roles/ceph-mon/tasks/docker/fetch_configs.yml
+++ b/roles/ceph-mon/tasks/docker/fetch_configs.yml
@@ -20,7 +20,7 @@
 
 - name: try to fetch ceph config and keys
   copy: >
-    src=fetch/docker_mon_files/{{ item.0 }}
+    src={{ fetch_directory }}/docker_mon_files/{{ item.0 }}
     dest={{ item.0 }}
     owner=root
     group=root

diff --git a/roles/ceph-osd/defaults/main.yml b/roles/ceph-osd/defaults/main.yml
index 98441b9a006e3d9dd52f68f94f0ae5a048e19877..0c56a4267742246b39c15c1b58cff7421ce6132a 100644 (file)
--- a/roles/ceph-osd/defaults/main.yml
+++ b/roles/ceph-osd/defaults/main.yml
@@ -2,6 +2,12 @@
 # You can override default vars defined in defaults/main.yml here,\r
 # but I would advice to use host or group vars instead\r
 \r
+###########\r
+# GENERAL #\r
+###########\r
+\r
+fetch_directory: fetch/\r
+\r
 ####################\r
 # OSD CRUSH LOCATION\r
 ####################\r

diff --git a/roles/ceph-osd/tasks/docker/fetch_configs.yml b/roles/ceph-osd/tasks/docker/fetch_configs.yml
index aaab3c28f36b95cd08ad35200367b0cce5c7b91f..43f025d689c9d7e74e9a1aaf4617d1330a4d63cc 100644 (file)
--- a/roles/ceph-osd/tasks/docker/fetch_configs.yml
+++ b/roles/ceph-osd/tasks/docker/fetch_configs.yml
@@ -15,7 +15,7 @@
 
 - name: try to fetch ceph config and keys
   copy: >
-    src=fetch/docker_mon_files/{{ item.0 }}
+    src={{ fetch_directory }}/docker_mon_files/{{ item.0 }}
     dest={{ item.0 }}
     owner=root
     group=root

diff --git a/roles/ceph-osd/tasks/pre_requisite.yml b/roles/ceph-osd/tasks/pre_requisite.yml
index 61dd65d3faffcb4668a0220846c15db3d8d8985c..1d4d03368fdfe1e0e0902fc6d7efad78c19bf7be 100644 (file)
--- a/roles/ceph-osd/tasks/pre_requisite.yml
+++ b/roles/ceph-osd/tasks/pre_requisite.yml
@@ -13,7 +13,7 @@
 
 - name: copy osd bootstrap key
   copy: >
-    src=fetch/{{ fsid }}/var/lib/ceph/bootstrap-osd/ceph.keyring
+    src={{ fetch_directory }}/{{ fsid }}/var/lib/ceph/bootstrap-osd/ceph.keyring
     dest=/var/lib/ceph/bootstrap-osd/ceph.keyring
     owner=root
     group=root

diff --git a/roles/ceph-restapi/defaults/main.yml b/roles/ceph-restapi/defaults/main.yml
index 33bda1878b18fed1167e7161b6bb367c06c263eb..59236dc44a7268be3e8c1b10e64c2a2d20d11586 100644 (file)
--- a/roles/ceph-restapi/defaults/main.yml
+++ b/roles/ceph-restapi/defaults/main.yml
@@ -1,4 +1,11 @@
 ---
+
+###########
+# GENERAL #
+###########
+
+fetch_directory: fetch/
+
 ##########
 # DOCKER #
 ##########

diff --git a/roles/ceph-restapi/tasks/docker/fetch_configs.yml b/roles/ceph-restapi/tasks/docker/fetch_configs.yml
index 1ff61b6b4e9f65d6638aaaf5329385dd36c8a47e..e3c28e5dc1b367f5fc16de66eb48ae3b99be60f2 100644 (file)
--- a/roles/ceph-restapi/tasks/docker/fetch_configs.yml
+++ b/roles/ceph-restapi/tasks/docker/fetch_configs.yml
@@ -15,7 +15,7 @@
 
 - name: try to fetch ceph config and keys
   copy: >
-    src=fetch/docker_mon_files/{{ item.0 }}
+    src={{ fetch_directory }}/docker_mon_files/{{ item.0 }}
     dest={{ item.0 }}
     owner=root
     group=root

diff --git a/roles/ceph-restapi/tasks/pre_requisite.yml b/roles/ceph-restapi/tasks/pre_requisite.yml
index 04a9a0c54dd6c997fd92ed9eed22a7ba2163d63b..3343ab9a877fb32fb52a02c808929e05c6e20fc3 100644 (file)
--- a/roles/ceph-restapi/tasks/pre_requisite.yml
+++ b/roles/ceph-restapi/tasks/pre_requisite.yml
@@ -9,7 +9,7 @@
 
 - name: copy ceph rest api keyring
   copy: >
-    src=fetch/{{ fsid }}/etc/ceph/ceph.client.restapi.keyring
+    src={{ fetch_directory }}/{{ fsid }}/etc/ceph/ceph.client.restapi.keyring
     dest=/var/lib/ceph/restapi/ceph-restapi/keyring
     owner=root
     group=root

diff --git a/roles/ceph-rgw/defaults/main.yml b/roles/ceph-rgw/defaults/main.yml
index 1a482aceeff4f441d4d09cd5469e3e811a533a99..ca81641f498511f1321d20f97a8c37f390a57f9f 100644 (file)
--- a/roles/ceph-rgw/defaults/main.yml
+++ b/roles/ceph-rgw/defaults/main.yml
@@ -1,6 +1,12 @@
 ---\r
 # You can override vars by using host or group vars\r
 \r
+###########\r
+# GENERAL #\r
+###########\r
+\r
+fetch_directory: fetch/\r
+\r
 ## Ceph options\r
 #\r
 cephx: true\r

diff --git a/roles/ceph-rgw/tasks/docker/fetch_configs.yml b/roles/ceph-rgw/tasks/docker/fetch_configs.yml
index 12cc19175ce2f450070383a20e39d09f780184d2..64b0258fe5f17870c8ed91d36d7379d238d46708 100644 (file)
--- a/roles/ceph-rgw/tasks/docker/fetch_configs.yml
+++ b/roles/ceph-rgw/tasks/docker/fetch_configs.yml
@@ -15,7 +15,7 @@
 
 - name: try to fetch ceph config and keys
   copy: >
-    src=fetch/docker_mon_files/{{ item.0 }}
+    src={{ fetch_directory }}/docker_mon_files/{{ item.0 }}
     dest={{ item.0 }}
     owner=root
     group=root

diff --git a/roles/ceph-rgw/tasks/pre_requisite.yml b/roles/ceph-rgw/tasks/pre_requisite.yml
index 7710546b318ce12a06bc51da50a2e8bdc6dfd1c1..3bafff17d2b8a80382dd2b06ae0d843c6d7aa605 100644 (file)
--- a/roles/ceph-rgw/tasks/pre_requisite.yml
+++ b/roles/ceph-rgw/tasks/pre_requisite.yml
@@ -12,7 +12,7 @@
 
 - name: copy rados gateway bootstrap key
   copy: >
-    src=fetch/{{ fsid }}/var/lib/ceph/bootstrap-rgw/ceph.keyring
+    src={{ fetch_directory }}/{{ fsid }}/var/lib/ceph/bootstrap-rgw/ceph.keyring
     dest=/var/lib/ceph/bootstrap-rgw/ceph.keyring
     owner=root
     group=root