Merge "Optimize the yaml format for Barbican check.yml"

This commit is contained in:
Jenkins 2017-09-25 15:28:53 +00:00 committed by Gerrit Code Review
commit 03da4f8735
1 changed files with 21 additions and 18 deletions

View File

@ -1,33 +1,36 @@
--- ---
- name: Barbican sanity - storing a secret - name: Barbican sanity - storing a secret
shell: docker exec -t barbican_api openstack \ shell: >
--os-auth-url={{ openstack_auth.auth_url }} \ docker exec -t barbican_api openstack \
--os-password={{ openstack_auth.password }} \ --os-auth-url={{ openstack_auth.auth_url }} \
--os-username={{ openstack_auth.username }} \ --os-password={{ openstack_auth.password }} \
--os-project-name={{ openstack_auth.project_name }} \ --os-username={{ openstack_auth.username }} \
secret store -f value -p kolla | head -1 --os-project-name={{ openstack_auth.project_name }} \
secret store -f value -p kolla | head -1
register: barbican_store_secret register: barbican_store_secret
run_once: True run_once: True
when: kolla_enable_sanity_barbican | bool when: kolla_enable_sanity_barbican | bool
- name: Barbican sanity - fetch secret - name: Barbican sanity - fetch secret
shell: docker exec -t barbican_api openstack \ command: >
--os-auth-url={{ openstack_auth.auth_url }} \ docker exec -t barbican_api openstack
--os-password={{ openstack_auth.password }} \ --os-auth-url={{ openstack_auth.auth_url }}
--os-username={{ openstack_auth.username }} \ --os-password={{ openstack_auth.password }}
--os-project-name={{ openstack_auth.project_name }} \ --os-username={{ openstack_auth.username }}
secret get -f value -p {{ barbican_store_secret.stdout }} --os-project-name={{ openstack_auth.project_name }}
secret get -f value -p {{ barbican_store_secret.stdout }}
register: barbican_get_secret register: barbican_get_secret
failed_when: barbican_get_secret.stdout != 'kolla' failed_when: barbican_get_secret.stdout != 'kolla'
run_once: True run_once: True
when: kolla_enable_sanity_barbican | bool when: kolla_enable_sanity_barbican | bool
- name: Barbican sanity - cleaning up - name: Barbican sanity - cleaning up
shell: docker exec -t barbican_api openstack \ command: >
--os-auth-url={{ openstack_auth.auth_url }} \ docker exec -t barbican_api openstack
--os-password={{ openstack_auth.password }} \ --os-auth-url={{ openstack_auth.auth_url }}
--os-username={{ openstack_auth.username }} \ --os-password={{ openstack_auth.password }}
--os-project-name={{ openstack_auth.project_name }} \ --os-username={{ openstack_auth.username }}
secret delete {{ barbican_store_secret.stdout }} --os-project-name={{ openstack_auth.project_name }}
secret delete {{ barbican_store_secret.stdout }}
run_once: True run_once: True
when: kolla_enable_sanity_barbican | bool when: kolla_enable_sanity_barbican | bool