From 975480478b0b207656881232470461053694c609 Mon Sep 17 00:00:00 2001 From: liyuenan Date: Wed, 11 Jan 2017 14:26:41 +0800 Subject: FIX Ceph user error The command of create ceph user for openstack is destroied in Yamllint patch. There is a error in the roles/ceph-openstack/tasks/ceph-openstack-pre.yml. It should not change a line between the quotations. JIRA: - Change-Id: I5347e8bfde129855c28cb5313b8367f4edb065ca Signed-off-by: liyuenan --- .yamllint | 10 +--------- .../ansible/roles/ceph-openstack/tasks/ceph_openstack_pre.yml | 5 +++-- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.yamllint b/.yamllint index bcdaf339..66a91f9a 100644 --- a/.yamllint +++ b/.yamllint @@ -3,15 +3,7 @@ extends: default rules: - # 80 chars should be enough, but don't fail if a line is longer + # 100 chars should be enough line-length: max: 100 level: error - - # accept both key: - # - item - # - # and key: - # - item - indentation: - indent-sequences: whatever 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 3ff9df48..a9eb81af 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 @@ -61,14 +61,15 @@ - vms when: inventory_hostname in groups['ceph_adm'] +# yamllint disable rule:line-length - 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'; + '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'] +# yamllint enable rule:line-length - name: send glance key to controller nodes shell: | -- cgit