diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-13 02:38:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-13 02:38:58 +0000 |
| commit | 59a2d537e0272a444834641f473f30e9850ff948 (patch) | |
| tree | a77f7986937e553abff3a40e720feec4ef9b0be8 | |
| parent | ff5996d7adceabb9d322c880bcea57e2bfc4f3cb (diff) | |
| parent | e7b45ab1abac8433d43f2509516748b3adec9804 (diff) | |
| download | kolla-59a2d537e0272a444834641f473f30e9850ff948.tar.gz kolla-59a2d537e0272a444834641f473f30e9850ff948.zip | |
Merge "Ansible Cinder needs to create the v2 endpoint"
| -rw-r--r-- | ansible/roles/cinder/tasks/register.yml | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/ansible/roles/cinder/tasks/register.yml b/ansible/roles/cinder/tasks/register.yml index cb62bdca5..aeb2e937d 100644 --- a/ansible/roles/cinder/tasks/register.yml +++ b/ansible/roles/cinder/tasks/register.yml @@ -3,12 +3,32 @@ command: docker exec -t kolla_ansible /usr/bin/ansible localhost -m kolla_keystone_service -a "service_name=cinder - service_type='Block Storage' + service_type=volume description='Openstack Block Storage' endpoint_region={{ openstack_region_name }} - admin_url='http://{{ kolla_internal_address }}:{{ cinder_api_port }}' - internal_url='http://{{ kolla_internal_address }}:{{ cinder_api_port }}' - public_url='http://{{ kolla_external_address }}:{{ cinder_api_port }}' + admin_url='http://{{ kolla_internal_address }}:{{ cinder_api_port }}/v2/%(tenant_id)s' + internal_url='http://{{ kolla_internal_address }}:{{ cinder_api_port }}/v2/%(tenant_id)s' + public_url='http://{{ kolla_external_address }}:{{ cinder_api_port }}/v2/%(tenant_id)s' + region_name={{ openstack_region_name }} + auth={{ '{{ openstack_cinder_auth }}' }}" + -e "{'openstack_cinder_auth':{{ openstack_cinder_auth }}}" + register: cinder_endpoint + changed_when: "{{ cinder_endpoint.stdout.find('localhost | SUCCESS => ') != -1 and (cinder_endpoint.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}" + until: cinder_endpoint.stdout.split()[2] == 'SUCCESS' + retries: 10 + delay: 5 + run_once: True + +- name: Creating the Cinder v2 service and endpoint + command: docker exec -t kolla_ansible /usr/bin/ansible localhost + -m kolla_keystone_service + -a "service_name=cinderv2 + service_type=volumev2 + description='Openstack Block Storage' + endpoint_region={{ openstack_region_name }} + admin_url='http://{{ kolla_internal_address }}:{{ cinder_api_port }}/v2/%(tenant_id)s' + internal_url='http://{{ kolla_internal_address }}:{{ cinder_api_port }}/v2/%(tenant_id)s' + public_url='http://{{ kolla_external_address }}:{{ cinder_api_port }}/v2/%(tenant_id)s' region_name={{ openstack_region_name }} auth={{ '{{ openstack_cinder_auth }}' }}" -e "{'openstack_cinder_auth':{{ openstack_cinder_auth }}}" |