From 975c8fcfab74ea8bfd0e9d6c6441b38c2eb9bd8a Mon Sep 17 00:00:00 2001 From: Michael Sambol Date: Sun, 18 Oct 2015 21:56:02 -0500 Subject: [PATCH] Refactor mds --- roles/ceph-mds/tasks/docker/fetch_configs.yml | 12 +-- roles/ceph-mds/tasks/docker/pre_requisite.yml | 12 +-- .../tasks/docker/start_docker_mds.yml | 14 ++-- roles/ceph-mds/tasks/pre_requisite.yml | 84 +++++++++---------- 4 files changed, 61 insertions(+), 61 deletions(-) diff --git a/roles/ceph-mds/tasks/docker/fetch_configs.yml b/roles/ceph-mds/tasks/docker/fetch_configs.yml index e4fe5f0a6..14a4638e4 100644 --- a/roles/ceph-mds/tasks/docker/fetch_configs.yml +++ b/roles/ceph-mds/tasks/docker/fetch_configs.yml @@ -17,12 +17,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-mds/tasks/docker/pre_requisite.yml b/roles/ceph-mds/tasks/docker/pre_requisite.yml index 5ba88d842..895c5e956 100644 --- a/roles/ceph-mds/tasks/docker/pre_requisite.yml +++ b/roles/ceph-mds/tasks/docker/pre_requisite.yml @@ -1,11 +1,11 @@ --- - name: create mds bootstrap directory - file: > - path=/var/lib/ceph/bootstrap-mds - state=directory + file: + path: /var/lib/ceph/bootstrap-mds + state: directory # 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-mds/tasks/docker/start_docker_mds.yml b/roles/ceph-mds/tasks/docker/start_docker_mds.yml index e77e503d3..735529ff6 100644 --- a/roles/ceph-mds/tasks/docker/start_docker_mds.yml +++ b/roles/ceph-mds/tasks/docker/start_docker_mds.yml @@ -1,9 +1,9 @@ --- - name: run the ceph medata docker image - docker: > - image="{{ ceph_mds_docker_username }}/{{ ceph_mds_docker_imagename }}" - name=ceph-{{ ansible_hostname }}-mds - net=host - state=running - env="CEPH_DAEMON=MDS,CEPHFS_CREATE=1,{{ ceph_mds_docker_extra_env }}" - volumes="/var/lib/ceph:/var/lib/ceph,/etc/ceph:/etc/ceph" + docker: + image: "{{ ceph_mds_docker_username }}/{{ ceph_mds_docker_imagename }}" + name: ceph-{{ ansible_hostname }}-mds + net: host + state: running + env: "CEPH_DAEMON=MDS,CEPHFS_CREATE=1,{{ ceph_mds_docker_extra_env }}" + volumes: "/var/lib/ceph:/var/lib/ceph,/etc/ceph:/etc/ceph" diff --git a/roles/ceph-mds/tasks/pre_requisite.yml b/roles/ceph-mds/tasks/pre_requisite.yml index f48e7c72e..dbed1bc4d 100644 --- a/roles/ceph-mds/tasks/pre_requisite.yml +++ b/roles/ceph-mds/tasks/pre_requisite.yml @@ -2,45 +2,45 @@ # Deploy Ceph metadata server(s) - name: copy mds bootstrap key - copy: > - src={{ fetch_directory }}/{{ fsid }}/var/lib/ceph/bootstrap-mds/ceph.keyring - dest=/var/lib/ceph/bootstrap-mds/ceph.keyring - owner=root - group=root - mode=600 + copy: + src: "{{ fetch_directory }}/{{ fsid }}/var/lib/ceph/bootstrap-mds/ceph.keyring" + dest: /var/lib/ceph/bootstrap-mds/ceph.keyring + owner: root + group: root + mode: 600 when: cephx - name: create mds directory - file: > - path=/var/lib/ceph/mds/ceph-{{ ansible_hostname }} - state=directory - owner=root - group=root - mode=0644 + file: + path: /var/lib/ceph/mds/ceph-{{ ansible_hostname }} + state: directory + owner: root + group: root + mode: 0644 when: cephx - name: create mds keyring - command: > - ceph --cluster ceph --name client.bootstrap-mds --keyring /var/lib/ceph/bootstrap-mds/ceph.keyring auth get-or-create mds.{{ ansible_hostname }} osd 'allow rwx' mds 'allow' mon 'allow profile mds' -o /var/lib/ceph/mds/ceph-{{ ansible_hostname }}/keyring - creates=/var/lib/ceph/mds/ceph-{{ ansible_hostname }}/keyring + command: ceph --cluster ceph --name client.bootstrap-mds --keyring /var/lib/ceph/bootstrap-mds/ceph.keyring auth get-or-create mds.{{ ansible_hostname }} osd 'allow rwx' mds 'allow' mon 'allow profile mds' -o /var/lib/ceph/mds/ceph-{{ ansible_hostname }}/keyring + args: + creates: /var/lib/ceph/mds/ceph-{{ ansible_hostname }}/keyring changed_when: false when: cephx - name: set mds key permissions - file: > - path=/var/lib/ceph/mds/ceph-{{ ansible_hostname }}/keyring - mode=0600 - owner=root - group=root + file: + path: /var/lib/ceph/mds/ceph-{{ ansible_hostname }}/keyring + mode: 0600 + owner: root + group: root when: cephx - name: activate metadata server with upstart - file: > - path=/var/lib/ceph/mds/ceph-{{ ansible_hostname }}/{{ item }} - state=touch - owner=root - group=root - mode=0600 + file: + path: /var/lib/ceph/mds/ceph-{{ ansible_hostname }}/{{ item }} + state: touch + owner: root + group: root + mode: 0600 with_items: - done - upstart @@ -48,12 +48,12 @@ when: ansible_distribution == "Ubuntu" - name: activate metadata server with sysvinit - file: > - path=/var/lib/ceph/mds/ceph-{{ ansible_hostname }}/{{ item }} - state=touch - owner=root - group=root - mode=0600 + file: + path: /var/lib/ceph/mds/ceph-{{ ansible_hostname }}/{{ item }} + state: touch + owner: root + group: root + mode: 0600 with_items: - done - sysvinit @@ -61,19 +61,19 @@ when: ansible_distribution != "Ubuntu" - name: start and add that the metadata service to the init sequence (ubuntu) - service: > - name=ceph-mds - state=started - enabled=yes - args="id={{ ansible_hostname }}" + service: + name: ceph-mds + state: started + enabled: yes + args: "id={{ ansible_hostname }}" changed_when: false when: ansible_distribution == "Ubuntu" - name: start and add that the metadata service to the init sequence - service: > - name=ceph - state=started - enabled=yes - args=mds + service: + name: ceph + state: started + enabled: yes + args: mds changed_when: false when: ansible_distribution != "Ubuntu"