From 040a42d51ad6c38ad1cfee9394ba5f062d87d449 Mon Sep 17 00:00:00 2001
From: Edward Hope-Morley <edward.hope-morley@canonical.com>
Date: Thu, 16 Feb 2017 10:53:18 +0000
Subject: [PATCH] Use service-domain for domain setup action

Change-Id: Ieced5c7552a45874ad920c0e0e1ab1cd44c73d00
Closes-Bug: 1593164
---
 templates/admin-openrc-v3 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/admin-openrc-v3 b/templates/admin-openrc-v3
index e5ee6aa..8a5e4a9 100644
--- a/templates/admin-openrc-v3
+++ b/templates/admin-openrc-v3
@@ -4,7 +4,7 @@ export OS_PASSWORD={{ admin_password }}
 export OS_AUTH_URL={{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v3
 export OS_USERNAME={{ admin_user }}
 export OS_TENANT_NAME={{ admin_tenant_name }}
-export OS_PROJECT_DOMAIN_ID=default
-export OS_USER_DOMAIN_ID=default
+export OS_PROJECT_DOMAIN_NAME={{ admin_domain_name }}
+export OS_USER_DOMAIN_NAME={{ admin_domain_name }}
 export OS_PROJECT_NAME={{ admin_tenant_name }}
 export OS_IDENTITY_API_VERSION=3