From 5df0e3ccc9730811d60e4b55647574b2c6e31c15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Ole=C5=9B?= Date: Mon, 1 Jun 2015 14:58:05 +0000 Subject: [PATCH 1/2] Wait until rabbitmq is ready --- resources/rabbitmq_service/actions/run.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/resources/rabbitmq_service/actions/run.yml b/resources/rabbitmq_service/actions/run.yml index f928c291..66d36c77 100644 --- a/resources/rabbitmq_service/actions/run.yml +++ b/resources/rabbitmq_service/actions/run.yml @@ -15,3 +15,8 @@ - {{ management_port }}:15672 env: RABBITMQ_NODENAME: {{container_name}} + - shell: docker exec -t {{ name }} rabbitmqctl list_users + register: result + until: result.rc == 0 + retries: 20 + delay: 0.5 From db1c56eb94d78564d6adecb8352456000af0afba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Ole=C5=9B?= Date: Mon, 1 Jun 2015 14:58:39 +0000 Subject: [PATCH 2/2] Simulate removing keystone services Ansible modules does not implemenet removing yet --- resources/keystone_role/actions/remove.yml | 3 ++- resources/keystone_service_endpoint/actions/remove.yaml | 7 ++++++- resources/keystone_user/actions/remove.yml | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/resources/keystone_role/actions/remove.yml b/resources/keystone_role/actions/remove.yml index 386d38ea..2a719f43 100644 --- a/resources/keystone_role/actions/remove.yml +++ b/resources/keystone_role/actions/remove.yml @@ -2,4 +2,5 @@ sudo: yes tasks: - name: keystone role - keystone_user: endpoint=http://{{keystone_host}}:{{keystone_port}}/v2.0/ token={{admin_token}} user={{user_name}} tenant={{tenant_name}} role={{role_name}} state=absent + #TODO: not implemented in module + pause: seconds=1 diff --git a/resources/keystone_service_endpoint/actions/remove.yaml b/resources/keystone_service_endpoint/actions/remove.yaml index b15fe775..67218324 100644 --- a/resources/keystone_service_endpoint/actions/remove.yaml +++ b/resources/keystone_service_endpoint/actions/remove.yaml @@ -1 +1,6 @@ -#todo +- hosts: [{{ ip }}] + sudo: yes + tasks: + - name: keystone service and endpoint + #TODO: not implemented in module + pause: seconds=1 diff --git a/resources/keystone_user/actions/remove.yml b/resources/keystone_user/actions/remove.yml index a56289db..8ab1004f 100644 --- a/resources/keystone_user/actions/remove.yml +++ b/resources/keystone_user/actions/remove.yml @@ -2,4 +2,5 @@ sudo: yes tasks: - name: keystone user - keystone_user: endpoint=http://{{keystone_host}}:{{keystone_port}}/v2.0/ token={{admin_token}} user={{user_name}} password={{user_password}} tenant={{tenant_name}} state=absent + #TODO: not implemented in module + pause: seconds=1