From ef768fa3a24ba414cfc62940b9357f5f100bd733 Mon Sep 17 00:00:00 2001
From: Michael Sambol <sambol.michael@gmail.com>
Date: Sun, 18 Oct 2015 22:28:48 -0500
Subject: [PATCH] Refactor restapi

---
 .../tasks/docker/fetch_configs.yml            | 12 ++---
 .../tasks/docker/pre_requisite.yml            |  6 +--
 .../tasks/docker/start_docker_restapi.yml     | 16 +++----
 roles/ceph-restapi/tasks/pre_requisite.yml    | 48 +++++++++----------
 4 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/roles/ceph-restapi/tasks/docker/fetch_configs.yml b/roles/ceph-restapi/tasks/docker/fetch_configs.yml
index e3c28e5dc..cbb3c055d 100644
--- a/roles/ceph-restapi/tasks/docker/fetch_configs.yml
+++ b/roles/ceph-restapi/tasks/docker/fetch_configs.yml
@@ -14,12 +14,12 @@
   register: statconfig
 
 - name: try to fetch ceph config and keys
-  copy: >
-    src={{ fetch_directory }}/docker_mon_files/{{ item.0 }}
-    dest={{ item.0 }}
-    owner=root
-    group=root
-    mode=644
+  copy:
+    src: "{{ fetch_directory }}/docker_mon_files/{{ item.0 }}"
+    dest: "{{ item.0 }}"
+    owner: root
+    group: root
+    mode: 644
   changed_when: false
   with_together:
     - ceph_config_keys
diff --git a/roles/ceph-restapi/tasks/docker/pre_requisite.yml b/roles/ceph-restapi/tasks/docker/pre_requisite.yml
index 61ee10124..4569ad634 100644
--- a/roles/ceph-restapi/tasks/docker/pre_requisite.yml
+++ b/roles/ceph-restapi/tasks/docker/pre_requisite.yml
@@ -1,6 +1,6 @@
 ---
 # 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
+  pip:
+    name: docker-py
+    version: 1.1.0
diff --git a/roles/ceph-restapi/tasks/docker/start_docker_restapi.yml b/roles/ceph-restapi/tasks/docker/start_docker_restapi.yml
index 8cd470b1e..fdde266fa 100644
--- a/roles/ceph-restapi/tasks/docker/start_docker_restapi.yml
+++ b/roles/ceph-restapi/tasks/docker/start_docker_restapi.yml
@@ -1,10 +1,10 @@
 ---
 - name: run the ceph rest api docker image
-  docker: >
-    image="{{ ceph_restapi_docker_username }}/{{ ceph_restapi_docker_imagename }}"
-    name={{ ansible_hostname }}-ceph-restapi
-    net=host
-    expose={{ ceph_restapi_port }}
-    state=running
-    env="RESTAPI_IP={{ hostvars[inventory_hostname]['ansible_' + ceph_restapi_docker_interface]['ipv4']['address'] }},CEPH_DAEMON=RESTAPI,{{ ceph_restapi_docker_extra_env }}"
-    volumes="/etc/ceph:/etc/ceph"
+  docker:
+    image: "{{ ceph_restapi_docker_username }}/{{ ceph_restapi_docker_imagename }}"
+    name: "{{ ansible_hostname }}-ceph-restapi"
+    net: host
+    expose: "{{ ceph_restapi_port }}"
+    state: running
+    env: "RESTAPI_IP={{ hostvars[inventory_hostname]['ansible_' + ceph_restapi_docker_interface]['ipv4']['address'] }},CEPH_DAEMON=RESTAPI,{{ ceph_restapi_docker_extra_env }}"
+    volumes: "/etc/ceph:/etc/ceph"
diff --git a/roles/ceph-restapi/tasks/pre_requisite.yml b/roles/ceph-restapi/tasks/pre_requisite.yml
index 3343ab9a8..cc756aaef 100644
--- a/roles/ceph-restapi/tasks/pre_requisite.yml
+++ b/roles/ceph-restapi/tasks/pre_requisite.yml
@@ -1,28 +1,28 @@
 ---
 - name: create ceph rest api directory
-  file: >
-    path=/var/lib/ceph/restapi/ceph-restapi
-    state=directory
-    owner=root
-    group=root
-    mode=0755
+  file:
+    path: /var/lib/ceph/restapi/ceph-restapi
+    state: directory
+    owner: root
+    group: root
+    mode: 0755
 
 - name: copy ceph rest api keyring
-  copy: >
-    src={{ fetch_directory }}/{{ fsid }}/etc/ceph/ceph.client.restapi.keyring
-    dest=/var/lib/ceph/restapi/ceph-restapi/keyring
-    owner=root
-    group=root
-    mode=600
+  copy:
+    src: "{{ fetch_directory }}/{{ fsid }}/etc/ceph/ceph.client.restapi.keyring"
+    dest: "/var/lib/ceph/restapi/ceph-restapi/keyring"
+    owner: root
+    group: root
+    mode: 600
   when: cephx
 
 - name: activate ceph rest api with upstart
-  file: >
-    path=/var/lib/ceph/restapi/{{ item }}
-    state=touch
-    owner=root
-    group=root
-    mode=0600
+  file:
+    path: /var/lib/ceph/restapi/{{ item }}
+    state: touch
+    owner: root
+    group: root
+    mode: 0600
   with_items:
     - done
     - upstart
@@ -30,12 +30,12 @@
   when: ansible_distribution == "Ubuntu"
 
 - name: activate ceph rest api with sysvinit
-  file: >
-    path=/var/lib/ceph/restapi/{{ item }}
-    state=touch
-    owner=root
-    group=root
-    mode=0600
+  file:
+    path: /var/lib/ceph/restapi/{{ item }}
+    state: touch
+    owner: root
+    group: root
+    mode: 0600
   with_items:
     - done
     - sysvinit