External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-03 23:55:28 -02:30
Code Issues Packages Projects Releases Wiki Activity

Add support for directly managing instance groups

Browse Source 
* Associating/Disassociating an instance with a group
* Triggering a topology rebuild on that change
* Force rabbitmq cleanup of offline nodes
* Automatically check for dependent service startup
* Fetch and set hostname for celery so it doesn't clobber other
  celeries
* Rely on celery init signals to dyanmically set listen queues
* Removing old total_capacity instance manager property
This commit is contained in:
Matthew Jones
2017-10-06 10:47:02 -04:00
parent 6ede1dfbea
commit 624289bed7
7 changed files with 70 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
awx/api/views.py
View File

@@ -57,7 +57,7 @@ import pytz
from wsgiref.util import FileWrapper
# AWX
from awx.main.tasks import send_notifications
from awx.main.tasks import send_notifications, handle_ha_toplogy_changes
from awx.main.access import get_user_queryset
from awx.main.ha import is_ha_environment
from awx.api.authentication import TokenGetAuthentication
@@ -148,6 +148,29 @@ class UnifiedJobDeletionMixin(object):
return Response(status=status.HTTP_204_NO_CONTENT)
class InstanceGroupMembershipMixin(object):
'''
Manages signaling celery to reload its queue configuration on Instance Group membership changes
'''
def attach(self, request, *args, **kwargs):
response = super(InstanceGroupMembershipMixin, self).attach(request, *args, **kwargs)
if status.is_success(response.status_code):
handle_ha_toplogy_changes.apply_async()
return response
def unattach(self, request, *args, **kwargs):
response = super(InstanceGroupMembershipMixin, self).unattach(request, *args, **kwargs)
if status.is_success(response.status_code):
handle_ha_toplogy_changes.apply_async()
return response
def destroy(self, request, *args, **kwargs):
response = super(InstanceGroupMembershipMixin, self).destroy(request, *args, **kwargs)
if status.is_success(response.status_code):
handle_ha_toplogy_changes.apply_async()
return response
class ApiRootView(APIView):
authentication_classes = []
@@ -548,7 +571,7 @@ class InstanceUnifiedJobsList(SubListAPIView):
return qs
class InstanceInstanceGroupsList(SubListAPIView):
class InstanceInstanceGroupsList(InstanceGroupMembershipMixin, SubListCreateAttachDetachAPIView):
view_name = _("Instance's Instance Groups")
model = InstanceGroup
@@ -558,7 +581,7 @@ class InstanceInstanceGroupsList(SubListAPIView):
relationship = 'rampart_groups'
class InstanceGroupList(ListAPIView):
class InstanceGroupList(ListCreateAPIView):
view_name = _("Instance Groups")
model = InstanceGroup
@@ -566,7 +589,7 @@ class InstanceGroupList(ListAPIView):
new_in_320 = True
class InstanceGroupDetail(RetrieveAPIView):
class InstanceGroupDetail(InstanceGroupMembershipMixin, RetrieveDestroyAPIView):
view_name = _("Instance Group Detail")
model = InstanceGroup
@@ -584,7 +607,7 @@ class InstanceGroupUnifiedJobsList(SubListAPIView):
new_in_320 = True
class InstanceGroupInstanceList(SubListAPIView):
class InstanceGroupInstanceList(InstanceGroupMembershipMixin, SubListAttachDetachAPIView):
view_name = _("Instance Group's Instances")
model = Instance