aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-10 02:14:47 +0000
committerGerrit Code Review <review@openstack.org>2016-03-10 02:14:48 +0000
commita84bc980a1cb9344ca2f533ed3b8a195c3df768c (patch)
tree07c3af1eb0fb1fb6ff3aac0f131405986de4465d
parent395bb2e3aa050c209a2c49920926a80a1ab8441d (diff)
parent0f1b9b87d9c2fd960b2c8062dced54aedcb4878d (diff)
downloadkolla-a84bc980a1cb9344ca2f533ed3b8a195c3df768c.tar.gz
kolla-a84bc980a1cb9344ca2f533ed3b8a195c3df768c.zip
Merge "Fix Manila v2 endpoint"
-rw-r--r--ansible/roles/manila/tasks/register.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/ansible/roles/manila/tasks/register.yml b/ansible/roles/manila/tasks/register.yml
index 64f42d4ff..a804b3215 100644
--- a/ansible/roles/manila/tasks/register.yml
+++ b/ansible/roles/manila/tasks/register.yml
@@ -21,9 +21,9 @@
- {'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'}
+ - {'interface': 'admin', 'url': '{{ manila_v2_admin_endpoint }}', 'service_name': 'manilav2', 'service_type': 'sharev2'}
+ - {'interface': 'internal', 'url': '{{ manila_v2_internal_endpoint }}', 'service_name': 'manilav2', 'service_type': 'sharev2'}
+ - {'interface': 'public', 'url': '{{ manila_v2_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