From 5e6708394af5bfadb6dadede74e56d73e9831c82 Mon Sep 17 00:00:00 2001
From: =?utf8?q?S=C3=A9bastien=20Han?= <sebastien.han@enovance.com>
Date: Wed, 7 Jan 2015 11:25:34 +0100
Subject: [PATCH] Fix ICE installation
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Wrong ordering and variable.

Signed-off-by: Sébastien Han <sebastien.han@enovance.com>
---
 roles/ceph-common/tasks/install_on_redhat.yml |  2 +-
 roles/ceph-common/tasks/main.yml              | 68 +++++++++----------
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/roles/ceph-common/tasks/install_on_redhat.yml b/roles/ceph-common/tasks/install_on_redhat.yml
index 6fc26e399..6b0319067 100644
--- a/roles/ceph-common/tasks/install_on_redhat.yml
+++ b/roles/ceph-common/tasks/install_on_redhat.yml
@@ -22,7 +22,7 @@
 
 - name: Install Inktank Ceph Enterprise repository key
   rpm_key: >
-    key=file://{{ ceph_stable_ice_temp_path }}/release.asc
+    key={{ ceph_stable_ice_temp_path }}/release.asc
     state=present
   when: ceph_stable_ice
 
diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml
index 392b107f5..400d6fd98 100644
--- a/roles/ceph-common/tasks/main.yml
+++ b/roles/ceph-common/tasks/main.yml
@@ -11,40 +11,6 @@
   fail: "msg=Distribution not supported {{ ansible_os_family }}"
   when: "ansible_os_family not in ['Debian', 'RedHat']"
 
-- include: install_on_redhat.yml
-  when: ansible_os_family == 'RedHat'
-
-- include: install_on_debian.yml
-  when: ansible_os_family == 'Debian'
-
-- name: Check for a Ceph socket
-  shell: "stat /var/run/ceph/*.asok > /dev/null 2>&1"
-  ignore_errors: true
-  register: socket
-
-- name: Generate cluster UUID
-  shell: uuidgen | tee fetch/ceph_cluster_uuid.conf creates=fetch/ceph_cluster_uuid.conf
-  connection: local
-  sudo: false
-  register: cluster_uuid
-
-- name: Read cluster UUID if it already exists
-  command: cat fetch/ceph_cluster_uuid.conf removes=fetch/ceph_cluster_uuid.conf
-  connection: local
-  sudo: false
-  register: cluster_uuid
-
-- name: Generate Ceph configuration file
-  template: >
-    src=ceph.conf.j2
-    dest=/etc/ceph/ceph.conf
-    owner=root
-    group=root
-    mode=0644
-  notify:
-    - restart ceph
-    - restart ceph-osd-all on ubuntu
-
 - name: Disable OSD directory parsing by updatedb
   command: updatedb -e /var/lib/ceph
   ignore_errors: true
@@ -104,3 +70,37 @@
 - name: Move the extracted packages
   shell: "mv {{ ceph_stable_ice_temp_path }}/ceph/*/* {{ ceph_stable_ice_temp_path }}"
   when: ceph_stable_ice and repo_exist.stat.exists == False
+
+- include: install_on_redhat.yml
+  when: ansible_os_family == 'RedHat'
+
+- include: install_on_debian.yml
+  when: ansible_os_family == 'Debian'
+
+- name: Check for a Ceph socket
+  shell: "stat /var/run/ceph/*.asok > /dev/null 2>&1"
+  ignore_errors: true
+  register: socket
+
+- name: Generate cluster UUID
+  shell: uuidgen | tee fetch/ceph_cluster_uuid.conf creates=fetch/ceph_cluster_uuid.conf
+  connection: local
+  sudo: false
+  register: cluster_uuid
+
+- name: Read cluster UUID if it already exists
+  command: cat fetch/ceph_cluster_uuid.conf removes=fetch/ceph_cluster_uuid.conf
+  connection: local
+  sudo: false
+  register: cluster_uuid
+
+- name: Generate Ceph configuration file
+  template: >
+    src=ceph.conf.j2
+    dest=/etc/ceph/ceph.conf
+    owner=root
+    group=root
+    mode=0644
+  notify:
+    - restart ceph
+    - restart ceph-osd-all on ubuntu
-- 
2.39.5