zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-03 06:31:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

back out openstack_v3 options but retain v3 functionality

Browse Source
This commit is contained in:
AlanCoding
2016-03-28 15:02:56 -04:00
parent ca3b2f3664
commit fa92b2e851
12 changed files with 32 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
awx/ui/client/src/forms/Credentials.js
View File

@@ -169,7 +169,7 @@ export default
"host": {
labelBind: 'hostLabel',
type: 'text',
ngShow: "kind.value == 'vmware' || kind.value == 'openstack' || kind.value === 'openstack_v3'",
ngShow: "kind.value == 'vmware' || kind.value == 'openstack'",
awPopOverWatch: "hostPopOver",
awPopOver: "set in helpers/credentials",
dataTitle: 'Host',
@@ -243,7 +243,7 @@ export default
"password": {
labelBind: 'passwordLabel',
type: 'sensitive',
ngShow: "kind.value == 'scm' || kind.value == 'vmware' || kind.value == 'openstack' || kind.value == 'openstack_v3'",
ngShow: "kind.value == 'scm' || kind.value == 'vmware' || kind.value == 'openstack'",
addRequired: false,
editRequired: false,
ask: false,
@@ -338,7 +338,7 @@ export default
"project": {
labelBind: 'projectLabel',
type: 'text',
ngShow: "kind.value == 'gce' || kind.value == 'openstack' || kind.value == 'openstack_v3'",
ngShow: "kind.value == 'gce' || kind.value == 'openstack'",
awPopOverWatch: "projectPopOver",
awPopOver: "set in helpers/credentials",
dataTitle: 'Project ID',
@@ -355,18 +355,13 @@ export default
"domain": {
labelBind: 'domainLabel',
type: 'text',
ngShow: "kind.value == 'openstack_v3'",
awPopOverWatch: "domainPopOver",
awPopOver: "set in helpers/credentials",
dataTitle: 'Domain Name',
ngShow: "kind.value == 'openstack'",
awPopOver: "<p>Domain used for Keystone v3 <br />identity service.</p>",
dataTitle: 'Domain Name (optional)',
dataPlacement: 'right',
dataContainer: "body",
addRequired: false,
editRequired: false,
awRequiredWhen: {
variable: 'domain_required',
init: false
},
subForm: 'credentialSubForm'
},
"vault_password": {