aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauricio Lima <mauriciolimab@gmail.com>2016-03-04 11:12:27 -0500
committerMauricio Lima <mauriciolimab@gmail.com>2016-03-04 11:29:00 -0500
commit93df1da8ddd7ff3cb7d7c2468045b5b67a853fc8 (patch)
treeabe1b6193e1d969c847d896d33e931583014ba4b
parente72c8f11472ce30adf02d0c39d6de144ac9b4fc7 (diff)
downloadkolla-93df1da8ddd7ff3cb7d7c2468045b5b67a853fc8.tar.gz
kolla-93df1da8ddd7ff3cb7d7c2468045b5b67a853fc8.zip
Fix Keystone v3 for Manila
TrivialFix Change-Id: I05bc0c95533372af11575f345e64d6f57ef9c157
-rw-r--r--ansible/roles/manila/tasks/register.yml16
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