From bf18e008c43a8bf422fcb905854b1d267d6b0ed4 Mon Sep 17 00:00:00 2001
From: Albert Mikaelyan <tahvok@gmail.com>
Date: Mon, 9 Oct 2017 21:26:16 +0300
Subject: [PATCH] designate variables for neutron integration

This adds designate and keystone variables needed for
designate integration in neutron.

Change-Id: I46316c658a3746f91313641e5a26de49a03b2164
Partial-Bug: 1687594
---
 group_vars/all/designate.yml | 29 +++++++++++++++++++++++++++++
 group_vars/designate_all.yml |  6 ------
 2 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 group_vars/all/designate.yml

diff --git a/group_vars/all/designate.yml b/group_vars/all/designate.yml
new file mode 100644
index 0000000000..3fa6496ab9
--- /dev/null
+++ b/group_vars/all/designate.yml
@@ -0,0 +1,29 @@
+---
+# Copyright 2017, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Used by both neutron and designate, and therefore must be in 'all' scope
+designate_keystone_auth_plugin: password
+designate_service_port: 9001
+designate_service_proto: http
+designate_service_user_name: designate
+designate_service_project_name: service
+designate_service_project_domain_id: default
+designate_service_user_domain_id: default
+designate_service_region: "{{ service_region }}"
+
+designate_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(designate_service_proto) }}"
+designate_service_adminuri: "{{ designate_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ designate_service_port }}"
+designate_service_adminurl: "{{ designate_service_adminuri }}/v2"
+
diff --git a/group_vars/designate_all.yml b/group_vars/designate_all.yml
index 316e8a9a8a..500491e282 100644
--- a/group_vars/designate_all.yml
+++ b/group_vars/designate_all.yml
@@ -13,18 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-designate_service_port: 9001
-designate_service_proto: http
-designate_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(designate_service_proto) }}"
-designate_service_adminuri: "{{ designate_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ designate_service_port }}"
-designate_service_adminurl: "{{ designate_service_adminuri }}"
 designate_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(designate_service_proto) }}"
 designate_service_internaluri: "{{ designate_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ designate_service_port }}"
 designate_service_internalurl: "{{ designate_service_internaluri }}"
 designate_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(designate_service_proto) }}"
 designate_service_publicuri: "{{ designate_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ designate_service_port }}"
 designate_service_publicurl: "{{ designate_service_publicuri }}"
-designate_service_region: "{{ service_region }}"
 
 # Galera
 designate_galera_address: "{{ galera_address }}"