diff options
| author | rthallisey <rhallise@redhat.com> | 2015-08-12 14:17:36 -0400 |
|---|---|---|
| committer | rthallisey <rhallise@redhat.com> | 2015-08-12 16:41:36 -0400 |
| commit | e7b45ab1abac8433d43f2509516748b3adec9804 (patch) | |
| tree | a18e95f2ad5c0f7b72943d941bb93544e1b76805 | |
| parent | 2ba86289737d8043189ed8347f2043f778c2f4da (diff) | |
| download | kolla-e7b45ab1abac8433d43f2509516748b3adec9804.tar.gz kolla-e7b45ab1abac8433d43f2509516748b3adec9804.zip | |
Ansible Cinder needs to create the v2 endpoint
The Cinder v1 API is deprecated. We need to use the v2 API.
Change-Id: I54cbcbd9ad8e07f5e18441dff31df570cc8c21da
Closes-bug: #1484228
| -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 }}}" |
