From 531c6afa58c45bff21cdb1a912de855927b3d9f1 Mon Sep 17 00:00:00 2001
From: AlanCoding <arominger@ansible.com>
Date: Wed, 30 Mar 2016 16:20:06 -0400
Subject: [PATCH] further clarify OpenStack options, consolidate to one PopOver

---
 awx/ui/client/src/forms/Credentials.js   | 10 +++++++---
 awx/ui/client/src/helpers/Credentials.js |  8 +++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/awx/ui/client/src/forms/Credentials.js b/awx/ui/client/src/forms/Credentials.js
index b60906c8e7..4b40179f54 100644
--- a/awx/ui/client/src/forms/Credentials.js
+++ b/awx/ui/client/src/forms/Credentials.js
@@ -341,7 +341,7 @@ export default
                     ngShow: "kind.value == 'gce' || kind.value == 'openstack'",
                     awPopOverWatch: "projectPopOver",
                     awPopOver: "set in helpers/credentials",
-                    dataTitle: 'Project ID',
+                    dataTitle: 'Project Name',
                     dataPlacement: 'right',
                     dataContainer: "body",
                     addRequired: false,
@@ -356,8 +356,12 @@ export default
                     labelBind: 'domainLabel',
                     type: 'text',
                     ngShow: "kind.value == 'openstack'",
-                    awPopOver: "<p>Domain used for Keystone v3 <br />identity service.</p>",
-                    dataTitle: 'Domain Name (optional)',
+                    awPopOver: "<p>OpenStack domains define administrative " +
+                    "boundaries. It is only needed for Keystone v3 authentication URLs. " +
+                    "Common scenarios include:<ul><li><b>v2 URLs</b> - leave blank</li>" +
+                    "<li><b>v3 default</b> - set to 'default'</br></li>" +
+                    "<li><b>v3 multi-domain</b> - your domain name</p></li></ul></p>",
+                    dataTitle: 'Domain Name',
                     dataPlacement: 'right',
                     dataContainer: "body",
                     addRequired: false,
diff --git a/awx/ui/client/src/helpers/Credentials.js b/awx/ui/client/src/helpers/Credentials.js
index 1427e9f8a6..653ad6b4bf 100644
--- a/awx/ui/client/src/helpers/Credentials.js
+++ b/awx/ui/client/src/helpers/Credentials.js
@@ -74,8 +74,6 @@ angular.module('CredentialsHelper', ['Utilities'])
                  scope.project_required = false;
                  scope.passwordLabel = 'Password (API Key)';
                  scope.projectPopOver = "<p>The project value</p>";
-                 scope.domainPopOver = "<p>Domain used for Keystone v3 " +
-                    "<br />identity service.</p>";
                  scope.hostPopOver = "<p>The host value</p>";
 
                  if (!Empty(scope.kind)) {
@@ -128,13 +126,13 @@ angular.module('CredentialsHelper', ['Utilities'])
                          case 'openstack':
                              scope.hostLabel = "Host (Authentication URL)";
                              scope.projectLabel = "Project (Tenant Name)";
-                             scope.domainLabel = "Domain Name (optional)";
+                             scope.domainLabel = "Domain Name";
                              scope.password_required = true;
                              scope.project_required = true;
                              scope.host_required = true;
                              scope.username_required = true;
-                             scope.projectPopOver = "<p>This is the tenant name " +
-                                 "or tenant id. This value is usually the same " +
+                             scope.projectPopOver = "<p>This is the tenant name. " +
+                                 " This value is usually the same " +
                                  " as the username.</p>";
                              scope.hostPopOver = "<p>The host to authenticate with." +
                                  "<br />For example, https://openstack.business.com/v2.0/";