From 92f6ca7bb6d7b2f295406aab34094b1dba76ff94 Mon Sep 17 00:00:00 2001
From: liyuenan <liyuenan@huawei.com>
Date: Tue, 27 Dec 2016 17:44:34 +0800
Subject: Yamllint test

JIRA: COMPASS-516

Change-Id: I482ce9bc86f4f963258c5b8823e0b00e83556eef
Signed-off-by: liyuenan <liyuenan@huawei.com>
---
 .../ceph-openstack/tasks/ceph_openstack_pre.yml    | 32 ++++++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

(limited to 'deploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_pre.yml')

diff --git a/deploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_pre.yml b/deploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_pre.yml
index ece4154f..3ff9df48 100755
--- a/deploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_pre.yml
+++ b/deploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_pre.yml
@@ -62,15 +62,26 @@
   when: inventory_hostname in groups['ceph_adm']
 
 - name: create ceph users for openstack
-  shell: ceph auth get-or-create client.cinder mon 'allow r' osd 'allow class-read object_prefix rbd_children, allow rwx pool=volumes, allow rwx pool=vms, allow rx pool=images' && ceph auth get-or-create client.glance mon 'allow r' osd 'allow class-read object_prefix rbd_children, allow rwx pool=images'
+  shell: |
+    ceph auth get-or-create client.cinder mon 'allow r' osd \
+        'allow class-read object_prefix rbd_children, allow rwx pool=volumes, \
+        allow rwx pool=vms, allow rx pool=images';
+    ceph auth get-or-create client.glance mon 'allow r' osd \
+        'allow class-read object_prefix rbd_children, allow rwx pool=images';
   when: inventory_hostname in groups['ceph_adm']
 
 - name: send glance key to controller nodes
-  shell: ceph auth get-or-create client.glance | tee /etc/ceph/ceph.client.glance.keyring && chown glance:glance /etc/ceph/ceph.client.glance.keyring 
+  shell: |
+    ceph auth get-or-create client.glance | \
+        tee /etc/ceph/ceph.client.glance.keyring;
+    chown glance:glance /etc/ceph/ceph.client.glance.keyring;
   when: inventory_hostname in groups['controller']
 
 - name: send cinder key to compute nodes
-  shell: ceph auth get-or-create client.cinder | tee /etc/ceph/ceph.client.cinder.keyring && chown cinder:cinder /etc/ceph/ceph.client.cinder.keyring
+  shell: |
+    ceph auth get-or-create client.cinder | \
+        tee /etc/ceph/ceph.client.cinder.keyring;
+    chown cinder:cinder /etc/ceph/ceph.client.cinder.keyring;
   when: inventory_hostname in groups['compute']
   tags:
     - ceph_send_key
@@ -88,18 +99,21 @@
     - ceph_copy_secret
 
 - name: undefine libvirt secret in case of repeatedly execute ceph_deploy
-  shell: "virsh secret-list | awk '$1 ~ /[0-9]+/ {print $1}' | xargs virsh secret-undefine"
+  shell: |
+    virsh secret-list | awk '$1 ~ /[0-9]+/ {print $1}' | \
+        xargs virsh secret-undefine
   when: inventory_hostname in groups['compute']
   tags:
     - ceph_copy_secret
-  ignore_errors: True
+  ignore_errors: "True"
 
 
 - name: create key for libvirt on compute nodes
-  shell: "virsh secret-define --file ~/secret.xml && virsh secret-set-value --secret {{ ceph_uuid }} --base64 $(cat client.cinder.key)"
+  shell: |
+    virsh secret-define --file ~/secret.xml;
+    virsh secret-set-value --secret {{ ceph_uuid }} \
+        --base64 $(cat client.cinder.key);
   when: inventory_hostname in groups['compute']
   tags:
     - ceph_copy_secret
-  ignore_errors: True
-
-
+  ignore_errors: "True"
-- 
cgit 1.2.3-korg