From 6134de26e3c3afcc4f2d833e6a8a911c08af5626 Mon Sep 17 00:00:00 2001
From: caoyuan <cao.yuan@99cloud.net>
Date: Mon, 25 Sep 2017 13:34:59 +0800
Subject: [PATCH] Optimize the yaml format for Barbican check.yml
1. Optimize the yaml format
2. Change the "shell" to "command" for task "fetch secret"
and "cleaning up"
refor to
https://github.com/openstack/kolla-ansible/blob/master/ansible/roles/nova/tasks/simple_cell_setup.yml#L3
Change-Id: Ia6c670ff1349888f6c8a350052e3b170693e12b1
---
ansible/roles/barbican/tasks/check.yml | 39 ++++++++++++++------------
1 file changed, 21 insertions(+), 18 deletions(-)
diff --git a/ansible/roles/barbican/tasks/check.yml b/ansible/roles/barbican/tasks/check.yml
index 9148f763bd..c053a5fb41 100644
--- a/ansible/roles/barbican/tasks/check.yml
+++ b/ansible/roles/barbican/tasks/check.yml
@@ -1,33 +1,36 @@
---
- name: Barbican sanity - storing a secret
- shell: docker exec -t barbican_api openstack \
- --os-auth-url={{ openstack_auth.auth_url }} \
- --os-password={{ openstack_auth.password }} \
- --os-username={{ openstack_auth.username }} \
- --os-project-name={{ openstack_auth.project_name }} \
- secret store -f value -p kolla | head -1
+ shell: >
+ docker exec -t barbican_api openstack \
+ --os-auth-url={{ openstack_auth.auth_url }} \
+ --os-password={{ openstack_auth.password }} \
+ --os-username={{ openstack_auth.username }} \
+ --os-project-name={{ openstack_auth.project_name }} \
+ secret store -f value -p kolla | head -1
register: barbican_store_secret
run_once: True
when: kolla_enable_sanity_barbican | bool
- name: Barbican sanity - fetch secret
- shell: docker exec -t barbican_api openstack \
- --os-auth-url={{ openstack_auth.auth_url }} \
- --os-password={{ openstack_auth.password }} \
- --os-username={{ openstack_auth.username }} \
- --os-project-name={{ openstack_auth.project_name }} \
- secret get -f value -p {{ barbican_store_secret.stdout }}
+ command: >
+ docker exec -t barbican_api openstack
+ --os-auth-url={{ openstack_auth.auth_url }}
+ --os-password={{ openstack_auth.password }}
+ --os-username={{ openstack_auth.username }}
+ --os-project-name={{ openstack_auth.project_name }}
+ secret get -f value -p {{ barbican_store_secret.stdout }}
register: barbican_get_secret
failed_when: barbican_get_secret.stdout != 'kolla'
run_once: True
when: kolla_enable_sanity_barbican | bool
- name: Barbican sanity - cleaning up
- shell: docker exec -t barbican_api openstack \
- --os-auth-url={{ openstack_auth.auth_url }} \
- --os-password={{ openstack_auth.password }} \
- --os-username={{ openstack_auth.username }} \
- --os-project-name={{ openstack_auth.project_name }} \
- secret delete {{ barbican_store_secret.stdout }}
+ command: >
+ docker exec -t barbican_api openstack
+ --os-auth-url={{ openstack_auth.auth_url }}
+ --os-password={{ openstack_auth.password }}
+ --os-username={{ openstack_auth.username }}
+ --os-project-name={{ openstack_auth.project_name }}
+ secret delete {{ barbican_store_secret.stdout }}
run_once: True
when: kolla_enable_sanity_barbican | bool