These are the modules that Tower supports ' +
+ 'running commands against.',
+ dataTitle: 'Module',
+ dataPlacement: 'right',
+ dataContainer: 'body'
+ },
+ module_args: {
+ label: 'Arguments',
+ type: 'text',
+ awPopOverWatch: 'argsPopOver',
+ awPopOver: '{{ argsPopOver }}',
+ dataTitle: 'Arguments',
+ dataPlacement: 'right',
+ dataContainer: 'body',
+ autocomplete: false
+ },
+ limit: {
+ label: 'Limit',
+ type: 'text',
+
+ awPopOver: '
The pattern used to target hosts in the ' +
+ 'inventory. Leaving the field blank, all, and * will ' +
+ 'all target all hosts in the inventory. You can find ' +
+ 'more information about Ansible\'s host patterns ' +
+ 'here.
',
+ dataTitle: 'Limit',
+ dataPlacement: 'right',
+ dataContainer: 'body'
+ },
+ credential: {
+ label: 'Machine Credential',
+ type: 'lookup',
+ list: 'CredentialList',
+ basePath: 'credentials',
+ sourceModel: 'credential',
+ sourceField: 'name',
+ class: 'squeeze',
+ awPopOver: 'Select the credential you want to use when ' +
+ 'accessing the remote hosts to run the command. ' +
+ 'Choose the credential containing ' +
+ 'the username and SSH key or password that Ansbile ' +
+ 'will need to log into the remote hosts.
',
+ dataTitle: 'Credential',
+ dataPlacement: 'right',
+ dataContainer: 'body',
+ awRequiredWhen: {
+ reqExpression: 'credRequired',
+ init: 'false'
+ }
+ },
+ become_enabled: {
+ label: 'Enable Privilege Escalation',
+ type: 'checkbox',
+
+ column: 2,
+ awPopOver: "If enabled, run this playbook as an administrator. This is the equivalent of passing the --become option to the ansible command.
",
+ dataPlacement: 'right',
+ dataTitle: 'Become Privilege Escalation',
+ dataContainer: "body"
+ },
+ verbosity: {
+ label: 'Verbosity',
+ excludeModal: true,
+ type: 'select',
+ ngOptions: 'verbosity.label for verbosity in ' +
+ 'adhoc_verbosity_options ' +
+ 'track by verbosity.value',
+ required: true,
+ awPopOver:'These are the verbosity levels for standard ' +
+ 'out of the command run that are supported.',
+ dataTitle: 'Verbosity',
+ dataPlacement: 'right',
+ dataContainer: 'body',
+ "default": 1
+ },
+ forks: {
+ label: 'Forks',
+ id: 'forks-number',
+ type: 'number',
+ integer: true,
+ min: 0,
+ spinner: true,
+ "default": 0,
+ required: true,
+ 'class': "input-small",
+ column: 1,
+ awPopOver: '
The number of parallel or simultaneous processes to use while executing the command. 0 signifies ' +
+ 'the default value from the ansible configuration file.
',
+ dataTitle: 'Forks',
+ dataPlacement: 'right',
+ dataContainer: "body"
+ },
+ extra_vars: {
+ label: i18n._('Extra Variables'),
+ type: 'textarea',
+ class: 'Form-textAreaLabel Form-formGroup--fullWidth',
+ rows: 6,
+ "default": "---",
+ column: 2,
+ awPopOver: "" + i18n.sprintf(i18n._("Pass extra command line variables. This is the %s or %s command line parameter " +
+ "for %s. Provide key/value pairs using either YAML or JSON."), '-e', '--extra-vars', 'ansible') + "
" +
+ "JSON:
+
diff --git a/awx/ui/client/src/inventories/main.js b/awx/ui/client/src/inventories/main.js
index 0d9c4c3f84..e4dc100382 100644
--- a/awx/ui/client/src/inventories/main.js
+++ b/awx/ui/client/src/inventories/main.js
@@ -4,6 +4,7 @@
* All Rights Reserved
*************************************************/
+import adhoc from './adhoc/main';
import host from './hosts/main';
import group from './groups/main';
import sources from './sources/main';
@@ -17,8 +18,10 @@ import { N_ } from '../i18n';
import InventoryList from './inventory.list';
import InventoryForm from './inventory.form';
import InventoryManageService from './inventory-manage.service';
+import adHocRoute from './adhoc/adhoc.route';
export default
angular.module('inventory', [
+ adhoc.name,
host.name,
group.name,
sources.name,
@@ -81,6 +84,60 @@ angular.module('inventory', [
}
});
+ let adhocCredentialLookup = {
+ searchPrefix: 'credential',
+ name: 'inventories.edit.adhoc.credential',
+ url: '/credential',
+ data: {
+ formChildState: true
+ },
+ params: {
+ credential_search: {
+ value: {
+ page_size: '5'
+ },
+ squash: true,
+ dynamic: true
+ }
+ },
+ ncyBreadcrumb: {
+ skip: true
+ },
+ views: {
+ 'related': {
+ templateProvider: function(ListDefinition, generateList) {
+ let list_html = generateList.build({
+ mode: 'lookup',
+ list: ListDefinition,
+ input_type: 'radio'
+ });
+ return `
${list_html}`;
+
+ }
+ }
+ },
+ resolve: {
+ ListDefinition: ['CredentialList', function(CredentialList) {
+ let list = _.cloneDeep(CredentialList);
+ list.lookupConfirmText = 'SELECT';
+ return list;
+ }],
+ Dataset: ['ListDefinition', 'QuerySet', '$stateParams', 'GetBasePath',
+ (list, qs, $stateParams, GetBasePath) => {
+ let path = GetBasePath(list.name) || GetBasePath(list.basePath);
+ return qs.search(path, $stateParams[`${list.iterator}_search`]);
+ }
+ ]
+ },
+ onExit: function($state) {
+ if ($state.transition) {
+ $('#form-modal').modal('hide');
+ $('.modal-backdrop').remove();
+ $('body').removeClass('modal-open');
+ }
+ }
+ };
+
return Promise.all([
basicInventoryAdd,
basicInventoryEdit,
@@ -121,7 +178,9 @@ angular.module('inventory', [
}
]
}
- })
+ }),
+ stateExtender.buildDefinition(adHocRoute),
+ stateExtender.buildDefinition(adhocCredentialLookup)
])
};
});
diff --git a/awx/ui/client/src/inventories/related-hosts/list/host-list.controller.js b/awx/ui/client/src/inventories/related-hosts/list/host-list.controller.js
index f89b6c6606..e9eaea0973 100644
--- a/awx/ui/client/src/inventories/related-hosts/list/host-list.controller.js
+++ b/awx/ui/client/src/inventories/related-hosts/list/host-list.controller.js
@@ -143,8 +143,17 @@ export default ['$scope', 'RelatedHostsListDefinition', '$rootScope', 'GetBasePa
var hostIds = _.map($scope.hostsSelected, (host) => host.id);
$state.go('systemTracking', {
inventoryId: $state.params.inventory_id,
- hosts: $scope.$parent.hostsSelectedItems,
+ hosts: $scope.hostsSelected,
hostIds: hostIds
});
};
+
+ $scope.setAdhocPattern = function(){
+ var pattern = _($scope.hostsSelected)
+ .map(function(item){
+ return item.name;
+ }).value().join(':');
+
+ $state.go('^.adhoc', {pattern: pattern});
+ };
}];
diff --git a/awx/ui/client/src/inventories/related-hosts/related-host.list.js b/awx/ui/client/src/inventories/related-hosts/related-host.list.js
index 3b4140e74a..e936e3c590 100644
--- a/awx/ui/client/src/inventories/related-hosts/related-host.list.js
+++ b/awx/ui/client/src/inventories/related-hosts/related-host.list.js
@@ -83,6 +83,19 @@ export default {
},
actions: {
+ launch: {
+ mode: 'all',
+ ngDisabled: '!hostsSelected',
+ ngClick: 'setAdhocPattern()',
+ awToolTip: "Select an inventory source by clicking the check box beside it. The inventory source can be a single group or host, a selection of multiple hosts, or a selection of multiple groups.",
+ dataTipWatch: "adhocCommandTooltip",
+ actionClass: 'btn List-buttonDefault',
+ buttonContent: 'RUN COMMANDS',
+ showTipWhenDisabled: true,
+ tooltipInnerClass: "Tooltip-wide",
+ // TODO: we don't always want to show this
+ ngShow: true
+ },
system_tracking: {
buttonContent: 'System Tracking',
ngClick: 'systemTracking()',