External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 01:47:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

add is_containerized to ig serializer

Browse Source
This commit is contained in:
Jake McDermott
2019-09-03 15:00:54 -04:00
committed by Shane McDonald
parent b547a8c3ca
commit 61a756c59d
3 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/api/serializers.py
View File

@@ -4730,6 +4730,11 @@ class InstanceGroupSerializer(BaseSerializer):
'Isolated groups have a designated controller group.'), 'Isolated groups have a designated controller group.'),
read_only=True read_only=True
) )
is_containerized = serializers.BooleanField(
help_text=_('Indicates whether instances in this group are containerized.'
'Containerized groups have a designated Openshift or Kubernetes cluster.'),
read_only=True
)
# NOTE: help_text is duplicated from field definitions, no obvious way of # NOTE: help_text is duplicated from field definitions, no obvious way of
# both defining field details here and also getting the field's help_text # both defining field details here and also getting the field's help_text
policy_instance_percentage = serializers.IntegerField( policy_instance_percentage = serializers.IntegerField(
@@ -4755,7 +4760,7 @@ class InstanceGroupSerializer(BaseSerializer):
fields = ("id", "type", "url", "related", "name", "created", "modified", fields = ("id", "type", "url", "related", "name", "created", "modified",
"capacity", "committed_capacity", "consumed_capacity", "capacity", "committed_capacity", "consumed_capacity",
"percent_capacity_remaining", "jobs_running", "jobs_total", "percent_capacity_remaining", "jobs_running", "jobs_total",
"instances", "controller", "is_controller", "is_isolated", "credential", "instances", "controller", "is_controller", "is_isolated", "is_containerized", "credential",
"policy_instance_percentage", "policy_instance_minimum", "policy_instance_list", "policy_instance_percentage", "policy_instance_minimum", "policy_instance_list",
"pod_spec_override", "summary_fields") "pod_spec_override", "summary_fields")

10
awx/ui/client/src/instance-groups/add-edit/edit-instance-group.controller.js
View File

@@ -2,6 +2,14 @@ function EditController ($rootScope, $state, models, strings) {
const vm = this || {}; const vm = this || {};
const { instanceGroup } = models; const { instanceGroup } = models;
if (instanceGroup.get('is_containerized')) {
return $state.go(
'instanceGroups.editContainerGroup',
{ instance_group_id: instanceGroup.get('id') },
{ reload: true }
);
}
$rootScope.breadcrumb.instance_group_name = instanceGroup.get('name'); $rootScope.breadcrumb.instance_group_name = instanceGroup.get('name');
vm.mode = 'edit'; vm.mode = 'edit';
@@ -51,4 +59,4 @@ EditController.$inject = [
'InstanceGroupsStrings' 'InstanceGroupsStrings'
]; ];
export default EditController; export default EditController;

10
awx/ui/client/src/instance-groups/container-groups/edit-container-group.controller.js
View File

@@ -1,10 +1,18 @@
function EditContainerGroupController($rootScope, $scope, $state, models, strings, i18n, EditContainerGroupDataset) { function EditContainerGroupController($rootScope, $scope, $state, models, strings, i18n, EditContainerGroupDataset) {
const vm = this || {}; const vm = this || {};
const { const {
instanceGroup, instanceGroup,
credential credential
} = models; } = models;
if (!instanceGroup.get('is_containerized')) {
return $state.go(
'instanceGroups.edit',
{ instance_group_id: instanceGroup.get('id') },
{ reload: true }
);
}
$rootScope.breadcrumb.instance_group_name = instanceGroup.get('name'); $rootScope.breadcrumb.instance_group_name = instanceGroup.get('name');
vm.mode = 'add'; vm.mode = 'add';