From beb6be189c7d716de2fa1cbfc0ad80f6bafce42c Mon Sep 17 00:00:00 2001
From: Michael Abashian <mabashian@ansible.com>
Date: Wed, 1 Jun 2016 17:07:33 -0400
Subject: [PATCH] Made username/password/tenant_id/client_id/client_secret all
 optional when creating an Azure Resource Manager credential.

---
 awx/ui/client/src/forms/Credentials.js   | 12 ------------
 awx/ui/client/src/helpers/Credentials.js |  2 --
 2 files changed, 14 deletions(-)

diff --git a/awx/ui/client/src/forms/Credentials.js b/awx/ui/client/src/forms/Credentials.js
index 1b92b87e85..e4c715d66d 100644
--- a/awx/ui/client/src/forms/Credentials.js
+++ b/awx/ui/client/src/forms/Credentials.js
@@ -310,10 +310,6 @@ export default
                 client:{
                     type: 'text',
                     label: 'Client ID',
-                    awRequiredWhen: {
-                        reqExpression: "azure_rm_required",
-                        init: false
-                    },
                     subForm: 'credentialSubForm',
                     ngShow: "kind.value === 'azure_rm'"
                 },
@@ -322,20 +318,12 @@ export default
                     hasShowInputButton: true,
                     autocomplete: false,
                     label: 'Client Secret',
-                    awRequiredWhen: {
-                        reqExpression: "azure_rm_required",
-                        init: false
-                    },
                     subForm: 'credentialSubForm',
                     ngShow: "kind.value === 'azure_rm'"
                 },
                 tenant: {
                     type: 'text',
                     label: 'Tenent ID',
-                    awRequiredWhen: {
-                        reqExpression: "azure_rm_required",
-                        init: false
-                    },
                     subForm: 'credentialSubForm',
                     ngShow: "kind.value === 'azure_rm'"
                 },
diff --git a/awx/ui/client/src/helpers/Credentials.js b/awx/ui/client/src/helpers/Credentials.js
index 2abb06e4eb..f9960e550e 100644
--- a/awx/ui/client/src/helpers/Credentials.js
+++ b/awx/ui/client/src/helpers/Credentials.js
@@ -119,8 +119,6 @@ angular.module('CredentialsHelper', ['Utilities'])
                          case 'azure_rm':
                              scope.usernameLabel = "Username";
                              scope.subscription_required = true;
-                             scope.username_required = true;
-                             scope.password_required = true;
                              scope.passwordLabel = 'Password';
                              scope.azure_rm_required = true;
                          break;