diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-04 17:57:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-04 17:57:09 +0000 |
| commit | 92d5b3e5e06a1699621f766f3e214fb796dcc5c3 (patch) | |
| tree | 22813784262d98430992e19f081c11d521b48291 | |
| parent | 3c015ad207d947bf0757724c5ae37361c58f2a81 (diff) | |
| parent | 93df1da8ddd7ff3cb7d7c2468045b5b67a853fc8 (diff) | |
| download | kolla-92d5b3e5e06a1699621f766f3e214fb796dcc5c3.tar.gz kolla-92d5b3e5e06a1699621f766f3e214fb796dcc5c3.zip | |
Merge "Fix Keystone v3 for Manila"
| -rw-r--r-- | ansible/roles/manila/tasks/register.yml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ansible/roles/manila/tasks/register.yml b/ansible/roles/manila/tasks/register.yml index e3fe7e2f6..64f42d4ff 100644 --- a/ansible/roles/manila/tasks/register.yml +++ b/ansible/roles/manila/tasks/register.yml @@ -2,8 +2,8 @@ - name: Creating the Manila service and endpoint command: docker exec -t kolla_toolbox /usr/bin/ansible localhost -m kolla_keystone_service - -a "service_name=manila - service_type=share + -a "service_name={{ item.service_name }} + service_type={{ item.service_type }} description='Openstack Shared Filesystems' endpoint_region={{ openstack_region_name }} url='{{ item.url }}' @@ -18,12 +18,12 @@ delay: 5 run_once: True with_items: - - {'interface': 'admin', 'url': '{{ mistral_admin_endpoint }}'} - - {'interface': 'internal', 'url': '{{ mistral_internal_endpoint }}'} - - {'interface': 'public', 'url': '{{ mistral_public_endpoint }}'} - - {'interface': 'admin', 'url': '{{ mistral_v2_admin_endpoint }}'} - - {'interface': 'internal', 'url': '{{ mistral_v2_internal_endpoint }}'} - - {'interface': 'public', 'url': '{{ mistral_v2_public_endpoint }}'} + - {'interface': 'admin', 'url': '{{ manila_admin_endpoint }}', 'service_name': 'manila', 'service_type': 'share'} + - {'interface': 'internal', 'url': '{{ manila_internal_endpoint }}', 'service_name': 'manila', 'service_type': 'share'} + - {'interface': 'public', 'url': '{{ manila_public_endpoint }}', 'service_name': 'manila', 'service_type': 'share'} + - {'interface': 'admin', 'url': '{{ manila_admin_endpoint }}', 'service_name': 'manilav2', 'service_type': 'sharev2'} + - {'interface': 'internal', 'url': '{{ manila_internal_endpoint }}', 'service_name': 'manilav2', 'service_type': 'sharev2'} + - {'interface': 'public', 'url': '{{ manila_public_endpoint }}', 'service_name': 'manilav2', 'service_type': 'sharev2'} - name: Creating the Manila project, user and role command: docker exec -t kolla_toolbox /usr/bin/ansible localhost |