Merge branch 'devel' into ikke-t-selinux-fix

CONTRIBUTING.md

@@ -86,8 +86,8 @@ If you're not using Docker for Mac, or Docker for Windows, you may need, or choo
 
 The AWX UI requires the following:
 
-- Node 6.x LTS version
-- NPM 3.x LTS
+- Node 8.x LTS
+- NPM 6.x LTS
 
 ### Build the environment
 
@@ -145,7 +145,7 @@ Start the development containers by running the following:
 (host)$ make docker-compose
 ```
     
-The above utilizes the image built in the previous step, and will automatically start all required services and dependent containers. Once the containers launch, your session will be attached to the *awx* container, and you'll be able to watch log messages and events in real time. You will see messages from Django, celery, and the front end build process.
+The above utilizes the image built in the previous step, and will automatically start all required services and dependent containers. Once the containers launch, your session will be attached to the *awx* container, and you'll be able to watch log messages and events in real time. You will see messages from Django and the front end build process.
 
 If you start a second terminal session, you can take a look at the running containers using the `docker ps` command. For example:
 
@@ -174,7 +174,7 @@ The first time you start the environment, database migrations need to run in ord
 ```bash
 awx_1        | Operations to perform:
 awx_1        |   Synchronize unmigrated apps: solo, api, staticfiles, debug_toolbar, messages, channels, django_extensions, ui, rest_framework, polymorphic
-awx_1        |   Apply all migrations: sso, taggit, sessions, djcelery, sites, kombu_transport_django, social_auth, contenttypes, auth, conf, main
+awx_1        |   Apply all migrations: sso, taggit, sessions, sites, kombu_transport_django, social_auth, contenttypes, auth, conf, main
 awx_1        | Synchronizing apps without migrations:
 awx_1        |   Creating tables...
 awx_1        |     Running deferred SQL...

INSTALL.md

@@ -119,12 +119,12 @@ To complete a deployment to OpenShift, you will obviously need access to an Open
 
 You will also need to have the `oc` command in your PATH. The `install.yml` playbook will call out to `oc` when logging into, and creating objects on the cluster.
 
-The default resource requests per-pod requires:
+The default resource requests per-deployment requires:
 
 > Memory: 6GB
 > CPU: 3 cores
 
-This can be tuned by overriding the variables found in [/installer/openshift/defaults/main.yml](/installer/openshift/defaults/main.yml). Special care should be taken when doing this as undersized instances will experience crashes and resource exhaustion.
+This can be tuned by overriding the variables found in [/installer/roles/kubernetes/defaults/main.yml](/installer/roles/kubernetes/defaults/main.yml). Special care should be taken when doing this as undersized instances will experience crashes and resource exhaustion.
 
 For more detail on how resource requests are formed see: [https://docs.openshift.com/container-platform/latest/dev_guide/compute_resources.html#dev-compute-resources](https://docs.openshift.com/container-platform/latest/dev_guide/compute_resources.html#dev-compute-resources)
 
@@ -236,7 +236,7 @@ Using /etc/ansible/ansible.cfg as config file
 }
 Operations to perform:
   Synchronize unmigrated apps: solo, api, staticfiles, messages, channels, django_extensions, ui, rest_framework, polymorphic
-  Apply all migrations: sso, taggit, sessions, djcelery, sites, kombu_transport_django, social_auth, contenttypes, auth, conf, main
+  Apply all migrations: sso, taggit, sessions, sites, kombu_transport_django, social_auth, contenttypes, auth, conf, main
 Synchronizing apps without migrations:
   Creating tables...
     Running deferred SQL...
@@ -548,7 +548,7 @@ Using /etc/ansible/ansible.cfg as config file
 }
 Operations to perform:
   Synchronize unmigrated apps: solo, api, staticfiles, messages, channels, django_extensions, ui, rest_framework, polymorphic
-  Apply all migrations: sso, taggit, sessions, djcelery, sites, kombu_transport_django, social_auth, contenttypes, auth, conf, main
+  Apply all migrations: sso, taggit, sessions, sites, kombu_transport_django, social_auth, contenttypes, auth, conf, main
 Synchronizing apps without migrations:
   Creating tables...
     Running deferred SQL...

Makefile

@@ -59,7 +59,7 @@ UI_RELEASE_FLAG_FILE = awx/ui/.release_built
 I18N_FLAG_FILE = .i18n_built
 
 .PHONY: awx-link clean clean-tmp clean-venv requirements requirements_dev \
-	develop refresh adduser migrate dbchange dbshell runserver celeryd \
+	develop refresh adduser migrate dbchange dbshell runserver \
 	receiver test test_unit test_ansible test_coverage coverage_html \
 	dev_build release_build release_clean sdist \
 	ui-docker-machine ui-docker ui-release ui-devel \
@@ -165,7 +165,7 @@ requirements_awx: virtualenv_awx
 	else \
 	    cat requirements/requirements.txt requirements/requirements_git.txt | $(VENV_BASE)/awx/bin/pip install $(PIP_OPTIONS) --no-binary $(SRC_ONLY_PKGS) --ignore-installed -r /dev/stdin ; \
 	fi
-	$(VENV_BASE)/awx/bin/pip uninstall --yes -r requirements/requirements_tower_uninstall.txt
+	#$(VENV_BASE)/awx/bin/pip uninstall --yes -r requirements/requirements_tower_uninstall.txt
 
 requirements_awx_dev:
 	$(VENV_BASE)/awx/bin/pip install -r requirements/requirements_dev.txt
@@ -233,7 +233,7 @@ server_noattach:
 	tmux new-session -d -s awx 'exec make uwsgi'
 	tmux rename-window 'AWX'
 	tmux select-window -t awx:0
-	tmux split-window -v 'exec make celeryd'
+	tmux split-window -v 'exec make dispatcher'
 	tmux new-window 'exec make daphne'
 	tmux select-window -t awx:1
 	tmux rename-window 'WebSockets'
@@ -265,12 +265,6 @@ honcho:
 	fi; \
 	honcho start -f tools/docker-compose/Procfile
 
-flower:
-	@if [ "$(VENV_BASE)" ]; then \
-		. $(VENV_BASE)/awx/bin/activate; \
-	fi; \
-	celery flower --address=0.0.0.0 --port=5555 --broker=amqp://guest:guest@$(RABBITMQ_HOST):5672//
-
 collectstatic:
 	@if [ "$(VENV_BASE)" ]; then \
 		. $(VENV_BASE)/awx/bin/activate; \
@@ -281,7 +275,7 @@ uwsgi: collectstatic
 	@if [ "$(VENV_BASE)" ]; then \
 		. $(VENV_BASE)/awx/bin/activate; \
 	fi; \
-    uwsgi -b 32768 --socket 127.0.0.1:8050 --module=awx.wsgi:application --home=/venv/awx --chdir=/awx_devel/ --vacuum --processes=5 --harakiri=120 --master --no-orphans --py-autoreload 1 --max-requests=1000 --stats /tmp/stats.socket --lazy-apps --logformat "%(addr) %(method) %(uri) - %(proto) %(status)" --hook-accepting1-once="exec:/bin/sh -c '[ -f /tmp/celery_pid ] && kill -1 `cat /tmp/celery_pid` || true'"
+    uwsgi -b 32768 --socket 127.0.0.1:8050 --module=awx.wsgi:application --home=/venv/awx --chdir=/awx_devel/ --vacuum --processes=5 --harakiri=120 --master --no-orphans --py-autoreload 1 --max-requests=1000 --stats /tmp/stats.socket --lazy-apps --logformat "%(addr) %(method) %(uri) - %(proto) %(status)" --hook-accepting1-once="exec:awx-manage run_dispatcher --reload"
 
 daphne:
 	@if [ "$(VENV_BASE)" ]; then \
@@ -302,13 +296,13 @@ runserver:
 	fi; \
 	$(PYTHON) manage.py runserver
 
-# Run to start the background celery worker for development.
-celeryd:
-	rm -f /tmp/celery_pid
+# Run to start the background task dispatcher for development.
+dispatcher:
 	@if [ "$(VENV_BASE)" ]; then \
 		. $(VENV_BASE)/awx/bin/activate; \
 	fi; \
-	celery worker -A awx -l DEBUG -B -Ofair --autoscale=100,4 --schedule=$(CELERY_SCHEDULE_FILE) -n celery@$(COMPOSE_HOST) --pidfile /tmp/celery_pid
+	$(PYTHON) manage.py run_dispatcher
+
 
 # Run to start the zeromq callback receiver
 receiver:
@@ -355,7 +349,7 @@ check: flake8 pep8 # pyflakes pylint
 awx-link:
 	cp -R /tmp/awx.egg-info /awx_devel/ || true
 	sed -i "s/placeholder/$(shell git describe --long | sed 's/\./\\./g')/" /awx_devel/awx.egg-info/PKG-INFO
-	cp /tmp/awx.egg-link /venv/awx/lib/python2.7/site-packages/awx.egg-link
+	cp -f /tmp/awx.egg-link /venv/awx/lib/python2.7/site-packages/awx.egg-link
 
 TEST_DIRS ?= awx/main/tests/unit awx/main/tests/functional awx/conf/tests awx/sso/tests
 
@@ -466,7 +460,7 @@ $(I18N_FLAG_FILE): $(UI_DEPS_FLAG_FILE)
 ui-deps: $(UI_DEPS_FLAG_FILE)
 
 $(UI_DEPS_FLAG_FILE):
-	$(NPM_BIN) --unsafe-perm --prefix awx/ui install awx/ui
+	$(NPM_BIN) --unsafe-perm --prefix awx/ui install --no-save awx/ui
 	touch $(UI_DEPS_FLAG_FILE)
 
 ui-docker-machine: $(UI_DEPS_FLAG_FILE)
@@ -565,7 +559,10 @@ docker-compose-test: docker-auth
 	cd tools && TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose run --rm --service-ports awx /bin/bash
 
 docker-compose-runtest:
-	cd tools && TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose run --rm --service-ports awx /start_tests.sh
+	cd tools && TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose run --user=$(shell id -u) --rm --service-ports awx /start_tests.sh
+
+docker-compose-build-swagger:
+	cd tools && TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose run --user=$(shell id -u) --rm --service-ports awx /start_tests.sh swagger
 
 docker-compose-clean:
 	cd tools && TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose run --rm -w /awx_devel --service-ports awx make clean
@@ -575,7 +572,7 @@ docker-compose-build: awx-devel-build
 
 # Base development image build
 awx-devel-build:
-	docker build -t ansible/awx_devel -f tools/docker-compose/Dockerfile .
+	docker build -t ansible/awx_devel --build-arg UID=$(shell id -u) -f tools/docker-compose/Dockerfile .
 	docker tag ansible/awx_devel $(DEV_DOCKER_TAG_BASE)/awx_devel:$(COMPOSE_TAG)
 	#docker push $(DEV_DOCKER_TAG_BASE)/awx_devel:$(COMPOSE_TAG)
 

README.md

@@ -1,7 +1,6 @@
-[![Run Status](https://api.shippable.com/projects/591c82a22f895107009e8b35/badge?branch=devel)](https://app.shippable.com/github/ansible/awx)
+[![Gated by Zuul](https://zuul-ci.org/gated.svg)](https://ansible.softwarefactory-project.io/zuul/status)
 
-AWX
-===
+<img src="https://raw.githubusercontent.com/ansible/awx-logos/master/awx/ui/client/assets/logo-login.svg?sanitize=true" width=200 alt="AWX" />
 
 AWX provides a web-based user interface, REST API, and task engine built on top of [Ansible](https://github.com/ansible/ansible). It is the upstream project for [Tower](https://www.ansible.com/tower), a commercial derivative of AWX.  
 
@@ -11,6 +10,8 @@ To learn more about using AWX, and Tower, view the [Tower docs site](http://docs
 
 The AWX Project Frequently Asked Questions can be found [here](https://www.ansible.com/awx-project-faq).
 
+The AWX logos and branding assets are covered by [our trademark guidelines](https://github.com/ansible/awx-logos/blob/master/TRADEMARKS.md).
+
 Contributing
 ------------
 

VERSION

@@ -1 +1 @@
-2.0.0
+2.0.1

awx/__init__.py

@@ -12,14 +12,6 @@ __version__ = get_distribution('awx').version
 __all__ = ['__version__']
 
 
-# Isolated nodes do not have celery installed
-try:
-    from .celery import app as celery_app # noqa
-    __all__.append('celery_app')
-except ImportError:
-    pass
-
-
 # Check for the presence/absence of "devonly" module to determine if running
 # from a source code checkout or release packaage.
 try:

awx/api/views/__init__.py

@@ -599,7 +599,7 @@ class InstanceGroupInstanceList(InstanceGroupMembershipMixin, SubListAttachDetac
     search_fields = ('hostname',)
 
 
-class ScheduleList(ListAPIView):
+class ScheduleList(ListCreateAPIView):
 
     view_name = _("Schedules")
     model = Schedule
@@ -1291,7 +1291,7 @@ class ProjectUpdateNotificationsList(SubListAPIView):
     search_fields = ('subject', 'notification_type', 'body',)
 
 
-class ProjectUpdateScmInventoryUpdates(SubListCreateAPIView):
+class ProjectUpdateScmInventoryUpdates(SubListAPIView):
 
     view_name = _("Project Update SCM Inventory Updates")
     model = InventoryUpdate
@@ -1484,10 +1484,11 @@ class OAuth2TokenActivityStreamList(ActivityStreamEnforcementMixin, SubListAPIVi
     search_fields = ('changes',)
 
 
-class UserTeamsList(ListAPIView):
+class UserTeamsList(SubListAPIView):
 
-    model = User
+    model = Team
     serializer_class = TeamSerializer
+    parent_model = User
 
     def get_queryset(self):
         u = get_object_or_404(User, pk=self.kwargs['pk'])
@@ -1665,7 +1666,7 @@ class CredentialTypeDetail(RetrieveUpdateDestroyAPIView):
         return super(CredentialTypeDetail, self).destroy(request, *args, **kwargs)
 
 
-class CredentialTypeCredentialList(SubListAPIView):
+class CredentialTypeCredentialList(SubListCreateAPIView):
 
     model = Credential
     parent_model = CredentialType
@@ -2959,6 +2960,16 @@ class JobTemplateSurveySpec(GenericAPIView):
     obj_permission_type = 'admin'
     serializer_class = EmptySerializer
 
+    ALLOWED_TYPES = {
+        'text': six.string_types,
+        'textarea': six.string_types,
+        'password': six.string_types,
+        'multiplechoice': six.string_types,
+        'multiselect': six.string_types,
+        'integer': int,
+        'float': float
+    }
+
     def get(self, request, *args, **kwargs):
         obj = self.get_object()
         if not feature_enabled('surveys'):
@@ -2985,7 +2996,8 @@ class JobTemplateSurveySpec(GenericAPIView):
         obj.save(update_fields=['survey_spec'])
         return Response()
 
-    def _validate_spec_data(self, new_spec, old_spec):
+    @staticmethod
+    def _validate_spec_data(new_spec, old_spec):
         schema_errors = {}
         for field, expect_type, type_label in [
                 ('name', six.string_types, 'string'),
@@ -3006,40 +3018,75 @@ class JobTemplateSurveySpec(GenericAPIView):
         variable_set = set()
         old_spec_dict = JobTemplate.pivot_spec(old_spec)
         for idx, survey_item in enumerate(new_spec["spec"]):
+            context = dict(
+                idx=six.text_type(idx),
+                survey_item=survey_item
+            )
+            # General element validation
             if not isinstance(survey_item, dict):
                 return Response(dict(error=_("Survey question %s is not a json object.") % str(idx)), status=status.HTTP_400_BAD_REQUEST)
-            if "type" not in survey_item:
-                return Response(dict(error=_("'type' missing from survey question %s.") % str(idx)), status=status.HTTP_400_BAD_REQUEST)
-            if "question_name" not in survey_item:
-                return Response(dict(error=_("'question_name' missing from survey question %s.") % str(idx)), status=status.HTTP_400_BAD_REQUEST)
-            if "variable" not in survey_item:
-                return Response(dict(error=_("'variable' missing from survey question %s.") % str(idx)), status=status.HTTP_400_BAD_REQUEST)
+            for field_name in ['type', 'question_name', 'variable', 'required']:
+                if field_name not in survey_item:
+                    return Response(dict(error=_("'{field_name}' missing from survey question {idx}").format(
+                        field_name=field_name, **context
+                    )), status=status.HTTP_400_BAD_REQUEST)
+                val = survey_item[field_name]
+                allow_types = six.string_types
+                type_label = 'string'
+                if field_name == 'required':
+                    allow_types = bool
+                    type_label = 'boolean'
+                if not isinstance(val, allow_types):
+                    return Response(dict(error=_("'{field_name}' in survey question {idx} expected to be {type_label}.").format(
+                        field_name=field_name, type_label=type_label, **context
+                    )))
             if survey_item['variable'] in variable_set:
                 return Response(dict(error=_("'variable' '%(item)s' duplicated in survey question %(survey)s.") % {
                     'item': survey_item['variable'], 'survey': str(idx)}), status=status.HTTP_400_BAD_REQUEST)
             else:
                 variable_set.add(survey_item['variable'])
-            if "required" not in survey_item:
-                return Response(dict(error=_("'required' missing from survey question %s.") % str(idx)), status=status.HTTP_400_BAD_REQUEST)
 
-            if survey_item["type"] == "password" and "default" in survey_item:
-                if not isinstance(survey_item['default'], six.string_types):
+            # Type-specific validation
+            # validate question type <-> default type
+            qtype = survey_item["type"]
+            if qtype not in JobTemplateSurveySpec.ALLOWED_TYPES:
+                return Response(dict(error=_(
+                    "'{survey_item[type]}' in survey question {idx} is not one of '{allowed_types}' allowed question types."
+                ).format(
+                    allowed_types=', '.join(JobTemplateSurveySpec.ALLOWED_TYPES.keys()), **context
+                )))
+            if 'default' in survey_item:
+                if not isinstance(survey_item['default'], JobTemplateSurveySpec.ALLOWED_TYPES[qtype]):
+                    type_label = 'string'
+                    if qtype in ['integer', 'float']:
+                        type_label = qtype
                     return Response(dict(error=_(
-                        "Value {question_default} for '{variable_name}' expected to be a string."
+                        "Default value {survey_item[default]} in survey question {idx} expected to be {type_label}."
                     ).format(
-                        question_default=survey_item["default"], variable_name=survey_item["variable"])
-                    ), status=status.HTTP_400_BAD_REQUEST)
+                        type_label=type_label, **context
+                    )), status=status.HTTP_400_BAD_REQUEST)
+            # additional type-specific properties, the UI provides these even
+            # if not applicable to the question, TODO: request that they not do this
+            for key in ['min', 'max']:
+                if key in survey_item:
+                    if survey_item[key] is not None and (not isinstance(survey_item[key], int)):
+                        return Response(dict(error=_(
+                            "The {min_or_max} limit in survey question {idx} expected to be integer."
+                        ).format(min_or_max=key, **context)))
+            if qtype in ['multiplechoice', 'multiselect'] and 'choices' not in survey_item:
+                return Response(dict(error=_(
+                    "Survey question {idx} of type {survey_item[type]} must specify choices.".format(**context)
+                )))
 
+            # Process encryption substitution
             if ("default" in survey_item and isinstance(survey_item['default'], six.string_types) and
                     survey_item['default'].startswith('$encrypted$')):
                 # Submission expects the existence of encrypted DB value to replace given default
-                if survey_item["type"] != "password":
+                if qtype != "password":
                     return Response(dict(error=_(
                         "$encrypted$ is a reserved keyword for password question defaults, "
-                        "survey question {question_position} is type {question_type}."
-                    ).format(
-                        question_position=str(idx), question_type=survey_item["type"])
-                    ), status=status.HTTP_400_BAD_REQUEST)
+                        "survey question {idx} is type {survey_item[type]}."
+                    ).format(**context)), status=status.HTTP_400_BAD_REQUEST)
                 old_element = old_spec_dict.get(survey_item['variable'], {})
                 encryptedish_default_exists = False
                 if 'default' in old_element:
@@ -3051,10 +3098,10 @@ class JobTemplateSurveySpec(GenericAPIView):
                             encryptedish_default_exists = True
                 if not encryptedish_default_exists:
                     return Response(dict(error=_(
-                        "$encrypted$ is a reserved keyword, may not be used for new default in position {question_position}."
-                    ).format(question_position=str(idx))), status=status.HTTP_400_BAD_REQUEST)
+                        "$encrypted$ is a reserved keyword, may not be used for new default in position {idx}."
+                    ).format(**context)), status=status.HTTP_400_BAD_REQUEST)
                 survey_item['default'] = old_element['default']
-            elif survey_item["type"] == "password" and 'default' in survey_item:
+            elif qtype == "password" and 'default' in survey_item:
                 # Submission provides new encrypted default
                 survey_item['default'] = encrypt_value(survey_item['default'])
 
@@ -3318,7 +3365,7 @@ class JobTemplateCallback(GenericAPIView):
         with transaction.atomic():
             job = job_template.create_job(**kv)
 
-        # Send a signal to celery that the job should be started.
+        # Send a signal to signify that the job should be started.
         result = job.signal_start(inventory_sources_already_updated=inventory_sources_already_updated)
         if not result:
             data = dict(msg=_('Error starting job!'))
@@ -3438,10 +3485,6 @@ class WorkflowJobTemplateNodeChildrenBaseList(WorkflowsEnforcementMixin, Enforce
         return getattr(parent, self.relationship).all()
 
     def is_valid_relation(self, parent, sub, created=False):
-        mutex_list = ('success_nodes', 'failure_nodes') if self.relationship == 'always_nodes' else ('always_nodes',)
-        for relation in mutex_list:
-            if getattr(parent, relation).all().exists():
-                return {'Error': _('Cannot associate {0} when {1} have been associated.').format(self.relationship, relation)}
 
         if created:
             return None

awx/api/views/mixin.py

@@ -101,7 +101,9 @@ class UnifiedJobDeletionMixin(object):
 
 class InstanceGroupMembershipMixin(object):
     '''
-    Manages signaling celery to reload its queue configuration on Instance Group membership changes
+    This mixin overloads attach/detach so that it calls InstanceGroup.save(),
+    triggering a background recalculation of policy-based instance group
+    membership.
     '''
     def attach(self, request, *args, **kwargs):
         response = super(InstanceGroupMembershipMixin, self).attach(request, *args, **kwargs)

awx/celery.py

@@ -1,25 +0,0 @@
-
-# Copyright (c) 2017 Ansible, Inc.
-# All Rights Reserved.
-
-from __future__ import absolute_import, unicode_literals
-
-import os
-from celery import Celery
-from django.conf import settings # noqa
-
-
-try:
-    import awx.devonly # noqa
-    MODE = 'development'
-except ImportError: # pragma: no cover
-    MODE = 'production'
-
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'awx.settings.%s' % MODE)
-
-app = Celery('awx')
-app.config_from_object('django.conf:settings')
-app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
-
-if __name__ == '__main__':
-    app.start()

awx/conf/settings.py

@@ -2,11 +2,13 @@
 from collections import namedtuple
 import contextlib
 import logging
+import re
 import sys
 import threading
 import time
 import StringIO
 import traceback
+import urllib
 
 import six
 
@@ -60,6 +62,15 @@ SETTING_CACHE_DEFAULTS = True
 __all__ = ['SettingsWrapper', 'get_settings_to_cache', 'SETTING_CACHE_NOTSET']
 
 
+def normalize_broker_url(value):
+    parts = value.rsplit('@', 1)
+    match = re.search('(amqp://[^:]+:)(.*)', parts[0])
+    if match:
+        prefix, password = match.group(1), match.group(2)
+        parts[0] = prefix + urllib.quote(password)
+    return '@'.join(parts)
+
+
 @contextlib.contextmanager
 def _ctit_db_wrapper(trans_safe=False):
     '''
@@ -115,7 +126,8 @@ def _ctit_db_wrapper(trans_safe=False):
             bottom_stack.close()
             # Log the combined stack
             if trans_safe:
-                logger.warning('Database settings are not available, using defaults, error:\n{}'.format(tb_string))
+                if 'check_migrations' not in sys.argv:
+                    logger.warning('Database settings are not available, using defaults, error:\n{}'.format(tb_string))
             else:
                 logger.error('Error modifying something related to database settings.\n{}'.format(tb_string))
     finally:
@@ -444,7 +456,16 @@ class SettingsWrapper(UserSettingsHolder):
                 value = self._get_local(name)
         if value is not empty:
             return value
-        return self._get_default(name)
+        value = self._get_default(name)
+        # sometimes users specify RabbitMQ passwords that contain
+        # unescaped : and @ characters that confused urlparse, e.g.,
+        # amqp://guest:a@ns:ibl3#@localhost:5672//
+        #
+        # detect these scenarios, and automatically escape the user's
+        # password so it just works
+        if name == 'BROKER_URL':
+            value = normalize_broker_url(value)
+        return value
 
     def _set_local(self, name, value):
         field = self.registry.get_setting_field(name)

awx/main/dispatch/__init__.py

@@ -0,0 +1,5 @@
+from django.conf import settings
+
+
+def get_local_queuename():
+    return settings.CLUSTER_HOST_ID.encode('utf-8')

awx/main/dispatch/control.py

@@ -0,0 +1,60 @@
+import logging
+import socket
+
+from django.conf import settings
+
+from awx.main.dispatch import get_local_queuename
+from kombu import Connection, Queue, Exchange, Producer, Consumer
+
+logger = logging.getLogger('awx.main.dispatch')
+
+
+class Control(object):
+
+    services = ('dispatcher', 'callback_receiver')
+    result = None
+
+    def __init__(self, service):
+        if service not in self.services:
+            raise RuntimeError('{} must be in {}'.format(service, self.services))
+        self.service = service
+        queuename = get_local_queuename()
+        self.queue = Queue(queuename, Exchange(queuename), routing_key=queuename)
+
+    def publish(self, msg, conn, host, **kwargs):
+        producer = Producer(
+            exchange=self.queue.exchange,
+            channel=conn,
+            routing_key=get_local_queuename()
+        )
+        producer.publish(msg, expiration=5, **kwargs)
+
+    def status(self, *args, **kwargs):
+        return self.control_with_reply('status', *args, **kwargs)
+
+    def running(self, *args, **kwargs):
+        return self.control_with_reply('running', *args, **kwargs)
+
+    def control_with_reply(self, command, host=None, timeout=5):
+        host = host or settings.CLUSTER_HOST_ID
+        logger.warn('checking {} {} for {}'.format(self.service, command, host))
+        reply_queue = Queue(name="amq.rabbitmq.reply-to")
+        self.result = None
+        with Connection(settings.BROKER_URL) as conn:
+            with Consumer(conn, reply_queue, callbacks=[self.process_message], no_ack=True):
+                self.publish({'control': command}, conn, host, reply_to='amq.rabbitmq.reply-to')
+                try:
+                    conn.drain_events(timeout=timeout)
+                except socket.timeout:
+                    logger.error('{} did not reply within {}s'.format(self.service, timeout))
+                    raise
+        return self.result
+
+    def control(self, msg, host=None, **kwargs):
+        host = host or settings.CLUSTER_HOST_ID
+        with Connection(settings.BROKER_URL) as conn:
+            self.publish(msg, conn, host)
+
+    def process_message(self, body, message):
+        self.result = body
+        message.ack()

awx/main/dispatch/pool.py

@@ -0,0 +1,381 @@
+import logging
+import os
+import random
+import traceback
+from uuid import uuid4
+
+import collections
+from multiprocessing import Process
+from multiprocessing import Queue as MPQueue
+from Queue import Full as QueueFull, Empty as QueueEmpty
+
+from django.conf import settings
+from django.db import connection as django_connection
+from django.core.cache import cache as django_cache
+from jinja2 import Template
+import psutil
+
+from awx.main.models import UnifiedJob
+from awx.main.dispatch import reaper
+
+logger = logging.getLogger('awx.main.dispatch')
+
+
+class PoolWorker(object):
+    '''
+    Used to track a worker child process and its pending and finished messages.
+
+    This class makes use of two distinct multiprocessing.Queues to track state:
+
+    - self.queue: this is a queue which represents pending messages that should
+                  be handled by this worker process; as new AMQP messages come
+                  in, a pool will put() them into this queue; the child
+                  process that is forked will get() from this queue and handle
+                  received messages in an endless loop
+    - self.finished: this is a queue which the worker process uses to signal
+                     that it has finished processing a message
+
+    When a message is put() onto this worker, it is tracked in
+    self.managed_tasks.
+
+    Periodically, the worker will call .calculate_managed_tasks(), which will
+    cause messages in self.finished to be removed from self.managed_tasks.
+
+    In this way, self.managed_tasks represents a view of the messages assigned
+    to a specific process.  The message at [0] is the least-recently inserted
+    message, and it represents what the worker is running _right now_
+    (self.current_task).
+
+    A worker is "busy" when it has at least one message in self.managed_tasks.
+    It is "idle" when self.managed_tasks is empty.
+    '''
+
+    def __init__(self, queue_size, target, args):
+        self.messages_sent = 0
+        self.messages_finished = 0
+        self.managed_tasks = collections.OrderedDict()
+        self.finished = MPQueue(queue_size)
+        self.queue = MPQueue(queue_size)
+        self.process = Process(target=target, args=(self.queue, self.finished) + args)
+        self.process.daemon = True
+
+    def start(self):
+        self.process.start()
+
+    def put(self, body):
+        uuid = '?'
+        if isinstance(body, dict):
+            if not body.get('uuid'):
+                body['uuid'] = str(uuid4())
+            uuid = body['uuid']
+        logger.debug('delivered {} to worker[{}] qsize {}'.format(
+            uuid, self.pid, self.qsize
+        ))
+        self.managed_tasks[uuid] = body
+        self.queue.put(body, block=True, timeout=5)
+        self.messages_sent += 1
+        self.calculate_managed_tasks()
+
+    def quit(self):
+        '''
+        Send a special control message to the worker that tells it to exit
+        gracefully.
+        '''
+        self.queue.put('QUIT')
+
+    @property
+    def pid(self):
+        return self.process.pid
+
+    @property
+    def qsize(self):
+        return self.queue.qsize()
+
+    @property
+    def alive(self):
+        return self.process.is_alive()
+
+    @property
+    def mb(self):
+        if self.alive:
+            return '{:0.3f}'.format(
+                psutil.Process(self.pid).memory_info().rss / 1024.0 / 1024.0
+            )
+        return '0'
+
+    @property
+    def exitcode(self):
+        return str(self.process.exitcode)
+
+    def calculate_managed_tasks(self):
+        # look to see if any tasks were finished
+        finished = []
+        for _ in range(self.finished.qsize()):
+            try:
+                finished.append(self.finished.get(block=False))
+            except QueueEmpty:
+                break  # qsize is not always _totally_ up to date
+
+        # if any tasks were finished, removed them from the managed tasks for
+        # this worker
+        for uuid in finished:
+            self.messages_finished += 1
+            del self.managed_tasks[uuid]
+
+    @property
+    def current_task(self):
+        self.calculate_managed_tasks()
+        # the task at [0] is the one that's running right now (or is about to
+        # be running)
+        if len(self.managed_tasks):
+            return self.managed_tasks[self.managed_tasks.keys()[0]]
+
+        return None
+
+    @property
+    def orphaned_tasks(self):
+        orphaned = []
+        if not self.alive:
+            # if this process had a running task that never finished,
+            # requeue its error callbacks
+            current_task = self.current_task
+            if isinstance(current_task, dict):
+                orphaned.extend(current_task.get('errbacks', []))
+
+            # if this process has any pending messages requeue them
+            for _ in range(self.qsize):
+                try:
+                    message = self.queue.get(block=False)
+                    if message != 'QUIT':
+                        orphaned.append(message)
+                except QueueEmpty:
+                    break  # qsize is not always _totally_ up to date
+            if len(orphaned):
+                logger.error(
+                    'requeuing {} messages from gone worker pid:{}'.format(
+                        len(orphaned), self.pid
+                    )
+                )
+        return orphaned
+
+    @property
+    def busy(self):
+        self.calculate_managed_tasks()
+        return len(self.managed_tasks) > 0
+
+    @property
+    def idle(self):
+        return not self.busy
+
+
+class WorkerPool(object):
+    '''
+    Creates a pool of forked PoolWorkers.
+
+    As WorkerPool.write(...) is called (generally, by a kombu consumer
+    implementation when it receives an AMQP message), messages are passed to
+    one of the multiprocessing Queues where some work can be done on them.
+
+    class MessagePrinter(awx.main.dispatch.worker.BaseWorker):
+
+        def perform_work(self, body):
+            print body
+
+    pool = WorkerPool(min_workers=4)  # spawn four worker processes
+    pool.init_workers(MessagePrint().work_loop)
+    pool.write(
+        0,  # preferred worker 0
+        'Hello, World!'
+    )
+    '''
+
+    debug_meta = ''
+
+    def __init__(self, min_workers=None, queue_size=None):
+        self.name = settings.CLUSTER_HOST_ID
+        self.pid = os.getpid()
+        self.min_workers = min_workers or settings.JOB_EVENT_WORKERS
+        self.queue_size = queue_size or settings.JOB_EVENT_MAX_QUEUE_SIZE
+        self.workers = []
+
+    def __len__(self):
+        return len(self.workers)
+
+    def init_workers(self, target, *target_args):
+        self.target = target
+        self.target_args = target_args
+        for idx in range(self.min_workers):
+            self.up()
+
+    def up(self):
+        idx = len(self.workers)
+        # It's important to close these because we're _about_ to fork, and we
+        # don't want the forked processes to inherit the open sockets
+        # for the DB and memcached connections (that way lies race conditions)
+        django_connection.close()
+        django_cache.close()
+        worker = PoolWorker(self.queue_size, self.target, (idx,) + self.target_args)
+        self.workers.append(worker)
+        try:
+            worker.start()
+        except Exception:
+            logger.exception('could not fork')
+        else:
+            logger.warn('scaling up worker pid:{}'.format(worker.pid))
+        return idx, worker
+
+    def debug(self, *args, **kwargs):
+        self.cleanup()
+        tmpl = Template(
+            '{{ pool.name }}[pid:{{ pool.pid }}] workers total={{ workers|length }} {{ meta }} \n'
+            '{% for w in workers %}'
+            '.  worker[pid:{{ w.pid }}]{% if not w.alive %} GONE exit={{ w.exitcode }}{% endif %}'
+            ' sent={{ w.messages_sent }}'
+            ' finished={{ w.messages_finished }}'
+            ' qsize={{ w.managed_tasks|length }}'
+            ' rss={{ w.mb }}MB'
+            '{% for task in w.managed_tasks.values() %}'
+            '\n     - {% if loop.index0 == 0 %}running {% else %}queued {% endif %}'
+            '{{ task["uuid"] }} '
+            '{% if "task" in task %}'
+            '{{ task["task"].rsplit(".", 1)[-1] }}'
+            # don't print kwargs, they often contain launch-time secrets
+            '(*{{ task.get("args", []) }})'
+            '{% endif %}'
+            '{% endfor %}'
+            '{% if not w.managed_tasks|length %}'
+            ' [IDLE]'
+            '{% endif %}'
+            '\n'
+            '{% endfor %}'
+        )
+        return tmpl.render(pool=self, workers=self.workers, meta=self.debug_meta)
+
+    def write(self, preferred_queue, body):
+        queue_order = sorted(range(len(self.workers)), cmp=lambda x, y: -1 if x==preferred_queue else 0)
+        write_attempt_order = []
+        for queue_actual in queue_order:
+            try:
+                self.workers[queue_actual].put(body)
+                return queue_actual
+            except QueueFull:
+                pass
+            except Exception:
+                tb = traceback.format_exc()
+                logger.warn("could not write to queue %s" % preferred_queue)
+                logger.warn("detail: {}".format(tb))
+            write_attempt_order.append(preferred_queue)
+        logger.warn("could not write payload to any queue, attempted order: {}".format(write_attempt_order))
+        return None
+
+    def stop(self, signum):
+        try:
+            for worker in self.workers:
+                os.kill(worker.pid, signum)
+        except Exception:
+            logger.exception('could not kill {}'.format(worker.pid))
+
+
+class AutoscalePool(WorkerPool):
+    '''
+    An extended pool implementation that automatically scales workers up and
+    down based on demand
+    '''
+
+    def __init__(self, *args, **kwargs):
+        self.max_workers = kwargs.pop('max_workers', None)
+        super(AutoscalePool, self).__init__(*args, **kwargs)
+
+        if self.max_workers is None:
+            settings_absmem = getattr(settings, 'SYSTEM_TASK_ABS_MEM', None)
+            if settings_absmem is not None:
+                total_memory_gb = int(settings_absmem)
+            else:
+                total_memory_gb = (psutil.virtual_memory().total >> 30) + 1  # noqa: round up
+            # 5 workers per GB of total memory
+            self.max_workers = (total_memory_gb * 5)
+
+    @property
+    def should_grow(self):
+        if len(self.workers) < self.min_workers:
+            # If we don't have at least min_workers, add more
+            return True
+        # If every worker is busy doing something, add more
+        return all([w.busy for w in self.workers])
+
+    @property
+    def full(self):
+        return len(self.workers) == self.max_workers
+
+    @property
+    def debug_meta(self):
+        return 'min={} max={}'.format(self.min_workers, self.max_workers)
+
+    def cleanup(self):
+        """
+        Perform some internal account and cleanup.  This is run on
+        every cluster node heartbeat:
+
+        1.  Discover worker processes that exited, and recover messages they
+            were handling.
+        2.  Clean up unnecessary, idle workers.
+        """
+        orphaned = []
+        for w in self.workers[::]:
+            if not w.alive:
+                # the worker process has exited
+                # 1. take the task it was running and enqueue the error
+                #    callbacks
+                # 2. take any pending tasks delivered to its queue and
+                #    send them to another worker
+                logger.error('worker pid:{} is gone (exit={})'.format(w.pid, w.exitcode))
+                if w.current_task:
+                    if w.current_task != 'QUIT':
+                        try:
+                            for j in UnifiedJob.objects.filter(celery_task_id=w.current_task['uuid']):
+                                reaper.reap_job(j, 'failed')
+                        except Exception:
+                            logger.exception('failed to reap job UUID {}'.format(w.current_task['uuid']))
+                orphaned.extend(w.orphaned_tasks)
+                self.workers.remove(w)
+            elif w.idle and len(self.workers) > self.min_workers:
+                # the process has an empty queue (it's idle) and we have
+                # more processes in the pool than we need (> min)
+                # send this process a message so it will exit gracefully
+                # at the next opportunity
+                logger.warn('scaling down worker pid:{}'.format(w.pid))
+                w.quit()
+                self.workers.remove(w)
+
+        for m in orphaned:
+            # if all the workers are dead, spawn at least one
+            if not len(self.workers):
+                self.up()
+            idx = random.choice(range(len(self.workers)))
+            self.write(idx, m)
+
+    def up(self):
+        if self.full:
+            # if we can't spawn more workers, just toss this message into a
+            # random worker's backlog
+            idx = random.choice(range(len(self.workers)))
+            return idx, self.workers[idx]
+        else:
+            return super(AutoscalePool, self).up()
+
+    def write(self, preferred_queue, body):
+        # when the cluster heartbeat occurs, clean up internally
+        if isinstance(body, dict) and 'cluster_node_heartbeat' in body['task']:
+            self.cleanup()
+        if self.should_grow:
+            self.up()
+        # we don't care about "preferred queue" round robin distribution, just
+        # find the first non-busy worker and claim it
+        workers = self.workers[:]
+        random.shuffle(workers)
+        for w in workers:
+            if not w.busy:
+                w.put(body)
+                break
+        else:
+            return super(AutoscalePool, self).write(preferred_queue, body)

awx/main/dispatch/publish.py

@@ -0,0 +1,128 @@
+import inspect
+import logging
+import sys
+from uuid import uuid4
+
+from django.conf import settings
+from kombu import Connection, Exchange, Producer
+
+logger = logging.getLogger('awx.main.dispatch')
+
+
+def serialize_task(f):
+    return '.'.join([f.__module__, f.__name__])
+
+
+class task:
+    """
+    Used to decorate a function or class so that it can be run asynchronously
+    via the task dispatcher.  Tasks can be simple functions:
+
+    @task()
+    def add(a, b):
+        return a + b
+
+    ...or classes that define a `run` method:
+
+    @task()
+    class Adder:
+        def run(self, a, b):
+            return a + b
+
+    # Tasks can be run synchronously...
+    assert add(1, 1) == 2
+    assert Adder().run(1, 1) == 2
+
+    # ...or published to a queue:
+    add.apply_async([1, 1])
+    Adder.apply_async([1, 1])
+
+    # Tasks can also define a specific target queue or exchange type:
+
+    @task(queue='slow-tasks')
+    def snooze():
+        time.sleep(10)
+
+    @task(queue='tower_broadcast', exchange_type='fanout')
+    def announce():
+        print "Run this everywhere!"
+    """
+
+    def __init__(self, queue=None, exchange_type=None):
+        self.queue = queue
+        self.exchange_type = exchange_type
+
+    def __call__(self, fn=None):
+        queue = self.queue
+        exchange_type = self.exchange_type
+
+        class PublisherMixin(object):
+
+            queue = None
+
+            @classmethod
+            def delay(cls, *args, **kwargs):
+                return cls.apply_async(args, kwargs)
+
+            @classmethod
+            def apply_async(cls, args=None, kwargs=None, queue=None, uuid=None, **kw):
+                task_id = uuid or str(uuid4())
+                args = args or []
+                kwargs = kwargs or {}
+                queue = (
+                    queue or
+                    getattr(cls.queue, 'im_func', cls.queue) or
+                    settings.CELERY_DEFAULT_QUEUE
+                )
+                obj = {
+                    'uuid': task_id,
+                    'args': args,
+                    'kwargs': kwargs,
+                    'task': cls.name
+                }
+                obj.update(**kw)
+                if callable(queue):
+                    queue = queue()
+                if not settings.IS_TESTING(sys.argv):
+                    with Connection(settings.BROKER_URL) as conn:
+                        exchange = Exchange(queue, type=exchange_type or 'direct')
+                        producer = Producer(conn)
+                        logger.debug('publish {}({}, queue={})'.format(
+                            cls.name,
+                            task_id,
+                            queue
+                        ))
+                        producer.publish(obj,
+                                         serializer='json',
+                                         compression='bzip2',
+                                         exchange=exchange,
+                                         declare=[exchange],
+                                         delivery_mode="persistent",
+                                         routing_key=queue)
+                return (obj, queue)
+
+        # If the object we're wrapping *is* a class (e.g., RunJob), return
+        # a *new* class that inherits from the wrapped class *and* BaseTask
+        # In this way, the new class returned by our decorator is the class
+        # being decorated *plus* PublisherMixin so cls.apply_async() and
+        # cls.delay() work
+        bases = []
+        ns = {'name': serialize_task(fn), 'queue': queue}
+        if inspect.isclass(fn):
+            bases = list(fn.__bases__)
+            ns.update(fn.__dict__)
+        cls = type(
+            fn.__name__,
+            tuple(bases + [PublisherMixin]),
+            ns
+        )
+        if inspect.isclass(fn):
+            return cls
+
+        # if the object being decorated is *not* a class (it's a Python
+        # function), make fn.apply_async and fn.delay proxy through to the
+        # PublisherMixin we dynamically created above
+        setattr(fn, 'name', cls.name)
+        setattr(fn, 'apply_async', cls.apply_async)
+        setattr(fn, 'delay', cls.delay)
+        return fn

awx/main/dispatch/reaper.py

@@ -0,0 +1,46 @@
+from datetime import timedelta
+import logging
+
+from django.db.models import Q
+from django.utils.timezone import now as tz_now
+from django.contrib.contenttypes.models import ContentType
+
+from awx.main.models import Instance, UnifiedJob, WorkflowJob
+
+logger = logging.getLogger('awx.main.dispatch')
+
+
+def reap_job(j, status):
+    j.status = status
+    j.start_args = ''  # blank field to remove encrypted passwords
+    j.job_explanation += ' '.join((
+        'Task was marked as running in Tower but was not present in',
+        'the job queue, so it has been marked as failed.',
+    ))
+    j.save(update_fields=['status', 'start_args', 'job_explanation'])
+    if hasattr(j, 'send_notification_templates'):
+        j.send_notification_templates('failed')
+    j.websocket_emit_status(status)
+    logger.error(
+        '{} is no longer running; reaping'.format(j.log_format)
+    )
+
+
+def reap(instance=None, status='failed'):
+    '''
+    Reap all jobs in waiting|running for this instance.
+    '''
+    me = instance or Instance.objects.me()
+    now = tz_now()
+    workflow_ctype_id = ContentType.objects.get_for_model(WorkflowJob).id
+    jobs = UnifiedJob.objects.filter(
+        (
+            Q(status='running') |
+            Q(status='waiting', modified__lte=now - timedelta(seconds=60))
+        ) & (
+            Q(execution_node=me.hostname) |
+            Q(controller_node=me.hostname)
+        ) & ~Q(polymorphic_ctype_id=workflow_ctype_id)
+    )
+    for j in jobs:
+        reap_job(j, status)

awx/main/dispatch/worker/__init__.py

@@ -0,0 +1,3 @@
+from .base import AWXConsumer, BaseWorker  # noqa
+from .callback import CallbackBrokerWorker  # noqa
+from .task import TaskWorker  # noqa

awx/main/dispatch/worker/base.py

@@ -0,0 +1,146 @@
+# Copyright (c) 2018 Ansible by Red Hat
+# All Rights Reserved.
+
+import os
+import logging
+import signal
+from uuid import UUID
+from Queue import Empty as QueueEmpty
+
+from kombu import Producer
+from kombu.mixins import ConsumerMixin
+
+from awx.main.dispatch.pool import WorkerPool
+
+logger = logging.getLogger('awx.main.dispatch')
+
+
+def signame(sig):
+    return dict(
+        (k, v) for v, k in signal.__dict__.items()
+        if v.startswith('SIG') and not v.startswith('SIG_')
+    )[sig]
+
+
+class WorkerSignalHandler:
+
+    def __init__(self):
+        self.kill_now = False
+        signal.signal(signal.SIGINT, self.exit_gracefully)
+
+    def exit_gracefully(self, *args, **kwargs):
+        self.kill_now = True
+
+
+class AWXConsumer(ConsumerMixin):
+
+    def __init__(self, name, connection, worker, queues=[], pool=None):
+        self.connection = connection
+        self.total_messages = 0
+        self.queues = queues
+        self.worker = worker
+        self.pool = pool
+        if pool is None:
+            self.pool = WorkerPool()
+        self.pool.init_workers(self.worker.work_loop)
+
+    def get_consumers(self, Consumer, channel):
+        logger.debug(self.listening_on)
+        return [Consumer(queues=self.queues, accept=['json'],
+                         callbacks=[self.process_task])]
+
+    @property
+    def listening_on(self):
+        return 'listening on {}'.format([
+            '{} [{}]'.format(q.name, q.exchange.type) for q in self.queues
+        ])
+
+    def control(self, body, message):
+        logger.warn(body)
+        control = body.get('control')
+        if control in ('status', 'running'):
+            producer = Producer(
+                channel=self.connection,
+                routing_key=message.properties['reply_to']
+            )
+            if control == 'status':
+                msg = '\n'.join([self.listening_on, self.pool.debug()])
+            elif control == 'running':
+                msg = []
+                for worker in self.pool.workers:
+                    worker.calculate_managed_tasks()
+                    msg.extend(worker.managed_tasks.keys())
+            producer.publish(msg)
+        elif control == 'reload':
+            for worker in self.pool.workers:
+                worker.quit()
+        else:
+            logger.error('unrecognized control message: {}'.format(control))
+        message.ack()
+
+    def process_task(self, body, message):
+        if 'control' in body:
+            return self.control(body, message)
+        if len(self.pool):
+            if "uuid" in body and body['uuid']:
+                try:
+                    queue = UUID(body['uuid']).int % len(self.pool)
+                except Exception:
+                    queue = self.total_messages % len(self.pool)
+            else:
+                queue = self.total_messages % len(self.pool)
+        else:
+            queue = 0
+        self.pool.write(queue, body)
+        self.total_messages += 1
+        message.ack()
+
+    def run(self, *args, **kwargs):
+        signal.signal(signal.SIGINT, self.stop)
+        signal.signal(signal.SIGTERM, self.stop)
+        self.worker.on_start()
+        super(AWXConsumer, self).run(*args, **kwargs)
+
+    def stop(self, signum, frame):
+        self.should_stop = True  # this makes the kombu mixin stop consuming
+        logger.debug('received {}, stopping'.format(signame(signum)))
+        self.worker.on_stop()
+        raise SystemExit()
+
+
+class BaseWorker(object):
+
+    def work_loop(self, queue, finished, idx, *args):
+        ppid = os.getppid()
+        signal_handler = WorkerSignalHandler()
+        while not signal_handler.kill_now:
+            # if the parent PID changes, this process has been orphaned
+            # via e.g., segfault or sigkill, we should exit too
+            if os.getppid() != ppid:
+                break
+            try:
+                body = queue.get(block=True, timeout=1)
+                if body == 'QUIT':
+                    break
+            except QueueEmpty:
+                continue
+            except Exception as e:
+                logger.error("Exception on worker, restarting: " + str(e))
+                continue
+            try:
+                self.perform_work(body, *args)
+            finally:
+                if 'uuid' in body:
+                    uuid = body['uuid']
+                    logger.debug('task {} is finished'.format(uuid))
+                    finished.put(uuid)
+        logger.warn('worker exiting gracefully pid:{}'.format(os.getpid()))
+
+    def perform_work(self, body):
+        raise NotImplementedError()
+
+    def on_start(self):
+        pass
+
+    def on_stop(self):
+        pass

awx/main/dispatch/worker/callback.py

@@ -0,0 +1,120 @@
+import logging
+import time
+import os
+import signal
+import traceback
+
+from django.conf import settings
+from django.db import DatabaseError, OperationalError, connection as django_connection
+from django.db.utils import InterfaceError, InternalError
+
+from awx.main.consumers import emit_channel_notification
+from awx.main.models import (JobEvent, AdHocCommandEvent, ProjectUpdateEvent,
+                             InventoryUpdateEvent, SystemJobEvent, UnifiedJob)
+
+from .base import BaseWorker
+
+logger = logging.getLogger('awx.main.commands.run_callback_receiver')
+
+
+class CallbackBrokerWorker(BaseWorker):
+    '''
+    A worker implementation that deserializes callback event data and persists
+    it into the database.
+
+    The code that *builds* these types of messages is found in the AWX display
+    callback (`awx.lib.awx_display_callback`).
+    '''
+
+    MAX_RETRIES = 2
+
+    def perform_work(self, body):
+        try:
+            event_map = {
+                'job_id': JobEvent,
+                'ad_hoc_command_id': AdHocCommandEvent,
+                'project_update_id': ProjectUpdateEvent,
+                'inventory_update_id': InventoryUpdateEvent,
+                'system_job_id': SystemJobEvent,
+            }
+
+            if not any([key in body for key in event_map]):
+                raise Exception('Payload does not have a job identifier')
+            if settings.DEBUG:
+                from pygments import highlight
+                from pygments.lexers import PythonLexer
+                from pygments.formatters import Terminal256Formatter
+                from pprint import pformat
+                logger.info('Body: {}'.format(
+                    highlight(pformat(body, width=160), PythonLexer(), Terminal256Formatter(style='friendly'))
+                )[:1024 * 4])
+
+            def _save_event_data():
+                for key, cls in event_map.items():
+                    if key in body:
+                        cls.create_from_data(**body)
+
+            job_identifier = 'unknown job'
+            for key in event_map.keys():
+                if key in body:
+                    job_identifier = body[key]
+                    break
+
+            if body.get('event') == 'EOF':
+                try:
+                    final_counter = body.get('final_counter', 0)
+                    logger.info('Event processing is finished for Job {}, sending notifications'.format(job_identifier))
+                    # EOF events are sent when stdout for the running task is
+                    # closed. don't actually persist them to the database; we
+                    # just use them to report `summary` websocket events as an
+                    # approximation for when a job is "done"
+                    emit_channel_notification(
+                        'jobs-summary',
+                        dict(group_name='jobs', unified_job_id=job_identifier, final_counter=final_counter)
+                    )
+                    # Additionally, when we've processed all events, we should
+                    # have all the data we need to send out success/failure
+                    # notification templates
+                    uj = UnifiedJob.objects.get(pk=job_identifier)
+                    if hasattr(uj, 'send_notification_templates'):
+                        retries = 0
+                        while retries < 5:
+                            if uj.finished:
+                                uj.send_notification_templates('succeeded' if uj.status == 'successful' else 'failed')
+                                break
+                            else:
+                                # wait a few seconds to avoid a race where the
+                                # events are persisted _before_ the UJ.status
+                                # changes from running -> successful
+                                retries += 1
+                                time.sleep(1)
+                                uj = UnifiedJob.objects.get(pk=job_identifier)
+                except Exception:
+                    logger.exception('Worker failed to emit notifications: Job {}'.format(job_identifier))
+                return
+
+            retries = 0
+            while retries <= self.MAX_RETRIES:
+                try:
+                    _save_event_data()
+                    break
+                except (OperationalError, InterfaceError, InternalError):
+                    if retries >= self.MAX_RETRIES:
+                        logger.exception('Worker could not re-establish database connectivity, shutting down gracefully: Job {}'.format(job_identifier))
+                        os.kill(os.getppid(), signal.SIGINT)
+                        return
+                    delay = 60 * retries
+                    logger.exception('Database Error Saving Job Event, retry #{i} in {delay} seconds:'.format(
+                        i=retries + 1,
+                        delay=delay
+                    ))
+                    django_connection.close()
+                    time.sleep(delay)
+                    retries += 1
+                except DatabaseError:
+                    logger.exception('Database Error Saving Job Event for Job {}'.format(job_identifier))
+                    break
+        except Exception as exc:
+            tb = traceback.format_exc()
+            logger.error('Callback Task Processor Raised Exception: %r', exc)
+            logger.error('Detail: {}'.format(tb))

awx/main/dispatch/worker/task.py

@@ -0,0 +1,113 @@
+import inspect
+import logging
+import importlib
+import sys
+import traceback
+
+import six
+
+from awx.main.tasks import dispatch_startup, inform_cluster_of_shutdown
+
+from .base import BaseWorker
+
+logger = logging.getLogger('awx.main.dispatch')
+
+
+class TaskWorker(BaseWorker):
+    '''
+    A worker implementation that deserializes task messages and runs native
+    Python code.
+
+    The code that *builds* these types of messages is found in
+    `awx.main.dispatch.publish`.
+    '''
+
+    @classmethod
+    def resolve_callable(cls, task):
+        '''
+        Transform a dotted notation task into an imported, callable function, e.g.,
+
+        awx.main.tasks.delete_inventory
+        awx.main.tasks.RunProjectUpdate
+        '''
+        module, target = task.rsplit('.', 1)
+        module = importlib.import_module(module)
+        _call = None
+        if hasattr(module, target):
+            _call = getattr(module, target, None)
+        return _call
+
+    def run_callable(self, body):
+        '''
+        Given some AMQP message, import the correct Python code and run it.
+        '''
+        task = body['task']
+        uuid = body.get('uuid', '<unknown>')
+        args = body.get('args', [])
+        kwargs = body.get('kwargs', {})
+        _call = TaskWorker.resolve_callable(task)
+        if inspect.isclass(_call):
+            # the callable is a class, e.g., RunJob; instantiate and
+            # return its `run()` method
+            _call = _call().run
+        # don't print kwargs, they often contain launch-time secrets
+        logger.debug('task {} starting {}(*{})'.format(uuid, task, args))
+        return _call(*args, **kwargs)
+
+    def perform_work(self, body):
+        '''
+        Import and run code for a task e.g.,
+
+        body = {
+            'args': [8],
+            'callbacks': [{
+                'args': [],
+                'kwargs': {}
+                'task': u'awx.main.tasks.handle_work_success'
+            }],
+            'errbacks': [{
+                'args': [],
+                'kwargs': {},
+                'task': 'awx.main.tasks.handle_work_error'
+            }],
+            'kwargs': {},
+            'task': u'awx.main.tasks.RunProjectUpdate'
+        }
+        '''
+        result = None
+        try:
+            result = self.run_callable(body)
+        except Exception as exc:
+
+            try:
+                if getattr(exc, 'is_awx_task_error', False):
+                    # Error caused by user / tracked in job output
+                    logger.warning(six.text_type("{}").format(exc))
+                else:
+                    task = body['task']
+                    args = body.get('args', [])
+                    kwargs = body.get('kwargs', {})
+                    logger.exception('Worker failed to run task {}(*{}, **{}'.format(
+                        task, args, kwargs
+                    ))
+            except Exception:
+                # It's fairly critical that this code _not_ raise exceptions on logging
+                # If you configure external logging in a way that _it_ fails, there's
+                # not a lot we can do here; sys.stderr.write is a final hail mary
+                _, _, tb = sys.exc_info()
+                traceback.print_tb(tb)
+
+            for callback in body.get('errbacks', []) or []:
+                callback['uuid'] = body['uuid']
+                self.perform_work(callback)
+
+        for callback in body.get('callbacks', []) or []:
+            callback['uuid'] = body['uuid']
+            self.perform_work(callback)
+        return result
+
+    def on_start(self):
+        dispatch_startup()
+
+    def on_stop(self):
+        inform_cluster_of_shutdown()

awx/main/exceptions.py

@@ -4,11 +4,6 @@
 import six
 
 
-# Celery does not respect exception type when using a serializer different than pickle;
-# and awx uses the json serializer
-# https://github.com/celery/celery/issues/3586
-
-
 class _AwxTaskError():
     def build_exception(self, task, message=None):
         if message is None:
@@ -36,5 +31,3 @@ class _AwxTaskError():
 
 
 AwxTaskError = _AwxTaskError()
-
-

awx/main/management/commands/deprovision_instance.py

@@ -41,14 +41,18 @@ class Command(BaseCommand):
         with advisory_lock('instance_registration_%s' % hostname):
             instance = Instance.objects.filter(hostname=hostname)
             if instance.exists():
+                isolated = instance.first().is_isolated()
                 instance.delete()
                 print("Instance Removed")
-                result = subprocess.Popen("rabbitmqctl forget_cluster_node rabbitmq@{}".format(hostname), shell=True).wait()
-                if result != 0:
-                    print("Node deprovisioning may have failed when attempting to "
-                          "remove the RabbitMQ instance {} from the cluster".format(hostname))
-                else:
+                if isolated:
                     print('Successfully deprovisioned {}'.format(hostname))
+                else:
+                    result = subprocess.Popen("rabbitmqctl forget_cluster_node rabbitmq@{}".format(hostname), shell=True).wait()
+                    if result != 0:
+                        print("Node deprovisioning may have failed when attempting to "
+                              "remove the RabbitMQ instance {} from the cluster".format(hostname))
+                    else:
+                        print('Successfully deprovisioned {}'.format(hostname))
                 print('(changed: True)')
             else:
                 print('No instance found matching name {}'.format(hostname))

awx/main/management/commands/inventory_import.py

@@ -938,7 +938,7 @@ class Command(BaseCommand):
         self.exclude_empty_groups = bool(options.get('exclude_empty_groups', False))
         self.instance_id_var = options.get('instance_id_var', None)
 
-        self.celery_invoked = False if os.getenv('INVENTORY_SOURCE_ID', None) is None else True
+        self.invoked_from_dispatcher = False if os.getenv('INVENTORY_SOURCE_ID', None) is None else True
 
         # Load inventory and related objects from database.
         if self.inventory_name and self.inventory_id:
@@ -1062,7 +1062,7 @@ class Command(BaseCommand):
                 exc = e
             transaction.rollback()
 
-        if self.celery_invoked is False:
+        if self.invoked_from_dispatcher is False:
             with ignore_inventory_computed_fields():
                 self.inventory_update = InventoryUpdate.objects.get(pk=self.inventory_update.pk)
                 self.inventory_update.result_traceback = tb

awx/main/management/commands/run_callback_receiver.py

@@ -1,231 +1,11 @@
 # Copyright (c) 2015 Ansible, Inc.
 # All Rights Reserved.
 
-# Python
-import logging
-import os
-import signal
-import time
-from uuid import UUID
-from multiprocessing import Process
-from multiprocessing import Queue as MPQueue
-from Queue import Empty as QueueEmpty
-from Queue import Full as QueueFull
-
-from kombu import Connection, Exchange, Queue
-from kombu.mixins import ConsumerMixin
-
-# Django
 from django.conf import settings
 from django.core.management.base import BaseCommand
-from django.db import connection as django_connection
-from django.db import DatabaseError, OperationalError
-from django.db.utils import InterfaceError, InternalError
-from django.core.cache import cache as django_cache
+from kombu import Connection, Exchange, Queue
 
-# AWX
-from awx.main.models import * # noqa
-from awx.main.consumers import emit_channel_notification
-
-logger = logging.getLogger('awx.main.commands.run_callback_receiver')
-
-
-class WorkerSignalHandler:
-
-    def __init__(self):
-        self.kill_now = False
-        signal.signal(signal.SIGINT, self.exit_gracefully)
-        signal.signal(signal.SIGTERM, self.exit_gracefully)
-
-    def exit_gracefully(self, *args, **kwargs):
-        self.kill_now = True
-
-
-class CallbackBrokerWorker(ConsumerMixin):
-
-    MAX_RETRIES = 2
-
-    def __init__(self, connection, use_workers=True):
-        self.connection = connection
-        self.worker_queues = []
-        self.total_messages = 0
-        self.init_workers(use_workers)
-
-    def init_workers(self, use_workers=True):
-        def shutdown_handler(active_workers):
-            def _handler(signum, frame):
-                try:
-                    for active_worker in active_workers:
-                        active_worker.terminate()
-                    signal.signal(signum, signal.SIG_DFL)
-                    os.kill(os.getpid(), signum) # Rethrow signal, this time without catching it
-                except Exception:
-                    logger.exception('Error in shutdown_handler')
-            return _handler
-
-        if use_workers:
-            for idx in range(settings.JOB_EVENT_WORKERS):
-                queue_actual = MPQueue(settings.JOB_EVENT_MAX_QUEUE_SIZE)
-                w = Process(target=self.callback_worker, args=(queue_actual, idx,))
-                if settings.DEBUG:
-                    logger.info('Starting worker %s' % str(idx))
-                self.worker_queues.append([0, queue_actual, w])
-
-            # It's important to close these _right before_ we fork; we
-            # don't want the forked processes to inherit the open sockets
-            # for the DB and memcached connections (that way lies race
-            # conditions)
-            django_connection.close()
-            django_cache.close()
-            for _, _, w in self.worker_queues:
-                w.start()
-
-        elif settings.DEBUG:
-            logger.warn('Started callback receiver (no workers)')
-
-        signal.signal(signal.SIGINT, shutdown_handler([p[2] for p in self.worker_queues]))
-        signal.signal(signal.SIGTERM, shutdown_handler([p[2] for p in self.worker_queues]))
-
-    def get_consumers(self, Consumer, channel):
-        return [Consumer(queues=[Queue(settings.CALLBACK_QUEUE,
-                                       Exchange(settings.CALLBACK_QUEUE, type='direct'),
-                                       routing_key=settings.CALLBACK_QUEUE)],
-                         accept=['json'],
-                         callbacks=[self.process_task])]
-
-    def process_task(self, body, message):
-        if "uuid" in body and body['uuid']:
-            try:
-                queue = UUID(body['uuid']).int % settings.JOB_EVENT_WORKERS
-            except Exception:
-                queue = self.total_messages % settings.JOB_EVENT_WORKERS
-        else:
-            queue = self.total_messages % settings.JOB_EVENT_WORKERS
-        self.write_queue_worker(queue, body)
-        self.total_messages += 1
-        message.ack()
-
-    def write_queue_worker(self, preferred_queue, body):
-        queue_order = sorted(range(settings.JOB_EVENT_WORKERS), cmp=lambda x, y: -1 if x==preferred_queue else 0)
-        write_attempt_order = []
-        for queue_actual in queue_order:
-            try:
-                worker_actual = self.worker_queues[queue_actual]
-                worker_actual[1].put(body, block=True, timeout=5)
-                worker_actual[0] += 1
-                return queue_actual
-            except QueueFull:
-                pass
-            except Exception:
-                import traceback
-                tb = traceback.format_exc()
-                logger.warn("Could not write to queue %s" % preferred_queue)
-                logger.warn("Detail: {}".format(tb))
-            write_attempt_order.append(preferred_queue)
-        logger.warn("Could not write payload to any queue, attempted order: {}".format(write_attempt_order))
-        return None
-
-    def callback_worker(self, queue_actual, idx):
-        signal_handler = WorkerSignalHandler()
-        while not signal_handler.kill_now:
-            try:
-                body = queue_actual.get(block=True, timeout=1)
-            except QueueEmpty:
-                continue
-            except Exception as e:
-                logger.error("Exception on worker thread, restarting: " + str(e))
-                continue
-            try:
-
-                event_map = {
-                    'job_id': JobEvent,
-                    'ad_hoc_command_id': AdHocCommandEvent,
-                    'project_update_id': ProjectUpdateEvent,
-                    'inventory_update_id': InventoryUpdateEvent,
-                    'system_job_id': SystemJobEvent,
-                }
-
-                if not any([key in body for key in event_map]):
-                    raise Exception('Payload does not have a job identifier')
-                if settings.DEBUG:
-                    from pygments import highlight
-                    from pygments.lexers import PythonLexer
-                    from pygments.formatters import Terminal256Formatter
-                    from pprint import pformat
-                    logger.info('Body: {}'.format(
-                        highlight(pformat(body, width=160), PythonLexer(), Terminal256Formatter(style='friendly'))
-                    )[:1024 * 4])
-
-                def _save_event_data():
-                    for key, cls in event_map.items():
-                        if key in body:
-                            cls.create_from_data(**body)
-
-                job_identifier = 'unknown job'
-                for key in event_map.keys():
-                    if key in body:
-                        job_identifier = body[key]
-                        break
-
-                if body.get('event') == 'EOF':
-                    try:
-                        final_counter = body.get('final_counter', 0)
-                        logger.info('Event processing is finished for Job {}, sending notifications'.format(job_identifier))
-                        # EOF events are sent when stdout for the running task is
-                        # closed. don't actually persist them to the database; we
-                        # just use them to report `summary` websocket events as an
-                        # approximation for when a job is "done"
-                        emit_channel_notification(
-                            'jobs-summary',
-                            dict(group_name='jobs', unified_job_id=job_identifier, final_counter=final_counter)
-                        )
-                        # Additionally, when we've processed all events, we should
-                        # have all the data we need to send out success/failure
-                        # notification templates
-                        uj = UnifiedJob.objects.get(pk=job_identifier)
-                        if hasattr(uj, 'send_notification_templates'):
-                            retries = 0
-                            while retries < 5:
-                                if uj.finished:
-                                    uj.send_notification_templates('succeeded' if uj.status == 'successful' else 'failed')
-                                    break
-                                else:
-                                    # wait a few seconds to avoid a race where the
-                                    # events are persisted _before_ the UJ.status
-                                    # changes from running -> successful
-                                    retries += 1
-                                    time.sleep(1)
-                                    uj = UnifiedJob.objects.get(pk=job_identifier)
-                    except Exception:
-                        logger.exception('Worker failed to emit notifications: Job {}'.format(job_identifier))
-                    continue
-
-                retries = 0
-                while retries <= self.MAX_RETRIES:
-                    try:
-                        _save_event_data()
-                        break
-                    except (OperationalError, InterfaceError, InternalError) as e:
-                        if retries >= self.MAX_RETRIES:
-                            logger.exception('Worker could not re-establish database connectivity, shutting down gracefully: Job {}'.format(job_identifier))
-                            os.kill(os.getppid(), signal.SIGINT)
-                            return
-                        delay = 60 * retries
-                        logger.exception('Database Error Saving Job Event, retry #{i} in {delay} seconds:'.format(
-                            i=retries + 1,
-                            delay=delay
-                        ))
-                        django_connection.close()
-                        time.sleep(delay)
-                        retries += 1
-                    except DatabaseError as e:
-                        logger.exception('Database Error Saving Job Event for Job {}'.format(job_identifier))
-                        break
-            except Exception as exc:
-                import traceback
-                tb = traceback.format_exc()
-                logger.error('Callback Task Processor Raised Exception: %r', exc)
-                logger.error('Detail: {}'.format(tb))
+from awx.main.dispatch.worker import AWXConsumer, CallbackBrokerWorker
 
 
 class Command(BaseCommand):
@@ -238,8 +18,22 @@ class Command(BaseCommand):
 
     def handle(self, *arg, **options):
         with Connection(settings.BROKER_URL) as conn:
+            consumer = None
             try:
-                worker = CallbackBrokerWorker(conn)
-                worker.run()
+                consumer = AWXConsumer(
+                    'callback_receiver',
+                    conn,
+                    CallbackBrokerWorker(),
+                    [
+                        Queue(
+                            settings.CALLBACK_QUEUE,
+                            Exchange(settings.CALLBACK_QUEUE, type='direct'),
+                            routing_key=settings.CALLBACK_QUEUE
+                        )
+                    ]
+                )
+                consumer.run()
             except KeyboardInterrupt:
                 print('Terminating Callback Receiver')
+                if consumer:
+                    consumer.stop()

awx/main/management/commands/run_dispatcher.py

@@ -0,0 +1,124 @@
+# Copyright (c) 2015 Ansible, Inc.
+# All Rights Reserved.
+import os
+import logging
+from multiprocessing import Process
+
+from django.conf import settings
+from django.core.cache import cache as django_cache
+from django.core.management.base import BaseCommand
+from django.db import connection as django_connection
+from kombu import Connection, Exchange, Queue
+
+from awx.main.dispatch import get_local_queuename, reaper
+from awx.main.dispatch.control import Control
+from awx.main.dispatch.pool import AutoscalePool
+from awx.main.dispatch.worker import AWXConsumer, TaskWorker
+
+logger = logging.getLogger('awx.main.dispatch')
+
+
+def construct_bcast_queue_name(common_name):
+    return common_name.encode('utf8') + '_' + settings.CLUSTER_HOST_ID
+
+
+class Command(BaseCommand):
+    help = 'Launch the task dispatcher'
+
+    def add_arguments(self, parser):
+        parser.add_argument('--status', dest='status', action='store_true',
+                            help='print the internal state of any running dispatchers')
+        parser.add_argument('--running', dest='running', action='store_true',
+                            help='print the UUIDs of any tasked managed by this dispatcher')
+        parser.add_argument('--reload', dest='reload', action='store_true',
+                            help=('cause the dispatcher to recycle all of its worker processes;'
+                                  'running jobs will run to completion first'))
+
+    def beat(self):
+        from celery import Celery
+        from celery.beat import PersistentScheduler
+        from celery.apps import beat
+
+        class AWXScheduler(PersistentScheduler):
+
+            def __init__(self, *args, **kwargs):
+                self.ppid = os.getppid()
+                super(AWXScheduler, self).__init__(*args, **kwargs)
+
+            def setup_schedule(self):
+                super(AWXScheduler, self).setup_schedule()
+                self.update_from_dict(settings.CELERYBEAT_SCHEDULE)
+
+            def tick(self, *args, **kwargs):
+                if os.getppid() != self.ppid:
+                    # if the parent PID changes, this process has been orphaned
+                    # via e.g., segfault or sigkill, we should exit too
+                    raise SystemExit()
+                return super(AWXScheduler, self).tick(*args, **kwargs)
+
+            def apply_async(self, entry, producer=None, advance=True, **kwargs):
+                task = TaskWorker.resolve_callable(entry.task)
+                result, queue = task.apply_async()
+
+                class TaskResult(object):
+                    id = result['uuid']
+
+                return TaskResult()
+
+        app = Celery()
+        app.conf.BROKER_URL = settings.BROKER_URL
+        app.conf.CELERY_TASK_RESULT_EXPIRES = False
+        beat.Beat(
+            30,
+            app,
+            schedule='/var/lib/awx/beat.db', scheduler_cls=AWXScheduler
+        ).run()
+
+    def handle(self, *arg, **options):
+        if options.get('status'):
+            print Control('dispatcher').status()
+            return
+        if options.get('running'):
+            print Control('dispatcher').running()
+            return
+        if options.get('reload'):
+            return Control('dispatcher').control({'control': 'reload'})
+
+        # It's important to close these because we're _about_ to fork, and we
+        # don't want the forked processes to inherit the open sockets
+        # for the DB and memcached connections (that way lies race conditions)
+        django_connection.close()
+        django_cache.close()
+        beat = Process(target=self.beat)
+        beat.daemon = True
+        beat.start()
+
+        reaper.reap()
+        consumer = None
+        with Connection(settings.BROKER_URL) as conn:
+            try:
+                bcast = 'tower_broadcast_all'
+                queues = [
+                    Queue(q, Exchange(q), routing_key=q)
+                    for q in (settings.AWX_CELERY_QUEUES_STATIC + [get_local_queuename()])
+                ]
+                queues.append(
+                    Queue(
+                        construct_bcast_queue_name(bcast),
+                        exchange=Exchange(bcast, type='fanout'),
+                        routing_key=bcast,
+                        reply=True
+                    )
+                )
+                consumer = AWXConsumer(
+                    'dispatcher',
+                    conn,
+                    TaskWorker(),
+                    queues,
+                    AutoscalePool(min_workers=4)
+                )
+                consumer.run()
+            except KeyboardInterrupt:
+                logger.debug('Terminating Task Dispatcher')
+                if consumer:
+                    consumer.stop()

awx/main/management/commands/watch_celery.py

@@ -1,66 +0,0 @@
-import datetime
-import os
-import signal
-import subprocess
-import sys
-import time
-
-from celery import Celery
-from django.core.management.base import BaseCommand
-from django.conf import settings
-
-
-class Command(BaseCommand):
-    """Watch local celery workers"""
-    help=("Sends a periodic ping to the local celery process over AMQP to ensure "
-          "it's responsive; this command is only intended to run in an environment "
-          "where celeryd is running")
-
-    #
-    # Just because celery is _running_ doesn't mean it's _working_; it's
-    # imperative that celery workers are _actually_ handling AMQP messages on
-    # their appropriate queues for awx to function.  Unfortunately, we've been
-    # plagued by a variety of bugs in celery that cause it to hang and become
-    # an unresponsive zombie, such as:
-    #
-    # https://github.com/celery/celery/issues/4185
-    # https://github.com/celery/celery/issues/4457
-    #
-    # The goal of this code is periodically send a broadcast AMQP message to
-    # the celery process on the local host via celery.app.control.ping;
-    # If that _fails_, we attempt to determine the pid of the celery process
-    # and send SIGHUP (which tends to resolve these sorts of issues for us).
-    #
-
-    INTERVAL = 60
-
-    def _log(self, msg):
-        sys.stderr.write(datetime.datetime.utcnow().isoformat())
-        sys.stderr.write(' ')
-        sys.stderr.write(msg)
-        sys.stderr.write('\n')
-
-    def handle(self, **options):
-        app = Celery('awx')
-        app.config_from_object('django.conf:settings')
-        while True:
-            try:
-                pongs = app.control.ping(['celery@{}'.format(settings.CLUSTER_HOST_ID)], timeout=30)
-            except Exception:
-                pongs = []
-            if not pongs:
-                self._log('celery is not responsive to ping over local AMQP')
-                pid = self.getpid()
-                if pid:
-                    self._log('sending SIGHUP to {}'.format(pid))
-                    os.kill(pid, signal.SIGHUP)
-            time.sleep(self.INTERVAL)
-
-    def getpid(self):
-        cmd = 'supervisorctl pid tower-processes:awx-celeryd'
-        if os.path.exists('/supervisor_task.conf'):
-            cmd = 'supervisorctl -c /supervisor_task.conf pid tower-processes:celery'
-        try:
-            return int(subprocess.check_output(cmd, shell=True))
-        except Exception:
-            self._log('could not detect celery pid')

awx/main/models/ha.py

@@ -32,7 +32,7 @@ __all__ = ('Instance', 'InstanceGroup', 'JobOrigin', 'TowerScheduleState',)
 
 
 def validate_queuename(v):
-    # celery and kombu don't play nice with unicode in queue names
+    # kombu doesn't play nice with unicode in queue names
     if v:
         try:
             '{}'.format(v.decode('utf-8'))

awx/main/models/inventory.py

@@ -9,7 +9,6 @@ import copy
 from urlparse import urljoin
 import os.path
 import six
-from distutils.version import LooseVersion
 
 # Django
 from django.conf import settings
@@ -42,7 +41,7 @@ from awx.main.models.notifications import (
     NotificationTemplate,
     JobNotificationMixin,
 )
-from awx.main.utils import _inventory_updates, get_ansible_version, region_sorting
+from awx.main.utils import _inventory_updates, region_sorting
 
 
 __all__ = ['Inventory', 'Host', 'Group', 'InventorySource', 'InventoryUpdate',
@@ -1578,12 +1577,6 @@ class InventorySource(UnifiedJobTemplate, InventorySourceOptions, RelatedJobsMix
                                     "Instead, configure the corresponding source project to update on launch."))
         return self.update_on_launch
 
-    def clean_overwrite_vars(self):  # TODO: remove when Ansible 2.4 becomes unsupported, obviously
-        if self.source == 'scm' and not self.overwrite_vars:
-            if get_ansible_version() < LooseVersion('2.5'):
-                raise ValidationError(_("SCM type sources must set `overwrite_vars` to `true` until Ansible 2.5."))
-        return self.overwrite_vars
-
     def clean_source_path(self):
         if self.source != 'scm' and self.source_path:
             raise ValidationError(_("Cannot set source_path if not SCM type."))

awx/main/models/unified_jobs.py

@@ -27,9 +27,6 @@ from rest_framework.exceptions import ParseError
 # Django-Polymorphic
 from polymorphic.models import PolymorphicModel
 
-# Django-Celery
-from djcelery.models import TaskMeta
-
 # AWX
 from awx.main.models.base import * # noqa
 from awx.main.models.mixins import ResourceMixin, TaskManagerUnifiedJobMixin
@@ -1112,14 +1109,6 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
                 pass
         return None
 
-    @property
-    def celery_task(self):
-        try:
-            if self.celery_task_id:
-                return TaskMeta.objects.get(task_id=self.celery_task_id)
-        except TaskMeta.DoesNotExist:
-            pass
-
     def get_passwords_needed_to_start(self):
         return []
 
@@ -1224,29 +1213,6 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
 
         return (True, opts)
 
-    def start_celery_task(self, opts, error_callback, success_callback, queue):
-        kwargs = {
-            'link_error': error_callback,
-            'link': success_callback,
-            'queue': None,
-            'task_id': None,
-        }
-        if not self.celery_task_id:
-            raise RuntimeError("Expected celery_task_id to be set on model.")
-        kwargs['task_id'] = self.celery_task_id
-        task_class = self._get_task_class()
-        kwargs['queue'] = queue
-        task_class().apply_async([self.pk], opts, **kwargs)
-
-    def start(self, error_callback, success_callback, **kwargs):
-        '''
-        Start the task running via Celery.
-        '''
-        (res, opts) = self.pre_start(**kwargs)
-        if res:
-            self.start_celery_task(opts, error_callback, success_callback)
-        return res
-
     def signal_start(self, **kwargs):
         """Notify the task runner system to begin work on this task."""
 
@@ -1286,42 +1252,6 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
     def can_cancel(self):
         return bool(self.status in CAN_CANCEL)
 
-    def _force_cancel(self):
-        # Update the status to 'canceled' if we can detect that the job
-        # really isn't running (i.e. celery has crashed or forcefully
-        # killed the worker).
-        task_statuses = ('STARTED', 'SUCCESS', 'FAILED', 'RETRY', 'REVOKED')
-        try:
-            taskmeta = self.celery_task
-            if not taskmeta or taskmeta.status not in task_statuses:
-                return
-            from celery import current_app
-            i = current_app.control.inspect()
-            for v in (i.active() or {}).values():
-                if taskmeta.task_id in [x['id'] for x in v]:
-                    return
-            for v in (i.reserved() or {}).values():
-                if taskmeta.task_id in [x['id'] for x in v]:
-                    return
-            for v in (i.revoked() or {}).values():
-                if taskmeta.task_id in [x['id'] for x in v]:
-                    return
-            for v in (i.scheduled() or {}).values():
-                if taskmeta.task_id in [x['id'] for x in v]:
-                    return
-            instance = self.__class__.objects.get(pk=self.pk)
-            if instance.can_cancel:
-                instance.status = 'canceled'
-                update_fields = ['status']
-                if not instance.job_explanation:
-                    instance.job_explanation = 'Forced cancel'
-                    update_fields.append('job_explanation')
-                instance.save(update_fields=update_fields)
-                self.websocket_emit_status("canceled")
-        except Exception: # FIXME: Log this exception!
-            if settings.DEBUG:
-                raise
-
     def _build_job_explanation(self):
         if not self.job_explanation:
             return 'Previous Task Canceled: {"job_type": "%s", "job_name": "%s", "job_id": "%s"}' % \
@@ -1345,8 +1275,6 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
                     cancel_fields.append('job_explanation')
                 self.save(update_fields=cancel_fields)
                 self.websocket_emit_status("canceled")
-            if settings.BROKER_URL.startswith('amqp://'):
-                self._force_cancel()
         return self.cancel_flag
 
     @property
@@ -1402,7 +1330,7 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
                 r['{}_user_last_name'.format(name)] = created_by.last_name
         return r
 
-    def get_celery_queue_name(self):
+    def get_queue_name(self):
         return self.controller_node or self.execution_node or settings.CELERY_DEFAULT_QUEUE
 
     def is_isolated(self):

awx/main/models/workflow.py

@@ -481,9 +481,3 @@ class WorkflowJob(UnifiedJob, WorkflowJobOptions, SurveyJobMixin, JobNotificatio
     @property
     def preferred_instance_groups(self):
         return []
-
-    '''
-    A WorkflowJob is a virtual job. It doesn't result in a celery task.
-    '''
-    def start_celery_task(self, opts, error_callback, success_callback, queue):
-        return None

awx/main/scheduler/task_manager.py

@@ -2,7 +2,7 @@
 # All Rights Reserved
 
 # Python
-from datetime import datetime, timedelta
+from datetime import timedelta
 import logging
 import uuid
 import json
@@ -11,18 +11,13 @@ import random
 from sets import Set
 
 # Django
-from django.conf import settings
-from django.core.cache import cache
-from django.db import transaction, connection, DatabaseError
+from django.db import transaction, connection
 from django.utils.translation import ugettext_lazy as _
-from django.utils.timezone import now as tz_now, utc
-from django.db.models import Q
-from django.contrib.contenttypes.models import ContentType
+from django.utils.timezone import now as tz_now
 
 # AWX
 from awx.main.models import (
     AdHocCommand,
-    Instance,
     InstanceGroup,
     InventorySource,
     InventoryUpdate,
@@ -30,21 +25,15 @@ from awx.main.models import (
     Project,
     ProjectUpdate,
     SystemJob,
-    UnifiedJob,
     WorkflowJob,
 )
 from awx.main.scheduler.dag_workflow import WorkflowDAG
 from awx.main.utils.pglock import advisory_lock
 from awx.main.utils import get_type_for_model
 from awx.main.signals import disable_activity_stream
-
 from awx.main.scheduler.dependency_graph import DependencyGraph
 from awx.main.utils import decrypt_field
 
-# Celery
-from celery import Celery
-from celery.app.control import Inspect
-
 
 logger = logging.getLogger('awx.main.scheduler')
 
@@ -85,79 +74,6 @@ class TaskManager():
                            key=lambda task: task.created)
         return all_tasks
 
-    '''
-    Tasks that are running and SHOULD have a celery task.
-    {
-        'execution_node': [j1, j2,...],
-        'execution_node': [j3],
-        ...
-    }
-    '''
-    def get_running_tasks(self):
-        execution_nodes = {}
-        waiting_jobs = []
-        now = tz_now()
-        workflow_ctype_id = ContentType.objects.get_for_model(WorkflowJob).id
-        jobs = UnifiedJob.objects.filter((Q(status='running') |
-                                         Q(status='waiting', modified__lte=now - timedelta(seconds=60))) &
-                                         ~Q(polymorphic_ctype_id=workflow_ctype_id))
-        for j in jobs:
-            if j.execution_node:
-                execution_nodes.setdefault(j.execution_node, []).append(j)
-            else:
-                waiting_jobs.append(j)
-        return (execution_nodes, waiting_jobs)
-
-    '''
-    Tasks that are currently running in celery
-
-    Transform:
-    {
-        "celery@ec2-54-204-222-62.compute-1.amazonaws.com": [],
-        "celery@ec2-54-163-144-168.compute-1.amazonaws.com": [{
-            ...
-            "id": "5238466a-f8c7-43b3-9180-5b78e9da8304",
-            ...
-        }, {
-            ...,
-        }, ...]
-    }
-
-    to:
-    {
-        "ec2-54-204-222-62.compute-1.amazonaws.com": [
-            "5238466a-f8c7-43b3-9180-5b78e9da8304",
-            "5238466a-f8c7-43b3-9180-5b78e9da8306",
-            ...
-        ]
-    }
-    '''
-    def get_active_tasks(self):
-        if not hasattr(settings, 'IGNORE_CELERY_INSPECTOR'):
-            app = Celery('awx')
-            app.config_from_object('django.conf:settings')
-            inspector = Inspect(app=app)
-            active_task_queues = inspector.active()
-        else:
-            logger.warn("Ignoring celery task inspector")
-            active_task_queues = None
-
-        queues = None
-
-        if active_task_queues is not None:
-            queues = {}
-            for queue in active_task_queues:
-                active_tasks = set()
-                map(lambda at: active_tasks.add(at['id']), active_task_queues[queue])
-
-                # celery worker name is of the form celery@myhost.com
-                queue_name = queue.split('@')
-                queue_name = queue_name[1 if len(queue_name) > 1 else 0]
-                queues[queue_name] = active_tasks
-        else:
-            return (None, None)
-
-        return (active_task_queues, queues)
 
     def get_latest_project_update_tasks(self, all_sorted_tasks):
         project_ids = Set()
@@ -256,9 +172,6 @@ class TaskManager():
                              rampart_group.name, task.log_format))
                 return
 
-        error_handler = handle_work_error.s(subtasks=[task_actual] + dependencies)
-        success_handler = handle_work_success.s(task_actual=task_actual)
-
         task.status = 'waiting'
 
         (start_status, opts) = task.pre_start()
@@ -300,11 +213,23 @@ class TaskManager():
 
         def post_commit():
             task.websocket_emit_status(task.status)
-            if task.status != 'failed':
-                task.start_celery_task(opts,
-                                       error_callback=error_handler,
-                                       success_callback=success_handler,
-                                       queue=task.get_celery_queue_name())
+            if task.status != 'failed' and type(task) is not WorkflowJob:
+                task_cls = task._get_task_class()
+                task_cls.apply_async(
+                    [task.pk],
+                    opts,
+                    queue=task.get_queue_name(),
+                    uuid=task.celery_task_id,
+                    callbacks=[{
+                        'task': handle_work_success.name,
+                        'kwargs': {'task_actual': task_actual}
+                    }],
+                    errbacks=[{
+                        'task': handle_work_error.name,
+                        'args': [task.celery_task_id],
+                        'kwargs': {'subtasks': [task_actual] + dependencies}
+                    }],
+                )
 
         connection.on_commit(post_commit)
 
@@ -529,105 +454,6 @@ class TaskManager():
             if not found_acceptable_queue:
                 logger.debug(six.text_type("{} couldn't be scheduled on graph, waiting for next cycle").format(task.log_format))
 
-    def fail_jobs_if_not_in_celery(self, node_jobs, active_tasks, celery_task_start_time,
-                                   isolated=False):
-        for task in node_jobs:
-            if (task.celery_task_id not in active_tasks and not hasattr(settings, 'IGNORE_CELERY_INSPECTOR')):
-                if isinstance(task, WorkflowJob):
-                    continue
-                if task.modified > celery_task_start_time:
-                    continue
-                new_status = 'failed'
-                if isolated:
-                    new_status = 'error'
-                task.status = new_status
-                task.start_args = ''  # blank field to remove encrypted passwords
-                if isolated:
-                    # TODO: cancel and reap artifacts of lost jobs from heartbeat
-                    task.job_explanation += ' '.join((
-                        'Task was marked as running in Tower but its ',
-                        'controller management daemon was not present in',
-                        'the job queue, so it has been marked as failed.',
-                        'Task may still be running, but contactability is unknown.'
-                    ))
-                else:
-                    task.job_explanation += ' '.join((
-                        'Task was marked as running in Tower but was not present in',
-                        'the job queue, so it has been marked as failed.',
-                    ))
-                try:
-                    task.save(update_fields=['status', 'start_args', 'job_explanation'])
-                except DatabaseError:
-                    logger.error("Task {} DB error in marking failed. Job possibly deleted.".format(task.log_format))
-                    continue
-                if hasattr(task, 'send_notification_templates'):
-                    task.send_notification_templates('failed')
-                task.websocket_emit_status(new_status)
-                logger.error("{}Task {} has no record in celery. Marking as failed".format(
-                    'Isolated ' if isolated else '', task.log_format))
-
-    def cleanup_inconsistent_celery_tasks(self):
-        '''
-        Rectify tower db <-> celery inconsistent view of jobs state
-        '''
-        last_cleanup = cache.get('last_celery_task_cleanup') or datetime.min.replace(tzinfo=utc)
-        if (tz_now() - last_cleanup).seconds < settings.AWX_INCONSISTENT_TASK_INTERVAL:
-            return
-
-        logger.debug("Failing inconsistent running jobs.")
-        celery_task_start_time = tz_now()
-        active_task_queues, active_queues = self.get_active_tasks()
-        cache.set('last_celery_task_cleanup', tz_now())
-
-        if active_queues is None:
-            logger.error('Failed to retrieve active tasks from celery')
-            return None
-
-        '''
-        Only consider failing tasks on instances for which we obtained a task
-        list from celery for.
-        '''
-        running_tasks, waiting_tasks = self.get_running_tasks()
-        all_celery_task_ids = []
-        for node, node_jobs in active_queues.iteritems():
-            all_celery_task_ids.extend(node_jobs)
-
-        self.fail_jobs_if_not_in_celery(waiting_tasks, all_celery_task_ids, celery_task_start_time)
-
-        for node, node_jobs in running_tasks.iteritems():
-            isolated = False
-            if node in active_queues:
-                active_tasks = active_queues[node]
-            else:
-                '''
-                Node task list not found in celery. We may branch into cases:
-                 - instance is unknown to tower, system is improperly configured
-                 - instance is reported as down, then fail all jobs on the node
-                 - instance is an isolated node, then check running tasks
-                   among all allowed controller nodes for management process
-                 - valid healthy instance not included in celery task list
-                   probably a netsplit case, leave it alone
-                '''
-                instance = Instance.objects.filter(hostname=node).first()
-
-                if instance is None:
-                    logger.error("Execution node Instance {} not found in database. "
-                                 "The node is currently executing jobs {}".format(
-                                     node, [j.log_format for j in node_jobs]))
-                    active_tasks = []
-                elif instance.capacity == 0:
-                    active_tasks = []
-                elif instance.rampart_groups.filter(controller__isnull=False).exists():
-                    active_tasks = all_celery_task_ids
-                    isolated = True
-                else:
-                    continue
-
-            self.fail_jobs_if_not_in_celery(
-                node_jobs, active_tasks, celery_task_start_time,
-                isolated=isolated
-            )
-
     def calculate_capacity_consumed(self, tasks):
         self.graph = InstanceGroup.objects.capacity_values(tasks=tasks, graph=self.graph)
 
@@ -687,7 +513,6 @@ class TaskManager():
                     return
                 logger.debug("Starting Scheduler")
 
-                self.cleanup_inconsistent_celery_tasks()
                 finished_wfjs = self._schedule()
 
                 # Operations whose queries rely on modifications made during the atomic scheduling session

awx/main/scheduler/tasks.py

@@ -2,30 +2,24 @@
 # Python
 import logging
 
-# Celery
-from celery import shared_task
-
 # AWX
 from awx.main.scheduler import TaskManager
+from awx.main.dispatch.publish import task
 
 logger = logging.getLogger('awx.main.scheduler')
 
-# TODO: move logic to UnifiedJob model and use bind=True feature of celery.
-# Would we need the request loop then? I think so. Even if we get the in-memory
-# updated model, the call to schedule() may get stale data.
 
-
-@shared_task()
+@task()
 def run_job_launch(job_id):
     TaskManager().schedule()
 
 
-@shared_task()
+@task()
 def run_job_complete(job_id):
     TaskManager().schedule()
 
 
-@shared_task()
+@task()
 def run_task_manager():
     logger.debug("Running Tower task manager.")
     TaskManager().schedule()

awx/main/tasks.py

@@ -13,12 +13,11 @@ import logging
 import os
 import re
 import shutil
+import six
 import stat
-import sys
 import tempfile
 import time
 import traceback
-import six
 import urlparse
 from distutils.version import LooseVersion as Version
 import yaml
@@ -28,12 +27,6 @@ try:
 except Exception:
     psutil = None
 
-# Celery
-from kombu import Queue, Exchange
-from kombu.common import Broadcast
-from celery import Task, shared_task
-from celery.signals import celeryd_init, worker_shutdown
-
 # Django
 from django.conf import settings
 from django.db import transaction, DatabaseError, IntegrityError
@@ -58,10 +51,12 @@ from awx.main.constants import ACTIVE_STATES
 from awx.main.exceptions import AwxTaskError
 from awx.main.queue import CallbackQueueDispatcher
 from awx.main.expect import run, isolated_manager
+from awx.main.dispatch.publish import task
+from awx.main.dispatch import get_local_queuename, reaper
 from awx.main.utils import (get_ansible_version, get_ssh_version, decrypt_field, update_scm_url,
                             check_proot_installed, build_proot_temp_dir, get_licenser,
                             wrap_args_with_proot, OutputEventFilter, OutputVerboseFilter, ignore_inventory_computed_fields,
-                            ignore_inventory_group_removal, get_type_for_model, extract_ansible_vars)
+                            ignore_inventory_group_removal, extract_ansible_vars)
 from awx.main.utils.safe_yaml import safe_dump, sanitize_jinja
 from awx.main.utils.reload import stop_local_services
 from awx.main.utils.pglock import advisory_lock
@@ -87,52 +82,7 @@ Try upgrading OpenSSH or providing your private key in an different format. \
 logger = logging.getLogger('awx.main.tasks')
 
 
-def log_celery_failure(self, exc, task_id, args, kwargs, einfo):
-    try:
-        if getattr(exc, 'is_awx_task_error', False):
-            # Error caused by user / tracked in job output
-            logger.warning(six.text_type("{}").format(exc))
-        elif isinstance(self, BaseTask):
-            logger.exception(six.text_type(
-                '{!s} {!s} execution encountered exception.')
-                .format(get_type_for_model(self.model), args[0]))
-        else:
-            logger.exception(six.text_type('Task {} encountered exception.').format(self.name), exc_info=exc)
-    except Exception:
-        # It's fairly critical that this code _not_ raise exceptions on logging
-        # If you configure external logging in a way that _it_ fails, there's
-        # not a lot we can do here; sys.stderr.write is a final hail mary
-        _, _, tb = sys.exc_info()
-        traceback.print_tb(tb)
-
-
-@celeryd_init.connect
-def celery_startup(conf=None, **kwargs):
-    #
-    # When celeryd starts, if the instance cannot be found in the database,
-    # automatically register it.  This is mostly useful for openshift-based
-    # deployments where:
-    #
-    # 2 Instances come online
-    # Instance B encounters a network blip, Instance A notices, and
-    # deprovisions it
-    # Instance B's connectivity is restored, celeryd starts, and it
-    # re-registers itself
-    #
-    # In traditional container-less deployments, instances don't get
-    # deprovisioned when they miss their heartbeat, so this code is mostly a
-    # no-op.
-    #
-    if kwargs['instance'].hostname != 'celery@{}'.format(settings.CLUSTER_HOST_ID):
-        error = six.text_type('celery -n {} does not match settings.CLUSTER_HOST_ID={}').format(
-            instance.hostname, settings.CLUSTER_HOST_ID
-        )
-        logger.error(error)
-        raise RuntimeError(error)
-    (changed, tower_instance) = Instance.objects.get_or_register()
-    if changed:
-        logger.info(six.text_type("Registered tower node '{}'").format(tower_instance.hostname))
-
+def dispatch_startup():
     startup_logger = logging.getLogger('awx.main.tasks')
     startup_logger.info("Syncing Schedules")
     for sch in Schedule.objects.all():
@@ -144,34 +94,44 @@ def celery_startup(conf=None, **kwargs):
         except Exception:
             logger.exception(six.text_type("Failed to rebuild schedule {}.").format(sch))
 
-    # set the queues we want to bind to dynamically at startup
-    queues = []
-    me = Instance.objects.me()
-    for q in [me.hostname] + settings.AWX_CELERY_QUEUES_STATIC:
-        q = q.encode('utf-8')
-        queues.append(Queue(q, Exchange(q), routing_key=q))
-    for q in settings.AWX_CELERY_BCAST_QUEUES_STATIC:
-        queues.append(Broadcast(q.encode('utf-8')))
-    conf.CELERY_QUEUES = list(set(queues))
-
-    # Expedite the first hearbeat run so a node comes online quickly.
-    cluster_node_heartbeat.apply([])
+    #
+    # When the dispatcher starts, if the instance cannot be found in the database,
+    # automatically register it.  This is mostly useful for openshift-based
+    # deployments where:
+    #
+    # 2 Instances come online
+    # Instance B encounters a network blip, Instance A notices, and
+    # deprovisions it
+    # Instance B's connectivity is restored, the dispatcher starts, and it
+    # re-registers itself
+    #
+    # In traditional container-less deployments, instances don't get
+    # deprovisioned when they miss their heartbeat, so this code is mostly a
+    # no-op.
+    #
+    apply_cluster_membership_policies()
+    cluster_node_heartbeat()
+    if Instance.objects.me().is_controller():
+        awx_isolated_heartbeat()
 
 
-@worker_shutdown.connect
-def inform_cluster_of_shutdown(*args, **kwargs):
+def inform_cluster_of_shutdown():
     try:
         this_inst = Instance.objects.get(hostname=settings.CLUSTER_HOST_ID)
         this_inst.capacity = 0  # No thank you to new jobs while shut down
         this_inst.save(update_fields=['capacity', 'modified'])
+        try:
+            reaper.reap(this_inst)
+        except Exception:
+            logger.exception('failed to reap jobs for {}'.format(this_inst.hostname))
         logger.warning(six.text_type('Normal shutdown signal for instance {}, '
                        'removed self from capacity pool.').format(this_inst.hostname))
     except Exception:
         logger.exception('Encountered problem with normal shutdown signal.')
 
 
-@shared_task(bind=True, queue=settings.CELERY_DEFAULT_QUEUE)
-def apply_cluster_membership_policies(self):
+@task()
+def apply_cluster_membership_policies():
     started_waiting = time.time()
     with advisory_lock('cluster_policy_lock', wait=True):
         lock_time = time.time() - started_waiting
@@ -280,20 +240,18 @@ def apply_cluster_membership_policies(self):
         logger.info('Cluster policy computation finished in {} seconds'.format(time.time() - started_compute))
 
 
-@shared_task(exchange='tower_broadcast_all', bind=True)
-def handle_setting_changes(self, setting_keys):
+@task(queue='tower_broadcast_all', exchange_type='fanout')
+def handle_setting_changes(setting_keys):
     orig_len = len(setting_keys)
     for i in range(orig_len):
         for dependent_key in settings_registry.get_dependent_settings(setting_keys[i]):
             setting_keys.append(dependent_key)
-    logger.warn('Processing cache changes, task args: {0.args!r} kwargs: {0.kwargs!r}'.format(
-        self.request))
     cache_keys = set(setting_keys)
     logger.debug('cache delete_many(%r)', cache_keys)
     cache.delete_many(cache_keys)
 
 
-@shared_task(queue=settings.CELERY_DEFAULT_QUEUE)
+@task()
 def send_notifications(notification_list, job_id=None):
     if not isinstance(notification_list, list):
         raise TypeError("notification_list should be of type list")
@@ -322,8 +280,8 @@ def send_notifications(notification_list, job_id=None):
                 logger.exception(six.text_type('Error saving notification {} result.').format(notification.id))
 
 
-@shared_task(bind=True, queue=settings.CELERY_DEFAULT_QUEUE)
-def run_administrative_checks(self):
+@task()
+def run_administrative_checks():
     logger.warn("Running administrative checks.")
     if not settings.TOWER_ADMIN_ALERTS:
         return
@@ -344,8 +302,8 @@ def run_administrative_checks(self):
                   fail_silently=True)
 
 
-@shared_task(bind=True)
-def purge_old_stdout_files(self):
+@task(queue=get_local_queuename)
+def purge_old_stdout_files():
     nowtime = time.time()
     for f in os.listdir(settings.JOBOUTPUT_ROOT):
         if os.path.getctime(os.path.join(settings.JOBOUTPUT_ROOT,f)) < nowtime - settings.LOCAL_STDOUT_EXPIRE_TIME:
@@ -353,8 +311,8 @@ def purge_old_stdout_files(self):
             logger.info(six.text_type("Removing {}").format(os.path.join(settings.JOBOUTPUT_ROOT,f)))
 
 
-@shared_task(bind=True)
-def cluster_node_heartbeat(self):
+@task(queue=get_local_queuename)
+def cluster_node_heartbeat():
     logger.debug("Cluster node heartbeat task.")
     nowtime = now()
     instance_list = list(Instance.objects.all_non_isolated())
@@ -397,9 +355,13 @@ def cluster_node_heartbeat(self):
                                     this_inst.version))
             # Shutdown signal will set the capacity to zero to ensure no Jobs get added to this instance.
             # The heartbeat task will reset the capacity to the system capacity after upgrade.
-            stop_local_services(['uwsgi', 'celery', 'beat', 'callback'], communicate=False)
+            stop_local_services(communicate=False)
             raise RuntimeError("Shutting down.")
     for other_inst in lost_instances:
+        try:
+            reaper.reap(other_inst)
+        except Exception:
+            logger.exception('failed to reap jobs for {}'.format(other_inst.hostname))
         try:
             # Capacity could already be 0 because:
             #  * It's a new node and it never had a heartbeat
@@ -424,8 +386,8 @@ def cluster_node_heartbeat(self):
                 logger.exception(six.text_type('Error marking {} as lost').format(other_inst.hostname))
 
 
-@shared_task(bind=True)
-def awx_isolated_heartbeat(self):
+@task(queue=get_local_queuename)
+def awx_isolated_heartbeat():
     local_hostname = settings.CLUSTER_HOST_ID
     logger.debug("Controlling node checking for any isolated management tasks.")
     poll_interval = settings.AWX_ISOLATED_PERIODIC_CHECK
@@ -452,8 +414,8 @@ def awx_isolated_heartbeat(self):
         isolated_manager.IsolatedManager.health_check(isolated_instance_qs, awx_application_version)
 
 
-@shared_task(bind=True, queue=settings.CELERY_DEFAULT_QUEUE)
-def awx_periodic_scheduler(self):
+@task()
+def awx_periodic_scheduler():
     run_now = now()
     state = TowerScheduleState.get_solo()
     last_run = state.schedule_last_run
@@ -503,8 +465,8 @@ def awx_periodic_scheduler(self):
     state.save()
 
 
-@shared_task(bind=True, queue=settings.CELERY_DEFAULT_QUEUE)
-def handle_work_success(self, result, task_actual):
+@task()
+def handle_work_success(task_actual):
     try:
         instance = UnifiedJob.get_instance_by_type(task_actual['type'], task_actual['id'])
     except ObjectDoesNotExist:
@@ -517,7 +479,7 @@ def handle_work_success(self, result, task_actual):
     run_job_complete.delay(instance.id)
 
 
-@shared_task(queue=settings.CELERY_DEFAULT_QUEUE)
+@task()
 def handle_work_error(task_id, *args, **kwargs):
     subtasks = kwargs.get('subtasks', None)
     logger.debug('Executing error task id %s, subtasks: %s' % (task_id, str(subtasks)))
@@ -558,7 +520,7 @@ def handle_work_error(task_id, *args, **kwargs):
         pass
 
 
-@shared_task(queue=settings.CELERY_DEFAULT_QUEUE)
+@task()
 def update_inventory_computed_fields(inventory_id, should_update_hosts=True):
     '''
     Signal handler and wrapper around inventory.update_computed_fields to
@@ -578,7 +540,7 @@ def update_inventory_computed_fields(inventory_id, should_update_hosts=True):
         raise
 
 
-@shared_task(queue=settings.CELERY_DEFAULT_QUEUE)
+@task()
 def update_host_smart_inventory_memberships():
     try:
         with transaction.atomic():
@@ -603,8 +565,8 @@ def update_host_smart_inventory_memberships():
         smart_inventory.update_computed_fields(update_groups=False, update_hosts=False)
 
 
-@shared_task(bind=True, queue=settings.CELERY_DEFAULT_QUEUE, max_retries=5)
-def delete_inventory(self, inventory_id, user_id):
+@task()
+def delete_inventory(inventory_id, user_id):
     # Delete inventory as user
     if user_id is None:
         user = None
@@ -629,7 +591,7 @@ def delete_inventory(self, inventory_id, user_id):
             return
         except DatabaseError:
             logger.exception('Database error deleting inventory {}, but will retry.'.format(inventory_id))
-            self.retry(countdown=10)
+            # TODO: self.retry(countdown=10)
 
 
 def with_path_cleanup(f):
@@ -650,8 +612,7 @@ def with_path_cleanup(f):
     return _wrapped
 
 
-class BaseTask(Task):
-    name = None
+class BaseTask(object):
     model = None
     event_model = None
     abstract = True
@@ -945,14 +906,11 @@ class BaseTask(Task):
             if instance.cancel_flag:
                 instance = self.update_model(instance.pk, status='canceled')
             if instance.status != 'running':
-                if hasattr(settings, 'CELERY_UNIT_TEST'):
-                    return
-                else:
-                    # Stop the task chain and prevent starting the job if it has
-                    # already been canceled.
-                    instance = self.update_model(pk)
-                    status = instance.status
-                    raise RuntimeError('not starting %s task' % instance.status)
+                # Stop the task chain and prevent starting the job if it has
+                # already been canceled.
+                instance = self.update_model(pk)
+                status = instance.status
+                raise RuntimeError('not starting %s task' % instance.status)
 
             if not os.path.exists(settings.AWX_PROOT_BASE_PATH):
                 raise RuntimeError('AWX_PROOT_BASE_PATH=%s does not exist' % settings.AWX_PROOT_BASE_PATH)
@@ -1085,8 +1043,6 @@ class BaseTask(Task):
             logger.exception(six.text_type('{} Final run hook errored.').format(instance.log_format))
         instance.websocket_emit_status(status)
         if status != 'successful':
-            # Raising an exception will mark the job as 'failed' in celery
-            # and will stop a task chain from continuing to execute
             if status == 'canceled':
                 raise AwxTaskError.TaskCancel(instance, rc)
             else:
@@ -1109,12 +1065,12 @@ class BaseTask(Task):
         return ''
 
 
+@task()
 class RunJob(BaseTask):
     '''
-    Celery task to run a job using ansible-playbook.
+    Run a job using ansible-playbook.
     '''
 
-    name = 'awx.main.tasks.run_job'
     model = Job
     event_model = JobEvent
     event_data_key = 'job_id'
@@ -1404,7 +1360,6 @@ class RunJob(BaseTask):
             self.update_model(job.pk, status='failed', job_explanation=error)
             raise RuntimeError(error)
         if job.project and job.project.scm_type:
-            job_request_id = '' if self.request.id is None else self.request.id
             pu_ig = job.instance_group
             pu_en = job.execution_node
             if job.is_isolated() is True:
@@ -1417,16 +1372,14 @@ class RunJob(BaseTask):
                     status='running',
                     instance_group = pu_ig,
                     execution_node=pu_en,
-                    celery_task_id=job_request_id))
+                    celery_task_id=job.celery_task_id))
             # save the associated job before calling run() so that a
             # cancel() call on the job can cancel the project update
             job = self.update_model(job.pk, project_update=local_project_sync)
 
             project_update_task = local_project_sync._get_task_class()
             try:
-                task_instance = project_update_task()
-                task_instance.request.id = job_request_id
-                task_instance.run(local_project_sync.id)
+                project_update_task().run(local_project_sync.id)
                 job = self.update_model(job.pk, scm_revision=job.project.scm_revision)
             except Exception:
                 local_project_sync.refresh_from_db()
@@ -1436,7 +1389,6 @@ class RunJob(BaseTask):
                                                              ('project_update', local_project_sync.name, local_project_sync.id)))
                     raise
 
-
     def final_run_hook(self, job, status, **kwargs):
         super(RunJob, self).final_run_hook(job, status, **kwargs)
         if job.use_fact_cache:
@@ -1467,9 +1419,9 @@ class RunJob(BaseTask):
             update_inventory_computed_fields.delay(inventory.id, True)
 
 
+@task()
 class RunProjectUpdate(BaseTask):
 
-    name = 'awx.main.tasks.run_project_update'
     model = ProjectUpdate
     event_model = ProjectUpdateEvent
     event_data_key = 'project_update_id'
@@ -1670,7 +1622,6 @@ class RunProjectUpdate(BaseTask):
         return getattr(settings, 'PROJECT_UPDATE_IDLE_TIMEOUT', None)
 
     def _update_dependent_inventories(self, project_update, dependent_inventory_sources):
-        project_request_id = '' if self.request.id is None else self.request.id
         scm_revision = project_update.project.scm_revision
         inv_update_class = InventoryUpdate._get_task_class()
         for inv_src in dependent_inventory_sources:
@@ -1693,13 +1644,10 @@ class RunProjectUpdate(BaseTask):
                         status='running',
                         instance_group=project_update.instance_group,
                         execution_node=project_update.execution_node,
-                        celery_task_id=str(project_request_id),
-                        source_project_update=project_update))
+                        source_project_update=project_update,
+                        celery_task_id=project_update.celery_task_id))
             try:
-                task_instance = inv_update_class()
-                # Runs in the same Celery task as project update
-                task_instance.request.id = project_request_id
-                task_instance.run(local_inv_update.id)
+                inv_update_class().run(local_inv_update.id)
             except Exception:
                 logger.exception(six.text_type('{} Unhandled exception updating dependent SCM inventory sources.')
                                  .format(project_update.log_format))
@@ -1804,9 +1752,9 @@ class RunProjectUpdate(BaseTask):
         return getattr(settings, 'AWX_PROOT_ENABLED', False)
 
 
+@task()
 class RunInventoryUpdate(BaseTask):
 
-    name = 'awx.main.tasks.run_inventory_update'
     model = InventoryUpdate
     event_model = InventoryUpdateEvent
     event_data_key = 'inventory_update_id'
@@ -2024,8 +1972,7 @@ class RunInventoryUpdate(BaseTask):
         This dictionary is used by `build_env`, below.
         """
         # Run the superclass implementation.
-        super_ = super(RunInventoryUpdate, self).build_passwords
-        passwords = super_(inventory_update, **kwargs)
+        passwords = super(RunInventoryUpdate, self).build_passwords(inventory_update, **kwargs)
 
         # Take key fields from the credential in use and add them to the
         # passwords dictionary.
@@ -2188,7 +2135,6 @@ class RunInventoryUpdate(BaseTask):
         if inventory_update.inventory_source:
             source_project = inventory_update.inventory_source.source_project
         if (inventory_update.source=='scm' and inventory_update.launch_type!='scm' and source_project):
-            request_id = '' if self.request.id is None else self.request.id
             local_project_sync = source_project.create_project_update(
                 _eager_fields=dict(
                     launch_type="sync",
@@ -2196,16 +2142,14 @@ class RunInventoryUpdate(BaseTask):
                     status='running',
                     execution_node=inventory_update.execution_node,
                     instance_group = inventory_update.instance_group,
-                    celery_task_id=request_id))
+                    celery_task_id=inventory_update.celery_task_id))
             # associate the inventory update before calling run() so that a
             # cancel() call on the inventory update can cancel the project update
             local_project_sync.scm_inventory_updates.add(inventory_update)
 
             project_update_task = local_project_sync._get_task_class()
             try:
-                task_instance = project_update_task()
-                task_instance.request.id = request_id
-                task_instance.run(local_project_sync.id)
+                project_update_task().run(local_project_sync.id)
                 inventory_update.inventory_source.scm_last_revision = local_project_sync.project.scm_revision
                 inventory_update.inventory_source.save(update_fields=['scm_last_revision'])
             except Exception:
@@ -2216,12 +2160,12 @@ class RunInventoryUpdate(BaseTask):
                 raise
 
 
+@task()
 class RunAdHocCommand(BaseTask):
     '''
-    Celery task to run an ad hoc command using ansible.
+    Run an ad hoc command using ansible.
     '''
 
-    name = 'awx.main.tasks.run_ad_hoc_command'
     model = AdHocCommand
     event_model = AdHocCommandEvent
     event_data_key = 'ad_hoc_command_id'
@@ -2382,9 +2326,9 @@ class RunAdHocCommand(BaseTask):
         return getattr(settings, 'AWX_PROOT_ENABLED', False)
 
 
+@task()
 class RunSystemJob(BaseTask):
 
-    name = 'awx.main.tasks.run_system_job'
     model = SystemJob
     event_model = SystemJobEvent
     event_data_key = 'system_job_id'
@@ -2439,9 +2383,9 @@ def _reconstruct_relationships(copy_mapping):
         new_obj.save()
 
 
-@shared_task(bind=True, queue=settings.CELERY_DEFAULT_QUEUE)
+@task()
 def deep_copy_model_obj(
-    self, model_module, model_name, obj_pk, new_obj_pk,
+    model_module, model_name, obj_pk, new_obj_pk,
     user_pk, sub_obj_list, permission_check_func=None
 ):
     logger.info(six.text_type('Deep copy {} from {} to {}.').format(model_name, obj_pk, new_obj_pk))

awx/main/tests/functional/api/test_settings.py

@@ -7,6 +7,7 @@ import pytest
 import os
 
 from django.conf import settings
+from kombu.utils.url import parse_url
 
 # Mock
 import mock
@@ -358,3 +359,25 @@ def test_isolated_key_flag_readonly(get, patch, delete, admin):
 
     delete(url, user=admin)
     assert settings.AWX_ISOLATED_KEY_GENERATION is True
+
+
+@pytest.mark.django_db
+def test_default_broker_url():
+    url = parse_url(settings.BROKER_URL)
+    assert url['transport'] == 'amqp'
+    assert url['hostname'] == 'rabbitmq'
+    assert url['userid'] == 'guest'
+    assert url['password'] == 'guest'
+    assert url['virtual_host'] == '/'
+
+
+@pytest.mark.django_db
+def test_broker_url_with_special_characters():
+    settings.BROKER_URL = 'amqp://guest:a@ns:ibl3#@rabbitmq:5672//'
+    url = parse_url(settings.BROKER_URL)
+    assert url['transport'] == 'amqp'
+    assert url['hostname'] == 'rabbitmq'
+    assert url['port'] == 5672
+    assert url['userid'] == 'guest'
+    assert url['password'] == 'a@ns:ibl3#'
+    assert url['virtual_host'] == '/'

awx/main/tests/functional/api/test_survey_spec.py

@@ -285,9 +285,7 @@ def test_survey_spec_passwords_with_default_required(job_template_factory, post,
 @pytest.mark.django_db
 @pytest.mark.parametrize('default, status', [
     ('SUPERSECRET', 200),
-    (['some', 'invalid', 'list'], 400),
     ({'some-invalid': 'dict'}, 400),
-    (False, 400)
 ])
 def test_survey_spec_default_passwords_are_encrypted(job_template, post, admin_user, default, status):
     job_template.survey_enabled = True
@@ -317,7 +315,7 @@ def test_survey_spec_default_passwords_are_encrypted(job_template, post, admin_u
             'secret_value': default
         }
     else:
-        assert "for 'secret_value' expected to be a string." in str(resp.data)
+        assert "expected to be string." in str(resp.data)
 
 
 @mock.patch('awx.api.views.feature_enabled', lambda feature: True)
@@ -346,37 +344,6 @@ def test_survey_spec_default_passwords_encrypted_on_update(job_template, post, p
     assert updated_jt.survey_spec == JobTemplate.objects.get(pk=job_template.pk).survey_spec
 
 
-# Tests related to survey content validation
-@mock.patch('awx.api.views.feature_enabled', lambda feature: True)
-@pytest.mark.django_db
-@pytest.mark.survey
-def test_survey_spec_non_dict_error(deploy_jobtemplate, post, admin_user):
-    """When a question doesn't follow the standard format, verify error thrown."""
-    response = post(
-        url=reverse('api:job_template_survey_spec', kwargs={'pk': deploy_jobtemplate.id}),
-        data={
-            "description": "Email of the submitter",
-            "spec": ["What is your email?"], "name": "Email survey"
-        },
-        user=admin_user,
-        expect=400
-    )
-    assert response.data['error'] == "Survey question 0 is not a json object."
-
-
-@mock.patch('awx.api.views.feature_enabled', lambda feature: True)
-@pytest.mark.django_db
-@pytest.mark.survey
-def test_survey_spec_dual_names_error(survey_spec_factory, deploy_jobtemplate, post, user):
-    response = post(
-        url=reverse('api:job_template_survey_spec', kwargs={'pk': deploy_jobtemplate.id}),
-        data=survey_spec_factory(['submitter_email', 'submitter_email']),
-        user=user('admin', True),
-        expect=400
-    )
-    assert response.data['error'] == "'variable' 'submitter_email' duplicated in survey question 1."
-
-
 # Test actions that should be allowed with non-survey license
 @mock.patch('awx.main.access.BaseAccess.check_license', new=mock_no_surveys)
 @pytest.mark.django_db

awx/main/tests/functional/conftest.py

@@ -8,13 +8,13 @@ import tempfile
 import shutil
 from datetime import timedelta
 from six.moves import xrange
+from mock import PropertyMock
 
 # Django
 from django.core.urlresolvers import resolve
 from django.utils.six.moves.urllib.parse import urlparse
 from django.utils import timezone
 from django.contrib.auth.models import User
-from django.conf import settings
 from django.core.serializers.json import DjangoJSONEncoder
 from django.db.backends.sqlite3.base import SQLiteCursorWrapper
 from jsonbfield.fields import JSONField
@@ -66,17 +66,6 @@ def swagger_autogen(requests=__SWAGGER_REQUESTS__):
     return requests
 
 
-@pytest.fixture(scope="session", autouse=True)
-def celery_memory_broker():
-    '''
-    FIXME: Not sure how "far" just setting the BROKER_URL will get us.
-    We may need to incluence CELERY's configuration like we do in the old unit tests (see base.py)
-
-    Allows django signal code to execute without the need for redis
-    '''
-    settings.BROKER_URL='memory://localhost/'
-
-
 @pytest.fixture
 def user():
     def u(name, is_superuser=False):
@@ -764,3 +753,8 @@ def sqlite_copy_expert(request):
     request.addfinalizer(lambda: delattr(SQLiteCursorWrapper, 'copy_expert'))
     return path
 
+
+@pytest.fixture
+def disable_database_settings(mocker):
+    m = mocker.patch('awx.conf.settings.SettingsWrapper.all_supported_settings', new_callable=PropertyMock)
+    m.return_value = []

awx/main/tests/functional/models/test_unified_job.py

@@ -1,13 +1,11 @@
 import itertools
 import pytest
-import mock
 
 # Django
 from django.contrib.contenttypes.models import ContentType
 
 # AWX
 from awx.main.models import UnifiedJobTemplate, Job, JobTemplate, WorkflowJobTemplate, Project, WorkflowJob, Schedule
-from awx.main.models.ha import InstanceGroup
 
 
 @pytest.mark.django_db
@@ -66,48 +64,6 @@ class TestCreateUnifiedJob:
         assert net_credential in second_job.credentials.all()
 
 
-@pytest.mark.django_db
-class TestIsolatedRuns:
-
-    def test_low_capacity_isolated_instance_selected(self):
-        ig = InstanceGroup.objects.create(name='tower')
-        iso_ig = InstanceGroup.objects.create(name='thepentagon', controller=ig)
-        iso_ig.instances.create(hostname='iso1', capacity=50)
-        i2 = iso_ig.instances.create(hostname='iso2', capacity=200)
-        job = Job.objects.create(
-            instance_group=iso_ig,
-            celery_task_id='something',
-        )
-
-        mock_async = mock.MagicMock()
-        success_callback = mock.MagicMock()
-        error_callback = mock.MagicMock()
-
-        class MockTaskClass:
-            apply_async = mock_async
-
-        with mock.patch.object(job, '_get_task_class') as task_class:
-            task_class.return_value = MockTaskClass
-            job.start_celery_task([], error_callback, success_callback, 'thepentagon')
-        mock_async.assert_called_with([job.id], [], 
-                                      link_error=error_callback, 
-                                      link=success_callback, 
-                                      queue='thepentagon',
-                                      task_id='something')
-
-        i2.capacity = 20
-        i2.save()
-
-        with mock.patch.object(job, '_get_task_class') as task_class:
-            task_class.return_value = MockTaskClass
-            job.start_celery_task([], error_callback, success_callback, 'thepentagon')
-        mock_async.assert_called_with([job.id], [], 
-                                      link_error=error_callback, 
-                                      link=success_callback, 
-                                      queue='thepentagon',
-                                      task_id='something')
-
-
 @pytest.mark.django_db
 class TestMetaVars:
     '''

awx/main/tests/functional/models/test_workflow.py

@@ -7,6 +7,7 @@ from awx.main.models.workflow import WorkflowJob, WorkflowJobNode, WorkflowJobTe
 from awx.main.models.jobs import JobTemplate, Job
 from awx.main.models.projects import ProjectUpdate
 from awx.main.scheduler.dag_workflow import WorkflowDAG
+from awx.api.versioning import reverse
 
 # Django
 from django.test import TransactionTestCase
@@ -196,9 +197,15 @@ class TestWorkflowJobTemplate:
         assert test_view.is_valid_relation(node_assoc, nodes[1]) == {'Error': 'Multiple parent relationship not allowed.'}
         # test mutex validation
         test_view.relationship = 'failure_nodes'
-        node_assoc_1 = WorkflowJobTemplateNode.objects.create(workflow_job_template=wfjt)
-        assert (test_view.is_valid_relation(nodes[2], node_assoc_1) ==
-                {'Error': 'Cannot associate failure_nodes when always_nodes have been associated.'})
+        
+    def test_always_success_failure_creation(self, wfjt, admin, get):
+        wfjt_node = wfjt.workflow_job_template_nodes.all()[1]
+        node = WorkflowJobTemplateNode.objects.create(workflow_job_template=wfjt)
+        wfjt_node.always_nodes.add(node)
+        assert len(node.get_parent_nodes()) == 1
+        url = reverse('api:workflow_job_template_node_list') + str(wfjt_node.id) + '/'
+        resp = get(url, admin)
+        assert node.id in resp.data['always_nodes']
 
     def test_wfjt_unique_together_with_org(self, organization):
         wfjt1 = WorkflowJobTemplate(name='foo', organization=organization)

awx/main/tests/functional/task_management/test_scheduler.py

@@ -1,19 +1,10 @@
 import pytest
 import mock
 import json
-from datetime import timedelta, datetime
-
-from django.core.cache import cache
-from django.utils.timezone import now as tz_now
+from datetime import timedelta
 
 from awx.main.scheduler import TaskManager
 from awx.main.utils import encrypt_field
-from awx.main.models import (
-    Job,
-    Instance,
-    WorkflowJob,
-)
-from awx.main.models.notifications import JobNotificationMixin
 
 
 @pytest.mark.django_db
@@ -245,140 +236,3 @@ def test_shared_dependencies_launch(default_instance_group, job_template_factory
     iu = [x for x in ii.inventory_updates.all()]
     assert len(pu) == 1
     assert len(iu) == 1
-
-
-@pytest.mark.django_db
-def test_cleanup_interval(mock_cache):
-    with mock.patch.multiple('awx.main.scheduler.task_manager.cache', get=mock_cache.get, set=mock_cache.set):
-        assert mock_cache.get('last_celery_task_cleanup') is None
-
-        TaskManager().cleanup_inconsistent_celery_tasks()
-        last_cleanup = mock_cache.get('last_celery_task_cleanup')
-        assert isinstance(last_cleanup, datetime)
-
-        TaskManager().cleanup_inconsistent_celery_tasks()
-        assert cache.get('last_celery_task_cleanup') == last_cleanup
-
-
-class TestReaper():
-    @pytest.fixture
-    def all_jobs(self, mocker):
-        now = tz_now()
-
-        Instance.objects.create(hostname='host1', capacity=100)
-        Instance.objects.create(hostname='host2', capacity=100)
-        Instance.objects.create(hostname='host3_split', capacity=100)
-        Instance.objects.create(hostname='host4_offline', capacity=0)
-
-        j1 = Job.objects.create(status='pending', execution_node='host1')
-        j2 = Job.objects.create(status='waiting', celery_task_id='considered_j2')
-        j3 = Job.objects.create(status='waiting', celery_task_id='considered_j3')
-        j3.modified = now - timedelta(seconds=60)
-        j3.save(update_fields=['modified'])
-        j4 = Job.objects.create(status='running', celery_task_id='considered_j4', execution_node='host1')
-        j5 = Job.objects.create(status='waiting', celery_task_id='reapable_j5')
-        j5.modified = now - timedelta(seconds=60)
-        j5.save(update_fields=['modified'])
-        j6 = Job.objects.create(status='waiting', celery_task_id='considered_j6')
-        j6.modified = now - timedelta(seconds=60)
-        j6.save(update_fields=['modified'])
-        j7 = Job.objects.create(status='running', celery_task_id='considered_j7', execution_node='host2')
-        j8 = Job.objects.create(status='running', celery_task_id='reapable_j7', execution_node='host2')
-        j9 = Job.objects.create(status='waiting', celery_task_id='reapable_j8')
-        j9.modified = now - timedelta(seconds=60)
-        j9.save(update_fields=['modified'])
-        j10 = Job.objects.create(status='running', celery_task_id='host3_j10', execution_node='host3_split')
-
-        j11 = Job.objects.create(status='running', celery_task_id='host4_j11', execution_node='host4_offline')
-
-        j12 = WorkflowJob.objects.create(status='running', celery_task_id='workflow_job', execution_node='host1')
-
-        js = [j1, j2, j3, j4, j5, j6, j7, j8, j9, j10, j11, j12]
-        for j in js:
-            j.save = mocker.Mock(wraps=j.save)
-            j.websocket_emit_status = mocker.Mock()
-        return js
-
-    @pytest.fixture
-    def considered_jobs(self, all_jobs):
-        return all_jobs[2:7] + [all_jobs[10]]
-
-    @pytest.fixture
-    def running_tasks(self, all_jobs):
-        return {
-            'host1': [all_jobs[3]],
-            'host2': [all_jobs[7], all_jobs[8]],
-            'host3_split': [all_jobs[9]],
-            'host4_offline': [all_jobs[10]],
-        }
-
-    @pytest.fixture
-    def waiting_tasks(self, all_jobs):
-        return [all_jobs[2], all_jobs[4], all_jobs[5], all_jobs[8]]
-
-    @pytest.fixture
-    def reapable_jobs(self, all_jobs):
-        return [all_jobs[4], all_jobs[7], all_jobs[10]]
-
-    @pytest.fixture
-    def unconsidered_jobs(self, all_jobs):
-        return all_jobs[0:1] + all_jobs[5:7]
-
-    @pytest.fixture
-    def active_tasks(self):
-        return ([], {
-            'host1': ['considered_j2', 'considered_j3', 'considered_j4',],
-            'host2': ['considered_j6', 'considered_j7'],
-        })
-
-    @pytest.mark.django_db
-    @mock.patch.object(JobNotificationMixin, 'send_notification_templates')
-    @mock.patch.object(TaskManager, 'get_active_tasks', lambda self: ([], []))
-    def test_cleanup_inconsistent_task(self, notify, active_tasks, considered_jobs, reapable_jobs, running_tasks, waiting_tasks, mocker, settings):
-        settings.AWX_INCONSISTENT_TASK_INTERVAL = 0
-        tm = TaskManager()
-
-        tm.get_running_tasks = mocker.Mock(return_value=(running_tasks, waiting_tasks))
-        tm.get_active_tasks = mocker.Mock(return_value=active_tasks)
-        
-        tm.cleanup_inconsistent_celery_tasks()
-        
-        for j in considered_jobs:
-            if j not in reapable_jobs:
-                j.save.assert_not_called()
-
-        assert notify.call_count == 4
-        notify.assert_has_calls([mock.call('failed') for j in reapable_jobs], any_order=True)
-
-        for j in reapable_jobs:
-            j.websocket_emit_status.assert_called_once_with('failed')
-            assert j.status == 'failed'
-            assert j.job_explanation == (
-                'Task was marked as running in Tower but was not present in the job queue, so it has been marked as failed.'
-            )
-
-    @pytest.mark.django_db
-    def test_get_running_tasks(self, all_jobs):
-        tm = TaskManager()
-
-        # Ensure the query grabs the expected jobs
-        execution_nodes_jobs, waiting_jobs = tm.get_running_tasks()
-        assert 'host1' in execution_nodes_jobs
-        assert 'host2' in execution_nodes_jobs
-        assert 'host3_split' in execution_nodes_jobs
-
-        assert all_jobs[3] in execution_nodes_jobs['host1']
-
-        assert all_jobs[6] in execution_nodes_jobs['host2']
-        assert all_jobs[7] in execution_nodes_jobs['host2']
-        
-        assert all_jobs[9] in execution_nodes_jobs['host3_split']
-
-        assert all_jobs[10] in execution_nodes_jobs['host4_offline']
-
-        assert all_jobs[11] not in execution_nodes_jobs['host1']
-
-        assert all_jobs[2] in waiting_jobs
-        assert all_jobs[4] in waiting_jobs
-        assert all_jobs[5] in waiting_jobs
-        assert all_jobs[8] in waiting_jobs

awx/main/tests/functional/test_dispatch.py

@@ -0,0 +1,361 @@
+import datetime
+import multiprocessing
+import random
+import signal
+import time
+
+from django.utils.timezone import now as tz_now
+import pytest
+
+from awx.main.models import Job, WorkflowJob, Instance
+from awx.main.dispatch import reaper
+from awx.main.dispatch.pool import PoolWorker, WorkerPool, AutoscalePool
+from awx.main.dispatch.publish import task
+from awx.main.dispatch.worker import BaseWorker, TaskWorker
+
+
+@task()
+def add(a, b):
+    return a + b
+
+
+class BaseTask(object):
+
+    def add(self, a, b):
+        return add(a, b)
+
+
+@task()
+class Adder(BaseTask):
+    def run(self, a, b):
+        return super(Adder, self).add(a, b)
+
+
+@task(queue='hard-math')
+def multiply(a, b):
+    return a * b
+
+
+class SimpleWorker(BaseWorker):
+
+    def perform_work(self, body, *args):
+        pass
+
+
+class ResultWriter(BaseWorker):
+
+    def perform_work(self, body, result_queue):
+        result_queue.put(body + '!!!')
+
+
+class SlowResultWriter(BaseWorker):
+
+    def perform_work(self, body, result_queue):
+        time.sleep(3)
+        super(SlowResultWriter, self).perform_work(body, result_queue)
+
+
+@pytest.mark.usefixtures("disable_database_settings")
+class TestPoolWorker:
+
+    def setup_method(self, test_method):
+        self.worker = PoolWorker(1000, self.tick, tuple())
+
+    def tick(self):
+        self.worker.finished.put(self.worker.queue.get()['uuid'])
+        time.sleep(.5)
+
+    def test_qsize(self):
+        assert self.worker.qsize == 0
+        for i in range(3):
+            self.worker.put({'task': 'abc123'})
+        assert self.worker.qsize == 3
+
+    def test_put(self):
+        assert len(self.worker.managed_tasks) == 0
+        assert self.worker.messages_finished == 0
+        self.worker.put({'task': 'abc123'})
+
+        assert len(self.worker.managed_tasks) == 1
+        assert self.worker.messages_sent == 1
+
+    def test_managed_tasks(self):
+        self.worker.put({'task': 'abc123'})
+        self.worker.calculate_managed_tasks()
+        assert len(self.worker.managed_tasks) == 1
+
+        self.tick()
+        self.worker.calculate_managed_tasks()
+        assert len(self.worker.managed_tasks) == 0
+
+    def test_current_task(self):
+        self.worker.put({'task': 'abc123'})
+        assert self.worker.current_task['task'] == 'abc123'
+
+    def test_quit(self):
+        self.worker.quit()
+        assert self.worker.queue.get() == 'QUIT'
+
+    def test_idle_busy(self):
+        assert self.worker.idle is True
+        assert self.worker.busy is False
+        self.worker.put({'task': 'abc123'})
+        assert self.worker.busy is True
+        assert self.worker.idle is False
+
+
+@pytest.mark.django_db
+class TestWorkerPool:
+
+    def setup_method(self, test_method):
+        self.pool = WorkerPool(min_workers=3)
+
+    def teardown_method(self, test_method):
+        self.pool.stop(signal.SIGTERM)
+
+    def test_worker(self):
+        self.pool.init_workers(SimpleWorker().work_loop)
+        assert len(self.pool) == 3
+        for worker in self.pool.workers:
+            assert worker.messages_sent == 0
+            assert worker.alive is True
+
+    def test_single_task(self):
+        self.pool.init_workers(SimpleWorker().work_loop)
+        self.pool.write(0, 'xyz')
+        assert self.pool.workers[0].messages_sent == 1  # worker at index 0 handled one task
+        assert self.pool.workers[1].messages_sent == 0
+        assert self.pool.workers[2].messages_sent == 0
+
+    def test_queue_preference(self):
+        self.pool.init_workers(SimpleWorker().work_loop)
+        self.pool.write(2, 'xyz')
+        assert self.pool.workers[0].messages_sent == 0
+        assert self.pool.workers[1].messages_sent == 0
+        assert self.pool.workers[2].messages_sent == 1  # worker at index 2 handled one task
+
+    def test_worker_processing(self):
+        result_queue = multiprocessing.Queue()
+        self.pool.init_workers(ResultWriter().work_loop, result_queue)
+        for i in range(10):
+            self.pool.write(
+                random.choice(range(len(self.pool))),
+                'Hello, Worker {}'.format(i)
+            )
+        all_messages = [result_queue.get(timeout=1) for i in range(10)]
+        all_messages.sort()
+        assert all_messages == [
+            'Hello, Worker {}!!!'.format(i)
+            for i in range(10)
+        ]
+
+        total_handled = sum([worker.messages_sent for worker in self.pool.workers])
+        assert total_handled == 10
+
+
+@pytest.mark.django_db
+class TestAutoScaling:
+
+    def setup_method(self, test_method):
+        self.pool = AutoscalePool(min_workers=2, max_workers=10)
+
+    def teardown_method(self, test_method):
+        self.pool.stop(signal.SIGTERM)
+
+    def test_scale_up(self):
+        result_queue = multiprocessing.Queue()
+        self.pool.init_workers(SlowResultWriter().work_loop, result_queue)
+
+        # start with two workers, write an event to each worker and make it busy
+        assert len(self.pool) == 2
+        for i, w in enumerate(self.pool.workers):
+            w.put('Hello, Worker {}'.format(0))
+        assert len(self.pool) == 2
+
+        # wait for the subprocesses to start working on their tasks and be marked busy
+        time.sleep(1)
+        assert self.pool.should_grow
+
+        # write a third message, expect a new worker to spawn because all
+        # workers are busy
+        self.pool.write(0, 'Hello, Worker {}'.format(2))
+        assert len(self.pool) == 3
+
+    def test_scale_down(self):
+        self.pool.init_workers(ResultWriter().work_loop, multiprocessing.Queue())
+
+        # start with two workers, and scale up to 10 workers
+        assert len(self.pool) == 2
+        for i in range(8):
+            self.pool.up()
+        assert len(self.pool) == 10
+
+        # cleanup should scale down to 8 workers
+        self.pool.cleanup()
+        assert len(self.pool) == 2
+
+    def test_max_scale_up(self):
+        self.pool.init_workers(ResultWriter().work_loop, multiprocessing.Queue())
+
+        assert len(self.pool) == 2
+        for i in range(25):
+            self.pool.up()
+        assert self.pool.max_workers == 10
+        assert self.pool.full is True
+        assert len(self.pool) == 10
+
+    def test_equal_worker_distribution(self):
+        # if all workers are busy, spawn new workers *before* adding messages
+        # to an existing queue
+        self.pool.init_workers(SlowResultWriter().work_loop, multiprocessing.Queue)
+
+        # start with two workers, write an event to each worker and make it busy
+        assert len(self.pool) == 2
+        for i in range(10):
+            self.pool.write(0, 'Hello, World!')
+        assert len(self.pool) == 10
+        for w in self.pool.workers:
+            assert w.busy
+            assert len(w.managed_tasks) == 1
+
+        # the queue is full at 10, the _next_ write should put the message into
+        # a worker's backlog
+        assert len(self.pool) == 10
+        for w in self.pool.workers:
+            assert w.messages_sent == 1
+        self.pool.write(0, 'Hello, World!')
+        assert len(self.pool) == 10
+        assert self.pool.workers[0].messages_sent == 2
+
+    def test_lost_worker_autoscale(self):
+        # if a worker exits, it should be replaced automatically up to min_workers
+        self.pool.init_workers(ResultWriter().work_loop, multiprocessing.Queue())
+
+        # start with two workers, kill one of them
+        assert len(self.pool) == 2
+        assert not self.pool.should_grow
+        alive_pid = self.pool.workers[1].pid
+        self.pool.workers[0].process.terminate()
+        time.sleep(1)  # wait a moment for sigterm
+
+        # clean up and the dead worker
+        self.pool.cleanup()
+        assert len(self.pool) == 1
+        assert self.pool.workers[0].pid == alive_pid
+
+        # the next queue write should replace the lost worker
+        self.pool.write(0, 'Hello, Worker')
+        assert len(self.pool) == 2
+
+
+@pytest.mark.usefixtures("disable_database_settings")
+class TestTaskDispatcher:
+
+    @property
+    def tm(self):
+        return TaskWorker()
+
+    def test_function_dispatch(self):
+        result = self.tm.perform_work({
+            'task': 'awx.main.tests.functional.test_dispatch.add',
+            'args': [2, 2]
+        })
+        assert result == 4
+
+    def test_method_dispatch(self):
+        result = self.tm.perform_work({
+            'task': 'awx.main.tests.functional.test_dispatch.Adder',
+            'args': [2, 2]
+        })
+        assert result == 4
+
+
+class TestTaskPublisher:
+
+    def test_function_callable(self):
+        assert add(2, 2) == 4
+
+    def test_method_callable(self):
+        assert Adder().run(2, 2) == 4
+
+    def test_function_apply_async(self):
+        message, queue = add.apply_async([2, 2])
+        assert message['args'] == [2, 2]
+        assert message['kwargs'] == {}
+        assert message['task'] == 'awx.main.tests.functional.test_dispatch.add'
+        assert queue == 'awx_private_queue'
+
+    def test_method_apply_async(self):
+        message, queue = Adder.apply_async([2, 2])
+        assert message['args'] == [2, 2]
+        assert message['kwargs'] == {}
+        assert message['task'] == 'awx.main.tests.functional.test_dispatch.Adder'
+        assert queue == 'awx_private_queue'
+
+    def test_apply_with_queue(self):
+        message, queue = add.apply_async([2, 2], queue='abc123')
+        assert queue == 'abc123'
+
+    def test_queue_defined_in_task_decorator(self):
+        message, queue = multiply.apply_async([2, 2])
+        assert queue == 'hard-math'
+
+    def test_queue_overridden_from_task_decorator(self):
+        message, queue = multiply.apply_async([2, 2], queue='not-so-hard')
+        assert queue == 'not-so-hard'
+
+    def test_apply_with_callable_queuename(self):
+        message, queue = add.apply_async([2, 2], queue=lambda: 'called')
+        assert queue == 'called'
+
+
+yesterday = tz_now() - datetime.timedelta(days=1)
+
+
+@pytest.mark.django_db
+class TestJobReaper(object):
+
+    @pytest.mark.parametrize('status, execution_node, controller_node, modified, fail', [
+        ('running', '', '', None, False),        # running, not assigned to the instance
+        ('running', 'awx', '', None, True),      # running, has the instance as its execution_node
+        ('running', '', 'awx', None, True),      # running, has the instance as its controller_node
+        ('waiting', '', '', None, False),        # waiting, not assigned to the instance
+        ('waiting', 'awx', '', None, False),     # waiting, was edited less than a minute ago
+        ('waiting', '', 'awx', None, False),     # waiting, was edited less than a minute ago
+        ('waiting', 'awx', '', yesterday, True), # waiting, assigned to the execution_node, stale
+        ('waiting', '', 'awx', yesterday, True), # waiting, assigned to the controller_node, stale
+    ])
+    def test_should_reap(self, status, fail, execution_node, controller_node, modified):
+        i = Instance(hostname='awx')
+        i.save()
+        j = Job(
+            status=status,
+            execution_node=execution_node,
+            controller_node=controller_node,
+            start_args='SENSITIVE',
+        )
+        j.save()
+        if modified:
+            # we have to edit the modification time _without_ calling save()
+            # (because .save() overwrites it to _now_)
+            Job.objects.filter(id=j.id).update(modified=modified)
+        reaper.reap(i)
+        job = Job.objects.first()
+        if fail:
+            assert job.status == 'failed'
+            assert 'marked as failed' in job.job_explanation
+            assert job.start_args == ''
+        else:
+            assert job.status == status
+
+    def test_workflow_does_not_reap(self):
+        i = Instance(hostname='awx')
+        i.save()
+        j = WorkflowJob(
+            status='running',
+            execution_node='awx'
+        )
+        j.save()
+        reaper.reap(i)
+
+        assert WorkflowJob.objects.first().status == 'running'

awx/main/tests/unit/api/test_views.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import mock
 import pytest
 import requests
@@ -293,7 +294,7 @@ class TestSurveySpecValidation:
         new['spec'][0]['default'] = '$encrypted$'
         new['spec'][0]['required'] = False
         resp = view._validate_spec_data(new, old)
-        assert resp is None
+        assert resp is None, resp.data
         assert new == {
             "name": "old survey",
             "description": "foobar",
@@ -357,3 +358,58 @@ class TestSurveySpecValidation:
                 }
             ]
         }
+
+
+    @staticmethod
+    def spec_from_element(survey_item):
+        survey_item.setdefault('name', 'foo')
+        survey_item.setdefault('variable', 'foo')
+        survey_item.setdefault('required', False)
+        survey_item.setdefault('question_name', 'foo')
+        survey_item.setdefault('type', 'text')
+        spec = {
+            'name': 'test survey',
+            'description': 'foo',
+            'spec': [survey_item]
+        }
+        return spec
+
+
+    @pytest.mark.parametrize("survey_item, error_text", [
+        ({'type': 'password', 'default': ['some', 'invalid', 'list']}, 'expected to be string'),
+        ({'type': 'password', 'default': False}, 'expected to be string'),
+        ({'type': 'integer', 'default': 'foo'}, 'expected to be int'),
+        ({'type': 'integer', 'default': u'🐉'}, 'expected to be int'),
+        ({'type': 'foo'}, 'allowed question types'),
+        ({'type': u'🐉'}, 'allowed question types'),
+        ({'type': 'multiplechoice'}, 'multiplechoice must specify choices'),
+        ({'type': 'integer', 'min': 'foo'}, 'min limit in survey question 0 expected to be integer'),
+        ({'question_name': 42}, "'question_name' in survey question 0 expected to be string.")
+    ])
+    def test_survey_question_element_validation(self, survey_item, error_text):
+        spec = self.spec_from_element(survey_item)
+        r = JobTemplateSurveySpec._validate_spec_data(spec, {})
+        assert r is not None, (spec, error_text)
+        assert 'error' in r.data
+        assert error_text in r.data['error']
+
+
+    def test_survey_spec_non_dict_error(self):
+        spec = self.spec_from_element({})
+        spec['spec'][0] = 'foo'
+        r = JobTemplateSurveySpec._validate_spec_data(spec, {})
+        assert 'Survey question 0 is not a json object' in r.data['error']
+
+
+    def test_survey_spec_dual_names_error(self):
+        spec = self.spec_from_element({})
+        spec['spec'].append(spec['spec'][0].copy())
+        r = JobTemplateSurveySpec._validate_spec_data(spec, {})
+        assert "'variable' 'foo' duplicated in survey question 1." in r.data['error']
+
+
+    def test_survey_spec_element_missing_property(self):
+        spec = self.spec_from_element({})
+        spec['spec'][0].pop('type')
+        r = JobTemplateSurveySpec._validate_spec_data(spec, {})
+        assert "'type' missing from survey question 0" in r.data['error']

awx/main/tests/unit/models/test_inventory.py

@@ -73,17 +73,6 @@ def test_invalid_kind_clean_insights_credential():
 
 
 class TestControlledBySCM(): 
-    @pytest.mark.parametrize('source', [
-        'scm',
-        'ec2',
-        'manual',
-    ])
-    def test_clean_overwrite_vars_valid(self, source):
-        inv_src = InventorySource(overwrite_vars=True,
-                                  source=source)
-
-        inv_src.clean_overwrite_vars()
-
     def test_clean_source_path_valid(self):
         inv_src = InventorySource(source_path='/not_real/',
                                   source='scm')

awx/main/tests/unit/test_task_manager.py

@@ -1,69 +0,0 @@
-# Copyright (c) 2017 Ansible by Red Hat
-# All Rights Reserved.
-
-import mock
-import pytest
-
-from django.utils.timezone import now as tz_now
-from django.db import DatabaseError
-
-from awx.main.scheduler import TaskManager
-from awx.main.models import (
-    Job,
-    Instance,
-    InstanceGroup,
-)
-from django.core.cache import cache
-
-
-class TestCleanupInconsistentCeleryTasks():
-    @mock.patch.object(cache, 'get', return_value=None)
-    @mock.patch.object(TaskManager, 'get_active_tasks', return_value=([], {}))
-    @mock.patch.object(TaskManager, 'get_running_tasks', return_value=({'host1': [Job(id=2), Job(id=3),]}, []))
-    @mock.patch.object(InstanceGroup.objects, 'prefetch_related', return_value=[])
-    @mock.patch.object(Instance.objects, 'filter', return_value=mock.MagicMock(first=lambda: None))
-    @mock.patch('awx.main.scheduler.task_manager.logger')
-    def test_instance_does_not_exist(self, logger_mock, *args):
-        logger_mock.error = mock.MagicMock(side_effect=RuntimeError("mocked"))
-        tm = TaskManager()
-        with pytest.raises(RuntimeError) as excinfo:
-            tm.cleanup_inconsistent_celery_tasks()
-
-        assert "mocked" in str(excinfo.value)
-        logger_mock.error.assert_called_once_with("Execution node Instance host1 not found in database. "
-                                                  "The node is currently executing jobs ['job 2 (new)', "
-                                                  "'job 3 (new)']")
-
-    @mock.patch.object(cache, 'get', return_value=None)
-    @mock.patch.object(TaskManager, 'get_active_tasks', return_value=([], {'host1': []}))
-    @mock.patch.object(InstanceGroup.objects, 'prefetch_related', return_value=[])
-    @mock.patch.object(TaskManager, 'get_running_tasks')
-    @mock.patch('awx.main.scheduler.task_manager.logger')
-    def test_save_failed(self, logger_mock, get_running_tasks, *args):
-        logger_mock.error = mock.MagicMock()
-        job = Job(id=2, modified=tz_now(), status='running', celery_task_id='blah', execution_node='host1')
-        job.websocket_emit_status = mock.MagicMock()
-        get_running_tasks.return_value = ({'host1': [job]}, [])
-        tm = TaskManager()
-
-        with mock.patch.object(job, 'save', side_effect=DatabaseError):
-            tm.cleanup_inconsistent_celery_tasks()
-            job.save.assert_called_once()
-            logger_mock.error.assert_called_once_with("Task job 2 (failed) DB error in marking failed. Job possibly deleted.")
-
-    @mock.patch.object(InstanceGroup.objects, 'prefetch_related', return_value=[])
-    @mock.patch('awx.main.scheduler.task_manager.Inspect')
-    def test_multiple_active_instances_sanity_check(self, inspect_mock, *args):
-        class MockInspector:
-            pass
-
-        mock_inspector = MockInspector()
-        mock_inspector.active = lambda: {
-            'celery@host1': [],
-            'celery@host2': []
-        }
-        inspect_mock.return_value = mock_inspector
-        tm = TaskManager()
-        active_task_queues, queues = tm.get_active_tasks()
-        assert 'host1' in queues
-        assert 'host2' in queues

awx/main/tests/unit/test_tasks.py

@@ -67,7 +67,7 @@ def test_work_success_callback_missing_job():
     task_data = {'type': 'project_update', 'id': 9999}
     with mock.patch('django.db.models.query.QuerySet.get') as get_mock:
         get_mock.side_effect = ProjectUpdate.DoesNotExist()
-        assert tasks.handle_work_success(None, task_data) is None
+        assert tasks.handle_work_success(task_data) is None
 
 
 def test_send_notifications_list(mocker):

awx/main/tests/unit/test_views.py

@@ -8,6 +8,7 @@ from rest_framework.generics import ListAPIView
 # AWX
 from awx.main.views import ApiErrorView
 from awx.api.views import JobList, InventorySourceList
+from awx.api.generics import ListCreateAPIView, SubListAttachDetachAPIView
 
 
 HTTP_METHOD_NAMES = [
@@ -73,3 +74,30 @@ def test_views_have_search_fields(all_views):
                 for v in views_missing_search
             ]))
         )
+
+
+def test_global_creation_always_possible(all_views):
+    """To not make life very difficult for clients, this test
+    asserts that all creatable resources can be created by
+    POSTing to the global resource list
+    """
+    views_by_model = {}
+    for View in all_views:
+        if not getattr(View, 'deprecated', False) and issubclass(View, ListAPIView) and hasattr(View, 'model'):
+            views_by_model.setdefault(View.model, []).append(View)
+    for model, views in views_by_model.items():
+        creatable = False
+        global_view = None
+        creatable_view = None
+        for View in views:
+            if '{}ListView'.format(model.__name__) == View.__name__:
+                global_view = View
+            if issubclass(View, ListCreateAPIView) and not issubclass(View, SubListAttachDetachAPIView):
+                creatable = True
+                creatable_view = View
+        if not creatable or not global_view:
+            continue
+        assert 'POST' in global_view().allowed_methods, (
+            'Resource {} should be creatable in global list view {}. '
+            'Can be created now in {}'.format(model, global_view, creatable_view)
+        )

awx/main/tests/unit/utils/test_reload.py

@@ -8,8 +8,8 @@ def test_produce_supervisor_command(mocker):
     mock_process.communicate = communicate_mock
     Popen_mock = mocker.MagicMock(return_value=mock_process)
     with mocker.patch.object(reload.subprocess, 'Popen', Popen_mock):
-        reload._supervisor_service_command(['beat', 'callback', 'fact'], "restart")
+        reload._supervisor_service_command("restart")
         reload.subprocess.Popen.assert_called_once_with(
-            ['supervisorctl', 'restart', 'tower-processes:receiver',],
+            ['supervisorctl', 'restart', 'tower-processes:*',],
             stderr=-1, stdin=-1, stdout=-1)
 

awx/main/utils/autoscale.py

@@ -1,27 +0,0 @@
-from celery.utils.log import get_logger
-from celery.worker.autoscale import Autoscaler, AUTOSCALE_KEEPALIVE
-from django.conf import settings
-import psutil
-
-logger = get_logger('awx.main.tasks')
-
-
-class DynamicAutoScaler(Autoscaler):
-
-    def __init__(self, pool, max_concurrency, min_concurrency=0, worker=None,
-                 keepalive=AUTOSCALE_KEEPALIVE, mutex=None):
-        super(DynamicAutoScaler, self).__init__(pool, max_concurrency,
-                                                min_concurrency, worker,
-                                                keepalive, mutex)
-        settings_absmem = getattr(settings, 'SYSTEM_TASK_ABS_MEM', None)
-        if settings_absmem is not None:
-            total_memory_gb = int(settings_absmem)
-        else:
-            total_memory_gb = (psutil.virtual_memory().total >> 30) + 1  # noqa: round up
-
-        # 5 workers per GB of total memory
-        self.max_concurrency = min(max_concurrency, (total_memory_gb * 5))
-        logger.warn('celery worker dynamic --autoscale={},{}'.format(
-            self.max_concurrency,
-            self.min_concurrency
-        ))

awx/main/utils/ha.py

@@ -1,17 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2017 Ansible Tower by Red Hat
-# All Rights Reserved.
-
-from django.conf import settings
-
-
-class AWXCeleryRouter(object):
-    def route_for_task(self, task, args=None, kwargs=None):
-        tasks = [
-            'awx.main.tasks.cluster_node_heartbeat',
-            'awx.main.tasks.purge_old_stdout_files',
-            'awx.main.tasks.awx_isolated_heartbeat',
-        ]
-        if task in tasks:
-            return {'queue': settings.CLUSTER_HOST_ID, 'routing_key': settings.CLUSTER_HOST_ID}

awx/main/utils/reload.py

@@ -11,11 +11,8 @@ from django.conf import settings
 logger = logging.getLogger('awx.main.utils.reload')
 
 
-def _supervisor_service_command(service_internal_names, command, communicate=True):
+def _supervisor_service_command(command, communicate=True):
     '''
-    Service internal name options:
-     - beat - celery - callback - channels - uwsgi - daphne
-     - fact - nginx
     example use pattern of supervisorctl:
     # supervisorctl restart tower-processes:receiver tower-processes:factcacher
     '''
@@ -25,13 +22,7 @@ def _supervisor_service_command(service_internal_names, command, communicate=Tru
     args = ['supervisorctl']
     if settings.DEBUG:
         args.extend(['-c', '/supervisor.conf'])
-    programs = []
-    name_translation_dict = settings.SERVICE_NAME_DICT
-    for n in service_internal_names:
-        if n in name_translation_dict:
-            programs.append('{}:{}'.format(group_name, name_translation_dict[n]))
-    args.extend([command])
-    args.extend(programs)
+    args.extend([command, '{}:*'.format(group_name)])
     logger.debug('Issuing command to {} services, args={}'.format(command, args))
     supervisor_process = subprocess.Popen(args, stdin=subprocess.PIPE,
                                           stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -48,6 +39,6 @@ def _supervisor_service_command(service_internal_names, command, communicate=Tru
         logger.info('Submitted supervisorctl {} command, not waiting for result'.format(command))
 
 
-def stop_local_services(service_internal_names, communicate=True):
-    logger.warn('Stopping services {} on this node in response to user action'.format(service_internal_names))
-    _supervisor_service_command(service_internal_names, command='stop', communicate=communicate)
+def stop_local_services(communicate=True):
+    logger.warn('Stopping services on this node in response to user action')
+    _supervisor_service_command(command='stop', communicate=communicate)

awx/plugins/inventory/azure_rm.py

@@ -24,7 +24,7 @@ Azure External Inventory Script
 ===============================
 Generates dynamic inventory by making API requests to the Azure Resource
 Manager using the Azure Python SDK. For instruction on installing the
-Azure Python SDK see http://azure-sdk-for-python.readthedocs.org/
+Azure Python SDK see https://azure-sdk-for-python.readthedocs.io/
 
 Authentication
 --------------
@@ -50,6 +50,7 @@ Command line arguments:
  - ad_user
  - password
  - cloud_environment
+ - adfs_authority_url
 
 Environment variables:
  - AZURE_PROFILE
@@ -60,6 +61,7 @@ Environment variables:
  - AZURE_AD_USER
  - AZURE_PASSWORD
  - AZURE_CLOUD_ENVIRONMENT
+ - AZURE_ADFS_AUTHORITY_URL
 
 Run for Specific Host
 -----------------------
@@ -200,27 +202,43 @@ except ImportError:
     # python3
     import configparser as cp
 
-from packaging.version import Version
-
 from os.path import expanduser
 import ansible.module_utils.six.moves.urllib.parse as urlparse
 
 HAS_AZURE = True
 HAS_AZURE_EXC = None
+HAS_AZURE_CLI_CORE = True
+CLIError = None
 
 try:
+    from msrestazure.azure_active_directory import AADTokenCredentials
     from msrestazure.azure_exceptions import CloudError
+    from msrestazure.azure_active_directory import MSIAuthentication
     from msrestazure import azure_cloud
     from azure.mgmt.compute import __version__ as azure_compute_version
     from azure.common import AzureMissingResourceHttpError, AzureHttpError
     from azure.common.credentials import ServicePrincipalCredentials, UserPassCredentials
     from azure.mgmt.network import NetworkManagementClient
     from azure.mgmt.resource.resources import ResourceManagementClient
+    from azure.mgmt.resource.subscriptions import SubscriptionClient
     from azure.mgmt.compute import ComputeManagementClient
+    from adal.authentication_context import AuthenticationContext
 except ImportError as exc:
     HAS_AZURE_EXC = exc
     HAS_AZURE = False
 
+try:
+    from azure.cli.core.util import CLIError
+    from azure.common.credentials import get_azure_cli_credentials, get_cli_profile
+    from azure.common.cloud import get_cli_active_cloud
+except ImportError:
+    HAS_AZURE_CLI_CORE = False
+    CLIError = Exception
+
+try:
+    from ansible.release import __version__ as ansible_version
+except ImportError:
+    ansible_version = 'unknown'
 
 AZURE_CREDENTIAL_ENV_MAPPING = dict(
     profile='AZURE_PROFILE',
@@ -231,6 +249,7 @@ AZURE_CREDENTIAL_ENV_MAPPING = dict(
     ad_user='AZURE_AD_USER',
     password='AZURE_PASSWORD',
     cloud_environment='AZURE_CLOUD_ENVIRONMENT',
+    adfs_authority_url='AZURE_ADFS_AUTHORITY_URL'
 )
 
 AZURE_CONFIG_SETTINGS = dict(
@@ -241,10 +260,13 @@ AZURE_CONFIG_SETTINGS = dict(
     group_by_resource_group='AZURE_GROUP_BY_RESOURCE_GROUP',
     group_by_location='AZURE_GROUP_BY_LOCATION',
     group_by_security_group='AZURE_GROUP_BY_SECURITY_GROUP',
-    group_by_tag='AZURE_GROUP_BY_TAG'
+    group_by_tag='AZURE_GROUP_BY_TAG',
+    group_by_os_family='AZURE_GROUP_BY_OS_FAMILY',
+    use_private_ip='AZURE_USE_PRIVATE_IP'
 )
 
 AZURE_MIN_VERSION = "2.0.0"
+ANSIBLE_USER_AGENT = 'Ansible/{0}'.format(ansible_version)
 
 
 def azure_id_to_dict(id):
@@ -265,6 +287,8 @@ class AzureRM(object):
         self._compute_client = None
         self._resource_client = None
         self._network_client = None
+        self._adfs_authority_url = None
+        self._resource = None
 
         self.debug = False
         if args.debug:
@@ -300,13 +324,38 @@ class AzureRM(object):
         self.log("setting subscription_id")
         self.subscription_id = self.credentials['subscription_id']
 
-        if self.credentials.get('client_id') is not None and \
-           self.credentials.get('secret') is not None and \
-           self.credentials.get('tenant') is not None:
+        # get authentication authority
+        # for adfs, user could pass in authority or not.
+        # for others, use default authority from cloud environment
+        if self.credentials.get('adfs_authority_url'):
+            self._adfs_authority_url = self.credentials.get('adfs_authority_url')
+        else:
+            self._adfs_authority_url = self._cloud_environment.endpoints.active_directory
+
+        # get resource from cloud environment
+        self._resource = self._cloud_environment.endpoints.active_directory_resource_id
+
+        if self.credentials.get('credentials'):
+            self.azure_credentials = self.credentials.get('credentials')
+        elif self.credentials.get('client_id') and self.credentials.get('secret') and self.credentials.get('tenant'):
             self.azure_credentials = ServicePrincipalCredentials(client_id=self.credentials['client_id'],
                                                                  secret=self.credentials['secret'],
                                                                  tenant=self.credentials['tenant'],
                                                                  cloud_environment=self._cloud_environment)
+
+        elif self.credentials.get('ad_user') is not None and \
+                self.credentials.get('password') is not None and \
+                self.credentials.get('client_id') is not None and \
+                self.credentials.get('tenant') is not None:
+
+                self.azure_credentials = self.acquire_token_with_username_password(
+                    self._adfs_authority_url,
+                    self._resource,
+                    self.credentials['ad_user'],
+                    self.credentials['password'],
+                    self.credentials['client_id'],
+                    self.credentials['tenant'])
+
         elif self.credentials.get('ad_user') is not None and self.credentials.get('password') is not None:
             tenant = self.credentials.get('tenant')
             if not tenant:
@@ -315,9 +364,12 @@ class AzureRM(object):
                                                          self.credentials['password'],
                                                          tenant=tenant,
                                                          cloud_environment=self._cloud_environment)
+
         else:
             self.fail("Failed to authenticate with provided credentials. Some attributes were missing. "
-                      "Credentials must include client_id, secret and tenant or ad_user and password.")
+                      "Credentials must include client_id, secret and tenant or ad_user and password, or "
+                      "ad_user, password, client_id, tenant and adfs_authority_url(optional) for ADFS authentication, or "
+                      "be logged in using AzureCLI.")
 
     def log(self, msg):
         if self.debug:
@@ -361,6 +413,32 @@ class AzureRM(object):
 
         return None
 
+    def _get_azure_cli_credentials(self):
+        credentials, subscription_id = get_azure_cli_credentials()
+        cloud_environment = get_cli_active_cloud()
+
+        cli_credentials = {
+            'credentials': credentials,
+            'subscription_id': subscription_id,
+            'cloud_environment': cloud_environment
+        }
+        return cli_credentials
+
+    def _get_msi_credentials(self, subscription_id_param=None):
+        credentials = MSIAuthentication()
+        subscription_id_param = subscription_id_param or os.environ.get(AZURE_CREDENTIAL_ENV_MAPPING['subscription_id'], None)
+        try:
+            # try to get the subscription in MSI to test whether MSI is enabled
+            subscription_client = SubscriptionClient(credentials)
+            subscription = next(subscription_client.subscriptions.list())
+            subscription_id = str(subscription.subscription_id)
+            return {
+                'credentials': credentials,
+                'subscription_id': subscription_id_param or subscription_id
+            }
+        except Exception as exc:
+            return None
+
     def _get_credentials(self, params):
         # Get authentication credentials.
         # Precedence: cmd line parameters-> environment variables-> default profile in ~/.azure/credentials.
@@ -397,8 +475,31 @@ class AzureRM(object):
             self.log('Retrieved default profile credentials from ~/.azure/credentials.')
             return default_credentials
 
+        msi_credentials = self._get_msi_credentials(arg_credentials.get('subscription_id'))
+        if msi_credentials:
+            self.log('Retrieved credentials from MSI.')
+            return msi_credentials
+
+        try:
+            if HAS_AZURE_CLI_CORE:
+                self.log('Retrieving credentials from AzureCLI profile')
+            cli_credentials = self._get_azure_cli_credentials()
+            return cli_credentials
+        except CLIError as ce:
+            self.log('Error getting AzureCLI profile credentials - {0}'.format(ce))
+
         return None
 
+    def acquire_token_with_username_password(self, authority, resource, username, password, client_id, tenant):
+        authority_uri = authority
+
+        if tenant is not None:
+            authority_uri = authority + '/' + tenant
+
+        context = AuthenticationContext(authority_uri)
+        token_response = context.acquire_token_with_username_password(resource, username, password, client_id)
+        return AADTokenCredentials(token_response)
+
     def _register(self, key):
         try:
             # We have to perform the one-time registration here. Otherwise, we receive an error the first
@@ -412,16 +513,21 @@ class AzureRM(object):
                       "https://docs.microsoft.com/azure/azure-resource-manager/"
                       "resource-manager-common-deployment-errors#noregisteredproviderfound"))
 
+    def get_mgmt_svc_client(self, client_type, base_url, api_version):
+        client = client_type(self.azure_credentials,
+                             self.subscription_id,
+                             base_url=base_url,
+                             api_version=api_version)
+        client.config.add_user_agent(ANSIBLE_USER_AGENT)
+        return client
+
     @property
     def network_client(self):
         self.log('Getting network client')
         if not self._network_client:
-            self._network_client = NetworkManagementClient(
-                self.azure_credentials,
-                self.subscription_id,
-                base_url=self._cloud_environment.endpoints.resource_manager,
-                api_version='2017-06-01'
-            )
+            self._network_client = self.get_mgmt_svc_client(NetworkManagementClient,
+                                                            self._cloud_environment.endpoints.resource_manager,
+                                                            '2017-06-01')
             self._register('Microsoft.Network')
         return self._network_client
 
@@ -429,24 +535,18 @@ class AzureRM(object):
     def rm_client(self):
         self.log('Getting resource manager client')
         if not self._resource_client:
-            self._resource_client = ResourceManagementClient(
-                self.azure_credentials,
-                self.subscription_id,
-                base_url=self._cloud_environment.endpoints.resource_manager,
-                api_version='2017-05-10'
-            )
+            self._resource_client = self.get_mgmt_svc_client(ResourceManagementClient,
+                                                             self._cloud_environment.endpoints.resource_manager,
+                                                             '2017-05-10')
         return self._resource_client
 
     @property
     def compute_client(self):
         self.log('Getting compute client')
         if not self._compute_client:
-            self._compute_client = ComputeManagementClient(
-                self.azure_credentials,
-                self.subscription_id,
-                base_url=self._cloud_environment.endpoints.resource_manager,
-                api_version='2017-03-30'
-            )
+            self._compute_client = self.get_mgmt_svc_client(ComputeManagementClient,
+                                                            self._cloud_environment.endpoints.resource_manager,
+                                                            '2017-03-30')
             self._register('Microsoft.Compute')
         return self._compute_client
 
@@ -473,9 +573,11 @@ class AzureInventory(object):
         self.replace_dash_in_groups = False
         self.group_by_resource_group = True
         self.group_by_location = True
+        self.group_by_os_family = True
         self.group_by_security_group = True
         self.group_by_tag = True
         self.include_powerstate = True
+        self.use_private_ip = False
 
         self._inventory = dict(
             _meta=dict(
@@ -528,6 +630,8 @@ class AzureInventory(object):
                             help='Active Directory User')
         parser.add_argument('--password', action='store',
                             help='password')
+        parser.add_argument('--adfs_authority_url', action='store',
+                            help='Azure ADFS authority url')
         parser.add_argument('--cloud_environment', action='store',
                             help='Azure Cloud Environment name or metadata discovery URL')
         parser.add_argument('--resource-groups', action='store',
@@ -545,7 +649,7 @@ class AzureInventory(object):
             # get VMs for requested resource groups
             for resource_group in self.resource_groups:
                 try:
-                    virtual_machines = self._compute_client.virtual_machines.list(resource_group)
+                    virtual_machines = self._compute_client.virtual_machines.list(resource_group.lower())
                 except Exception as exc:
                     sys.exit("Error: fetching virtual machines for resource group {0} - {1}".format(resource_group, str(exc)))
                 if self._args.host or self.tags:
@@ -604,7 +708,7 @@ class AzureInventory(object):
 
             host_vars['os_disk'] = dict(
                 name=machine.storage_profile.os_disk.name,
-                operating_system_type=machine.storage_profile.os_disk.os_type.value
+                operating_system_type=machine.storage_profile.os_disk.os_type.value.lower()
             )
 
             if self.include_powerstate:
@@ -651,12 +755,15 @@ class AzureInventory(object):
                     for ip_config in network_interface.ip_configurations:
                         host_vars['private_ip'] = ip_config.private_ip_address
                         host_vars['private_ip_alloc_method'] = ip_config.private_ip_allocation_method
+                        if self.use_private_ip:
+                            host_vars['ansible_host'] = ip_config.private_ip_address
                         if ip_config.public_ip_address:
                             public_ip_reference = self._parse_ref_id(ip_config.public_ip_address.id)
                             public_ip_address = self._network_client.public_ip_addresses.get(
                                 public_ip_reference['resourceGroups'],
                                 public_ip_reference['publicIPAddresses'])
-                            host_vars['ansible_host'] = public_ip_address.ip_address
+                            if not self.use_private_ip:
+                                host_vars['ansible_host'] = public_ip_address.ip_address
                             host_vars['public_ip'] = public_ip_address.ip_address
                             host_vars['public_ip_name'] = public_ip_address.name
                             host_vars['public_ip_alloc_method'] = public_ip_address.public_ip_allocation_method
@@ -706,10 +813,16 @@ class AzureInventory(object):
 
         host_name = self._to_safe(vars['name'])
         resource_group = self._to_safe(vars['resource_group'])
+        operating_system_type = self._to_safe(vars['os_disk']['operating_system_type'].lower())
         security_group = None
         if vars.get('security_group'):
             security_group = self._to_safe(vars['security_group'])
 
+        if self.group_by_os_family:
+            if not self._inventory.get(operating_system_type):
+                self._inventory[operating_system_type] = []
+            self._inventory[operating_system_type].append(host_name)
+
         if self.group_by_resource_group:
             if not self._inventory.get(resource_group):
                 self._inventory[resource_group] = []

awx/settings/defaults.py

@@ -4,7 +4,6 @@
 import os
 import re  # noqa
 import sys
-import djcelery
 import six
 from datetime import timedelta
 
@@ -26,6 +25,8 @@ BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 def is_testing(argv=None):
     import sys
     '''Return True if running django or py.test unit tests.'''
+    if 'PYTEST_CURRENT_TEST' in os.environ.keys():
+        return True
     argv = sys.argv if argv is None else argv
     if len(argv) >= 1 and ('py.test' in argv[0] or 'py/test.py' in argv[0]):
         return True
@@ -60,7 +61,7 @@ DATABASES = {
         'NAME': os.path.join(BASE_DIR, 'awx.sqlite3'),
         'ATOMIC_REQUESTS': True,
         'TEST': {
-            # Test database cannot be :memory: for celery/inventory tests.
+            # Test database cannot be :memory: for inventory tests.
             'NAME': os.path.join(BASE_DIR, 'awx_test.sqlite3'),
         },
     }
@@ -280,7 +281,6 @@ INSTALLED_APPS = (
     'oauth2_provider',
     'rest_framework',
     'django_extensions',
-    'djcelery',
     'channels',
     'polymorphic',
     'taggit',
@@ -459,40 +459,9 @@ DEVSERVER_DEFAULT_PORT = '8013'
 # Set default ports for live server tests.
 os.environ.setdefault('DJANGO_LIVE_TEST_SERVER_ADDRESS', 'localhost:9013-9199')
 
-djcelery.setup_loader()
-
 BROKER_POOL_LIMIT = None
 BROKER_URL = 'amqp://guest:guest@localhost:5672//'
-CELERY_EVENT_QUEUE_TTL = 5
 CELERY_DEFAULT_QUEUE = 'awx_private_queue'
-CELERY_DEFAULT_EXCHANGE = 'awx_private_queue'
-CELERY_DEFAULT_ROUTING_KEY = 'awx_private_queue'
-CELERY_DEFAULT_EXCHANGE_TYPE = 'direct'
-CELERY_TASK_SERIALIZER = 'json'
-CELERY_RESULT_SERIALIZER = 'json'
-CELERY_ACCEPT_CONTENT = ['json']
-CELERY_TRACK_STARTED = True
-CELERYD_TASK_TIME_LIMIT = None
-CELERYD_TASK_SOFT_TIME_LIMIT = None
-CELERYD_POOL_RESTARTS = True
-CELERYD_AUTOSCALER = 'awx.main.utils.autoscale:DynamicAutoScaler'
-CELERY_RESULT_BACKEND = 'djcelery.backends.database:DatabaseBackend'
-CELERY_IMPORTS = ('awx.main.scheduler.tasks',)
-CELERY_QUEUES = ()
-CELERY_ROUTES = ('awx.main.utils.ha.AWXCeleryRouter',)
-
-
-def log_celery_failure(*args):
-    # Import annotations lazily to avoid polluting the `awx.settings` namespace
-    # and causing circular imports
-    from awx.main.tasks import log_celery_failure
-    return log_celery_failure(*args)
-
-
-CELERY_ANNOTATIONS = {'*': {'on_failure': log_celery_failure}}
-
-CELERYBEAT_SCHEDULER = 'celery.beat.PersistentScheduler'
-CELERYBEAT_MAX_LOOP_INTERVAL = 60
 CELERYBEAT_SCHEDULE = {
     'tower_scheduler': {
         'task': 'awx.main.tasks.awx_periodic_scheduler',
@@ -525,9 +494,6 @@ CELERYBEAT_SCHEDULE = {
 }
 AWX_INCONSISTENT_TASK_INTERVAL = 60 * 3
 
-# Celery queues that will always be listened to by celery workers
-# Note: Broadcast queues have unique, auto-generated names, with the alias
-# property value of the original queue name.
 AWX_CELERY_QUEUES_STATIC = [
     six.text_type(CELERY_DEFAULT_QUEUE),
 ]
@@ -626,8 +592,8 @@ SOCIAL_AUTH_SAML_ENABLED_IDPS = {}
 SOCIAL_AUTH_SAML_ORGANIZATION_ATTR = {}
 SOCIAL_AUTH_SAML_TEAM_ATTR = {}
 
-# Any ANSIBLE_* settings will be passed to the subprocess environment by the
-# celery task.
+# Any ANSIBLE_* settings will be passed to the task runner subprocess
+# environment
 
 # Do not want AWX to ask interactive questions and want it to be friendly with
 # reprovisioning
@@ -641,8 +607,7 @@ ANSIBLE_PARAMIKO_RECORD_HOST_KEYS = False
 # output
 ANSIBLE_FORCE_COLOR = True
 
-# Additional environment variables to be passed to the subprocess started by
-# the celery task.
+# Additional environment variables to be passed to the ansible subprocesses
 AWX_TASK_ENV = {}
 
 # Flag to enable/disable updating hosts M2M when saving job events.
@@ -1027,7 +992,10 @@ LOGGING = {
         'timed_import': {
             '()': 'awx.main.utils.formatters.TimeFormatter',
             'format': '%(relativeSeconds)9.3f %(levelname)-8s %(message)s'
-        }
+        },
+        'dispatcher': {
+            'format': '%(asctime)s %(levelname)-8s %(name)s PID:%(process)d %(message)s',
+        },
     },
     'handlers': {
         'console': {
@@ -1077,6 +1045,19 @@ LOGGING = {
             'backupCount': 5,
             'formatter':'simple',
         },
+        'dispatcher': {
+            'level': 'WARNING',
+            'class':'logging.handlers.RotatingFileHandler',
+            'filters': ['require_debug_false'],
+            'filename': os.path.join(LOG_ROOT, 'dispatcher.log'),
+            'maxBytes': 1024 * 1024 * 5, # 5 MB
+            'backupCount': 5,
+            'formatter':'dispatcher',
+        },
+        'celery.beat': {
+            'class':'logging.StreamHandler',
+            'level': 'ERROR'
+        },  # don't log every celerybeat wakeup
         'inventory_import': {
             'level': 'DEBUG',
             'class':'logging.StreamHandler',
@@ -1158,9 +1139,13 @@ LOGGING = {
         },
         'awx.main': {
             'handlers': ['null']
-        }, 'awx.main.commands.run_callback_receiver': {
+        },
+        'awx.main.commands.run_callback_receiver': {
             'handlers': ['callback_receiver'],
         },
+        'awx.main.dispatch': {
+            'handlers': ['dispatcher'],
+        },
         'awx.isolated.manager.playbooks': {
             'handlers': ['management_playbooks'],
             'propagate': False

awx/settings/development.py

@@ -68,13 +68,6 @@ template['OPTIONS']['loaders'] = (
     'django.template.loaders.app_directories.Loader',
 )
 
-# Disable capturing all SQL queries when running celeryd in development.
-if 'celery' in sys.argv:
-    SQL_DEBUG = False
-
-CELERYD_HIJACK_ROOT_LOGGER = False
-CELERYD_LOG_COLOR = True
-
 CALLBACK_QUEUE = "callback_tasks"
 
 # Enable dynamically pulling roles from a requirement.yml file
@@ -149,15 +142,6 @@ except ImportError:
 
 CLUSTER_HOST_ID = socket.gethostname()
 
-# Supervisor service name dictionary used for programatic restart
-SERVICE_NAME_DICT = {
-    "celery": "celery",
-    "callback": "receiver",
-    "runworker": "channels",
-    "uwsgi": "uwsgi",
-    "daphne": "daphne",
-    "nginx": "nginx"}
-
 try:
     socket.gethostbyname('docker.for.mac.host.internal')
     os.environ['SDB_NOTIFY_HOST'] = 'docker.for.mac.host.internal'

awx/settings/local_settings.py.docker_compose

@@ -73,13 +73,13 @@ if "pytest" in sys.modules:
             'ENGINE': 'django.db.backends.sqlite3',
             'NAME': os.path.join(BASE_DIR, 'awx.sqlite3'),
             'TEST': {
-                # Test database cannot be :memory: for celery/inventory tests.
+                # Test database cannot be :memory: for inventory tests.
                 'NAME': os.path.join(BASE_DIR, 'awx_test.sqlite3'),
             },
         }
     }
 
-# Celery AMQP configuration.
+# AMQP configuration.
 BROKER_URL = "amqp://{}:{}@{}/{}".format(os.environ.get("RABBITMQ_USER"),
                                   os.environ.get("RABBITMQ_PASS"),
                                   os.environ.get("RABBITMQ_HOST"),
@@ -138,8 +138,7 @@ REMOTE_HOST_HEADERS = ['REMOTE_ADDR', 'REMOTE_HOST']
 # REMOTE_HOST_HEADERS will be trusted unconditionally')
 PROXY_IP_WHITELIST = []
 
-# Define additional environment variables to be passed to subprocess started by
-# the celery task.
+# Define additional environment variables to be passed to ansible subprocesses
 #AWX_TASK_ENV['FOO'] = 'BAR'
 
 # If set, use -vvv for project updates instead of -v for more output.
@@ -197,7 +196,6 @@ LOGGING['handlers']['syslog'] = {
 LOGGING['loggers']['django.request']['handlers'] = ['console']
 LOGGING['loggers']['rest_framework.request']['handlers'] = ['console']
 LOGGING['loggers']['awx']['handlers'] = ['console', 'external_logger']
-LOGGING['loggers']['awx.main.commands.run_callback_receiver']['handlers'] = ['console']
 LOGGING['loggers']['awx.main.tasks']['handlers'] = ['console', 'external_logger']
 LOGGING['loggers']['awx.main.scheduler']['handlers'] = ['console', 'external_logger']
 LOGGING['loggers']['django_auth_ldap']['handlers'] = ['console']

awx/settings/local_settings.py.example

@@ -39,13 +39,13 @@ if is_testing(sys.argv):
             'ENGINE': 'django.db.backends.sqlite3',
             'NAME': os.path.join(BASE_DIR, 'awx.sqlite3'),
             'TEST': {
-                # Test database cannot be :memory: for celery/inventory tests.
+                # Test database cannot be :memory: for tests.
                 'NAME': os.path.join(BASE_DIR, 'awx_test.sqlite3'),
             },
         }
     }
     
-# Celery AMQP configuration.
+# AMQP configuration.
 BROKER_URL = 'amqp://guest:guest@localhost:5672'
 
 # Set True to enable additional logging from the job_event_callback plugin
@@ -94,8 +94,7 @@ REMOTE_HOST_HEADERS = ['REMOTE_ADDR', 'REMOTE_HOST']
 # REMOTE_HOST_HEADERS will be trusted unconditionally')
 PROXY_IP_WHITELIST = []
 
-# Define additional environment variables to be passed to subprocess started by
-# the celery task.
+# Define additional environment variables to be passed to ansible subprocesses
 #AWX_TASK_ENV['FOO'] = 'BAR'
 
 # If set, use -vvv for project updates instead of -v for more output.

awx/settings/production.py

@@ -54,21 +54,13 @@ AWX_ISOLATED_USERNAME = 'awx'
 
 LOGGING['handlers']['tower_warnings']['filename'] = '/var/log/tower/tower.log'
 LOGGING['handlers']['callback_receiver']['filename'] = '/var/log/tower/callback_receiver.log'
+LOGGING['handlers']['dispatcher']['filename'] = '/var/log/tower/dispatcher.log'
 LOGGING['handlers']['task_system']['filename'] = '/var/log/tower/task_system.log'
 LOGGING['handlers']['fact_receiver']['filename'] = '/var/log/tower/fact_receiver.log'
 LOGGING['handlers']['management_playbooks']['filename'] = '/var/log/tower/management_playbooks.log'
 LOGGING['handlers']['system_tracking_migrations']['filename'] = '/var/log/tower/tower_system_tracking_migrations.log'
 LOGGING['handlers']['rbac_migrations']['filename'] = '/var/log/tower/tower_rbac_migrations.log'
 
-# Supervisor service name dictionary used for programatic restart
-SERVICE_NAME_DICT = {
-    "beat": "awx-celery-beat",
-    "celery": "awx-celery",
-    "callback": "awx-callback-receiver",
-    "channels": "awx-channels-worker",
-    "uwsgi": "awx-uwsgi",
-    "daphne": "awx-daphne"}
-
 # Store a snapshot of default settings at this point before loading any
 # customizable config files.
 DEFAULTS_SNAPSHOT = {}

awx/sso/ldap_group_types.py

@@ -42,7 +42,7 @@ class PosixUIDGroupType(LDAPGroupType):
                 )
 
             search = group_search.search_with_additional_term_string(filterstr)
-            search.attrlist = [self.name_attr]
+            search.attrlist = [str(self.name_attr)]
             groups = search.execute(ldap_user.connection)
         except (KeyError, IndexError):
             pass

awx/ui/README.md

@@ -1,46 +1,26 @@
 # AWX UI
 
 ## Requirements
+- node.js 8.x LTS
+- npm 5.x LTS
+- bzip2, gcc-c++, git, make
 
-### Node / NPM
+## Development
+The API development server will need to be running. See [CONTRIBUTING.md](../../CONTRIBUTING.md).
 
-AWX currently requires the 6.x LTS version of Node and NPM.
+```shell
+# Build ui for the devel environment - reachable at https://localhost:8043
+make ui-devel
 
-macOS installer: [https://nodejs.org/dist/latest-v6.x/](https://nodejs.org/dist/latest-v6.x/)
+# Alternatively, start the ui development server. While running, the ui will be reachable
+# at https://localhost:3000 and updated automatically when code changes.
+make ui-docker
 
-RHEL / CentOS / Fedora:
-
-```
-$ curl --silent --location https://rpm.nodesource.com/setup_6.x | bash -
-$ yum install nodejs
-```
-
-### Other Dependencies
-
-On macOS, install the Command Line Tools:
-
-```
-$ xcode-select --install
-```
-
-RHEL / CentOS / Fedora:
-
-```
-$ yum install bzip2 gcc-c++ git make
-```
-
-## Usage
-
-### Starting the UI
-
-First, the AWX API will need to be running. See [CONTRIBUTING.md](../../CONTRIBUTING.md).
-
-When using Docker for Mac or native Docker on Linux:
-
-```
-$ make ui-docker
+# When using docker machine, use this command to start the ui development server instead.
+DOCKER_MACHINE_NAME=default make ui-docker-machine
 ```
 
+## Development with an external server
 If you normally run awx on an external host/server (in this example, `awx.local`),
 you'll need to reconfigure the webpack proxy slightly for `make ui-docker` to
 work:
@@ -63,119 +43,32 @@ awx/ui/build/webpack.watch.js
    },
 ```
 
-When using Docker Machine:
+## Testing
+```shell
+# run linters
+make jshint
 
-```
-$ DOCKER_MACHINE_NAME=default make ui-docker-machine
+# run unit tests
+make ui-test-ci
+
+# run e2e tests - see awx/ui/test/e2e for more information
+npm --prefix awx/ui run e2e
 ```
 
-### Running Tests
+## Adding dependencies
+```shell
+# add a development or build dependency
+npm install --prefix awx/ui --save-dev dev-package@1.2.3
 
-Run unit tests locally, poll for changes to both source and test files, launch tests in supported browser engines:
+# add a production dependency
+npm install --prefix awx/ui --save prod-package@1.23
 
-```
-$ make ui-test
+# add the updated package.json and lock files to scm
+git add awx/ui/package.json awx/ui/package-lock.json
 ```
 
-Run unit tests in a CI environment (Jenkins)
-
+## Building for Production
+```shell
+# built files are placed in awx/ui/static
+make ui-release
 ```
-$ make ui-test-ci
-```
-
-### Adding new dependencies
-
-
-#### Add / update a bundled vendor dependency
-
-1. `npm install --prefix awx/ui --save some-frontend-package@1.2.3`
-2. Add `'some-package'` to `var vendorFiles` in `./grunt-tasks/webpack.js`
-3. `npm  --prefix awx/ui shrinkwrap` to freeze current dependency resolution
-
-#### Add / update a dependecy in the build/test pipeline
-
-1. `npm install --prefix awx/ui --save-dev some-toolchain-package@1.2.3`
-2. `npm  --prefix awx/ui shrinkwrap` to freeze current dependency resolution
-
-### Polyfills, shims, patches
-
-The Webpack pipeline will prefer module patterns in this order: CommonJS, AMD, UMD. For a comparison of supported patterns, refer to [https://webpack.github.io/docs/comparison.html](Webpack's docs).
-
-Some javascript libraries do not export their contents as a module, or depend on other third-party components. If the library maintainer does not wrap their lib in a factory that provides a CommonJS or AMD module, you will need to provide dependencies with a shim.
-
-1. Shim implicit dependencies using Webpack's [ProvidePlugin](https://github.com/webpack/webpack/blob/006d59500de0493c4096d5d4cecd64eb12db2b95/lib/ProvidePlugin.js). Example:
-
-```js
-// AWX source code depends on the lodash library being available as _
-_.uniq([1,2,3,1]) // will throw error undefined
-```
-
-```js
-// webpack.config.js
-plugins: [
-  new webpack.ProvidePlugin({
-      '_': 'lodash',
-  })
-]
-```
-
-```js
-// the following requirement is inserted by webpack at build time
-var _ = require('lodash');
-_.uniq([1,2,3,1])
-```
-
-2. Use [`imports-loader`](https://webpack.github.io/docs/shimming-modules.html#importing) to inject requirements into the namespace of vendor code at import time. Use [`exports-loader`](https://webpack.github.io/docs/shimming-modules.html#exporting) to conventionally export vendor code lacking a conventional export pattern.
-3. [Apply a functional patch](https://gist.github.com/leigh-johnson/070159d3fd780d6d8da6e13625234bb3). A webpack plugin is the correct choice for a functional patch if your patch needs to access events in a build's lifecycle. A webpack loader is preferable if you need to compile and export a custom pattern of library modules.
-4. [Submit patches to libraries without modular exports](https://github.com/leigh-johnson/ngToast/commit/fea95bb34d27687e414619b4f72c11735d909f93) - the internet will thank you
-
-Some javascript libraries might only get one module pattern right.
-
-### Environment configuration - used in development / test builds
-
-Build tasks are parameterized with environment variables.
-
-`package.json` contains default environment configuration. When `npm run myScriptName` is executed, these variables will be exported to your environment with the prefix `npm_package_config_`. For example, `my_variable` will be exported to `npm_package_config_my_variable`.
-
-Environment variables can accessed in a Javascript via `PROCESS.env`.
-
-``` json
-  "config": {
-    "django_port": "8013",
-    "websocket_port": "8080",
-    "django_host": "0.0.0.0"
-  }
-```
-
-Example usage in `npm run build-docker-machine`:
-
-```bash
-$ docker-machine ssh $DOCKER_MACHINE_NAME -f -N -L ${npm_package_config_websocket_port}:localhost:${npm_package_config_websocket_port}; ip=$(docker-machine ip $DOCKER_MACHINE_NAME); echo npm set awx:django_host ${ip}; $ grunt dev
-```
-
-Example usage in an `npm test` script target:
-
-```
-npm_package_config_websocket_port=mock_websocket_port npm_package_config_django_port=mock_api_port npm_package_config_django_host=mock_api_host npm run test:someMockIntegration
-```
-
-You'll usually want to pipe and set vars prior to running a script target:
-```
-$ npm set awx:websocket_host ${mock_host}; npm run script-name
-```
-
-### NPM Scripts
-
-Examples:
-```json
-  {
-    "scripts": {
-      "pretest": "echo I run immediately before 'npm test' executes",
-      "posttest": "echo I run immediately after 'npm test' exits",
-      "test": "karma start karma.conf.js"
-    }
-  }
-```
-
-`npm test` is an alias for `npm run test`. Refer to [script field docs](https://docs.npmjs.com/misc/scripts) for a list of other runtime events.
-

awx/ui/client/features/templates/templates.strings.js

@@ -112,7 +112,6 @@ function TemplatesStrings (BaseString) {
         RUN: t.s('RUN'),
         CHECK: t.s('CHECK'),
         SELECT: t.s('SELECT'),
-        EDGE_CONFLICT: t.s('EDGE CONFLICT'),
         DELETED: t.s('DELETED'),
         START: t.s('START'),
         DETAILS: t.s('DETAILS'),

awx/ui/client/lib/theme/index.less

@@ -113,11 +113,6 @@
 @import '../../src/shared/upgrade/upgrade.block.less';
 @import '../../src/smart-status/smart-status.block.less';
 @import '../../src/workflow-results/standard-out.block.less';
-@import '../../src/system-tracking/date-picker/date-picker.block.less';
-@import '../../src/system-tracking/fact-data-table/fact-data-table.block.less';
-@import '../../src/system-tracking/fact-module-filter.block.less';
-@import '../../src/system-tracking/fact-module-pickers.block.less';
-@import '../../src/system-tracking/system-tracking-container.block.less';
 @import '../../src/templates/prompt/prompt.block.less';
 @import '../../src/templates/job_templates/multi-credential/multi-credential.block.less';
 @import '../../src/templates/labels/labelsList.block.less';

awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.partial.html

@@ -64,7 +64,6 @@
                     <div class="Form-tab"
                         ng-click="selectTab('organizations')"
                         ng-class="{'is-selected': tab.organizations}"
-                        ng-hide="owner.type === 'team'"
                     translate>
                         Organizations
                     </div>

awx/ui/client/src/app.js

@@ -10,7 +10,6 @@ if ($basePath) {
 }
 
 import start from './app.start';
-import systemTracking from './system-tracking/main';
 import inventoriesHosts from './inventories-hosts/main';
 import inventoryScripts from './inventory-scripts/main';
 import credentials from './credentials/main';
@@ -36,6 +35,7 @@ import RestServices from './rest/main';
 import access from './access/main';
 import scheduler from './scheduler/main';
 import instanceGroups from './instance-groups/main';
+import shared from './shared/main';
 
 import atFeatures from '~features';
 import atLibComponents from '~components';
@@ -62,13 +62,13 @@ angular
         'gettext',
         'Timezones',
         'lrInfiniteScroll',
+        shared.name,
         about.name,
         access.name,
         license.name,
         RestServices.name,
         browserData.name,
         configuration.name,
-        systemTracking.name,
         inventoriesHosts.name,
         inventoryScripts.name,
         credentials.name,

awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-list.controller.js

@@ -80,8 +80,6 @@ export default ['$scope', 'NestedHostsListDefinition', '$rootScope', 'GetBasePat
                     $scope.hostsSelected = null;
                 }
             }
-
-            $scope.systemTrackingDisabled = ($scope.hostsSelected && $scope.hostsSelected.length > 2) ? true : false;
         });
 
     }
@@ -160,15 +158,6 @@ export default ['$scope', 'NestedHostsListDefinition', '$rootScope', 'GetBasePat
         });
     };
 
-    $scope.systemTracking = function(){
-        var hostIds = _.map($scope.hostsSelected, (host) => host.id);
-        $state.go('systemTracking', {
-            inventoryId: $state.params.inventory_id,
-            hosts: $scope.hostsSelected,
-            hostIds: hostIds
-        });
-    };
-
     $scope.setAdhocPattern = function(){
         var pattern = _($scope.hostsSelected)
             .map(function(item){

awx/ui/client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js

@@ -73,8 +73,6 @@ export default ['$scope', 'ListDefinition', '$rootScope', 'GetBasePath',
                     $scope.hostsSelected = null;
                 }
             }
-
-            $scope.systemTrackingDisabled = ($scope.hostsSelected && $scope.hostsSelected.length > 2) ? true : false;
         });
 
     }
@@ -153,15 +151,6 @@ export default ['$scope', 'ListDefinition', '$rootScope', 'GetBasePath',
         $state.go('inventories.addSmartInventory');
     };
 
-    $scope.systemTracking = function(){
-        var hostIds = _.map($scope.hostsSelected, (host) => host.id);
-        $state.go('systemTracking', {
-            inventoryId: $state.params.inventory_id ? $state.params.inventory_id : $state.params.smartinventory_id,
-            hosts: $scope.hostsSelected,
-            hostIds: hostIds
-        });
-    };
-
     $scope.setAdhocPattern = function(){
         var pattern = _($scope.hostsSelected)
             .map(function(item){

awx/ui/client/src/login/loginModal/loginModal.partial.html

@@ -44,7 +44,7 @@
                 <form id="login-form"
                     name="loginForm"
                     class="form-horizontal"
-                    autocomplete="off" novalidate>
+                    novalidate>
                     <div class="form-group LoginModal-formGroup">
                         <label class="LoginModal-label
                             col-md-12" translate>USERNAME
@@ -54,7 +54,7 @@
                                 class="form-control LoginModal-field"
                                 ng-model="login_username"
                                 id="login-username"
-                                autocomplete="off" required>
+                                required>
                             <div class="error"
                                 ng-show="loginForm.login_username.$dirty &&
                                 loginForm.login_username.$error.required" translate>
@@ -73,8 +73,8 @@
                                 name="login_password"
                                 id="login-password"
                                 class="form-control LoginModal-field"
-                                ng-model="login_password" required
-                                autocomplete="off">
+                                ng-model="login_password"
+                                required>
                             <div class="error"
                                 ng-show="loginForm.login_password.$dirty
                                 &&

awx/ui/client/src/organizations/organizations.form.js

@@ -113,6 +113,51 @@ export default ['NotificationsList', 'i18n',
                         }
                     }
                 },
+                permissions: {
+                    name: 'permissions',
+                    awToolTip: i18n._('Please save before assigning permissions.'),
+                    djangoModel: 'access_list',
+                    dataPlacement: 'top',
+                    basePath: 'api/v2/organizations/{{$stateParams.organization_id}}/access_list/',
+                    search: {
+                        order_by: 'username'
+                    },
+                    type: 'collection',
+                    title: i18n._('Permissions'),
+                    iterator: 'permission',
+                    index: false,
+                    open: false,
+                    actions: {
+                        add: {
+                            ngClick: "$state.go('.add')",
+                            label: 'Add',
+                            awToolTip: i18n._('Add a permission'),
+                            actionClass: 'at-Button--add',
+                            actionId: 'button-add',
+                            ngShow: '(organization_obj.summary_fields.user_capabilities.edit || canAdd)'
+                        }
+                    },
+                    fields: {
+                        username: {
+                            key: true,
+                            label: i18n._('User'),
+                            linkBase: 'users',
+                            class: 'col-lg-3 col-md-3 col-sm-3 col-xs-4'
+                        },
+                        role: {
+                            label: i18n._('Role'),
+                            type: 'role',
+                            nosort: true,
+                            class: 'col-lg-4 col-md-4 col-sm-4 col-xs-4',
+                        },
+                        team_roles: {
+                            label: i18n._('Team Roles'),
+                            type: 'team_roles',
+                            nosort: true,
+                            class: 'col-lg-5 col-md-5 col-sm-5 col-xs-4',
+                        }
+                    }
+                },
                 "notifications": {
                     include: "NotificationsList"
 

awx/ui/client/src/shared/lodash-as-promised.js

@@ -1,129 +0,0 @@
-/*************************************************
- * Copyright (c) 2015 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-function lodashAsPromised($q) {
-
-    var lodash = _.runInContext();
-    var _aw = {};
-    var toExtend =
-        [   'map',
-            'filter',
-            'reduce',
-            'pluck',
-            'compact',
-            'xor',
-            'groupBy',
-            'thru'
-        ];
-
-    function log(label, obj) {
-        /* jshint ignore:start */
-        console.log(label, obj);
-        /* jshint ignore:end */
-        return obj;
-    }
-
-    function _reject(reason) {
-        return $q.reject(reason);
-    }
-
-    function _promise(value) {
-        return $q.when(value);
-    }
-
-    function _then(promise, fn) {
-        return promise.then(function(value) {
-            if (_.isFunction(value.then)) {
-                return _then(value, fn);
-            } else {
-                return fn(value);
-            }
-       });
-    }
-
-    function _catch(promise, fn) {
-        return promise.catch(fn);
-    }
-
-    function _finally(promise, fn) {
-        return promise.finally(fn);
-    }
-
- function thenAll(arr, then, deep) {
-    var doAll = function (arr) {
-      var promise = $q.all(arr).then(function (resolvedArr) {
-        if (deep) {
-          return lodash(resolvedArr)
-            .thenMap(function (elem) {
-              if (_.isArray(elem)) {
-                return thenAll(elem, null, true);
-              } else {
-                return elem;
-              }
-            })
-            .thenAll()
-            .value();
-        } else {
-          return resolvedArr;
-        }
-      });
-      return then ? promise.then(then) : promise;
-    };
-    if (arr.then) {
-      return arr.then(doAll);
-    } else {
-      return doAll(arr);
-    }
-  }
-
-  function thenFlatten(array, isShallow, callback, thisArg) {
-      return thenAll(array, _.partialRight(_.flatten, isShallow, callback, thisArg), true);
-  }
-
-    function wrapCallback(method, callback, thisArg, collection) {
-        return method(collection, function(value, index, collection) {
-            if (_.isUndefined(value)) {
-                return callback(value, index, collection);
-            } else if (_.isFunction(value.then)) {
-                return value.then(_.partialRight(callback, index, collection));
-            } else {
-                return callback(value, index, collection);
-            }
-        }, thisArg);
-    }
-
-    function promiseWrapper(method, collection, callback, thisArg) {
-        if (_.isFunction(collection.then)) {
-            return collection.then(
-                _.partial(wrapCallback, method, callback, thisArg));
-        } else {
-            return $q.all(collection)
-                .then(function(unwrappedResults) {
-                    return method(unwrappedResults, callback, thisArg);
-                });
-        }
-    }
-
-    toExtend.forEach(function(fnName) {
-        var wrappedName = 'then' + _.capitalize(fnName);
-        _aw[wrappedName] = _.partial(promiseWrapper, _[fnName]);
-    });
-
-    _aw.promise = _promise;
-    _aw.reject = _reject;
-    _aw.then = _then;
-    _aw.catch = _catch;
-    _aw.finally = _finally;
-    _aw.thenAll = thenAll;
-    _aw.thenFlatten = thenFlatten;
-    _aw.log = log;
-
-    lodash.mixin(_aw);
-
-    return lodash;
-}
-
-export default ['$q', lodashAsPromised];

awx/ui/client/src/shared/main.js

@@ -10,7 +10,6 @@ import lookupModal from './lookup/main';
 import smartSearch from './smart-search/main';
 import paginate from './paginate/main';
 import columnSort from './column-sort/main';
-import lodashAsPromised from './lodash-as-promised';
 import filters from './filters/main';
 import truncatedText from './truncated-text.directive';
 import stateExtender from './stateExtender.provider';
@@ -34,6 +33,7 @@ import orgAdminLookup from './org-admin-lookup/main';
 import limitPanels from './limit-panels/main';
 import multiSelectPreview from './multi-select-preview/main';
 import credentialTypesLookup from './credentialTypesLookup.factory';
+import utilities from './Utilities';
 
 export default
 angular.module('shared', [
@@ -64,11 +64,11 @@ angular.module('shared', [
         orgAdminLookup.name,
         limitPanels.name,
         multiSelectPreview.name,
+        utilities.name,
         'ngCookies',
         'angular-duration-format'
     ])
     .factory('stateDefinitions', stateDefinitions)
-    .factory('lodashAsPromised', lodashAsPromised)
     .factory('credentialTypesLookup', credentialTypesLookup)
     .directive('truncatedText', truncatedText)
     .provider('$stateExtender', stateExtender);

awx/ui/client/src/system-tracking/compare-facts/fact-template.js

@@ -1,31 +0,0 @@
-var $injector = angular.injector(['ng']);
-var $interpolate = $injector.get('$interpolate');
-
-function FactTemplate(templateString) {
-    this.templateString = templateString;
-}
-
-function loadFactTemplate(factTemplate, fact) {
-    if (_.isFunction(factTemplate)) {
-        return factTemplate(fact);
-    } else {
-        return factTemplate;
-    }
-}
-
-
-FactTemplate.prototype.render = function(factData) {
-
-    if (_.isUndefined(factData) || _.isEmpty(factData)) {
-        return 'absent';
-    }
-
-    var template = loadFactTemplate(this.templateString, factData);
-    return $interpolate(template)(factData);
-};
-
-FactTemplate.prototype.hasTemplate = function() {
-    return !_.isUndefined(this.templateString);
-};
-
-export default FactTemplate;

awx/ui/client/src/system-tracking/compare-facts/flat.js

@@ -1,229 +0,0 @@
-/*************************************************
- * Copyright (c) 2015 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-function slotFactValues(basisPosition, basisValue, comparatorValue) {
-    var leftValue, rightValue;
-
-    if (basisPosition === 'left') {
-        leftValue = basisValue;
-        rightValue = comparatorValue;
-    } else {
-        rightValue = basisValue;
-        leftValue = comparatorValue;
-    }
-
-    return  {    left: leftValue,
-                 right: rightValue
-            };
-}
-
-/*
- * @name flatCompare
- * @description
- *  Takes two separate fact objects and combines any differences into a single result
- *  object, formatted for display.
- *
- * @param {Tower.SystemTracking.ResolvedFact} basisFacts - The facts we will use as the basis for this comparison
- * @param {Tower.SystemTracking.ResolvedFact} comparatorFacts - The facts we will compare against the basis
- * @param {Tower.SystemTracking.RenderOptions} renderOptions - Options specified in the module for rendering values
- *
- * @returns {Array.<Tower.SystemTracking.FactComparisonDescriptor>}
- *
- * @typedef {Object} Tower.SystemTracking.RenderOptions
- * @property {string} nameKey - The name of the key that is used to locate facts from basisFacts in comparatorFacts
- * @property {string|string[]} compareKey - A single key or list of keys to compare in the two fact collections
- * @property {Tower.SystemTracking.KeyNameMap} keyNameMap - An object mapping existing key names to new key names for display
- * @property {Tower.SystemTracking.FactTemplate} factTemplate - An optional template used as the string for comparing and displaying a fact
- * @property {boolean} supportsValueArray - Indicates that the module we're rendering supports values in an array of strings rather than just a string; iterim measure to make sure modules with multiple facts matching nameKey don't get evaluated because we won't know how to dipslay them
- *
- * @typedef {(string|boolean)} Tower.SystemTracking.KeyNameMapValue - The name you want to use for the display of a key or "true" to indicate a key should be displayed without changing its name (all keys are hidden by default)
- *
- * @typedef {Object.<string, Tower.SystemTracking.KeyNameMapValue>} Tower.SystemTracking.KeyNameMap - An object whose keys are the names of keys that exist in a fact and whose values control how that key is displayed
- *
- * @typedef {{displayKeyPath: string, nestingLevel: number, facts: Array.<Tower.SystemTracking.FactComparisonResult>}} Tower.SystemTracking.FactComparisonDescriptor
- *
- * @typedef {{keyName: string, value1: Tower.SystemTracking.FactComparisonValue, value2: Tower.SystemTracking.FactComparisonValue, isDivergent: boolean}} Tower.SystemTracking.FactComparisonResult
- *
- * @typedef {(string|string[])} Tower.SystemTracking.FactComparisonValue
- *
- */
-export default
-    function flatCompare(basisFacts,
-                         comparatorFacts, renderOptions) {
-
-        var nameKey = renderOptions.nameKey;
-        var compareKeys = renderOptions.compareKey;
-        var keyNameMap = renderOptions.keyNameMap;
-        var factTemplate = renderOptions.factTemplate;
-
-
-        return basisFacts.facts.reduce(function(arr, basisFact) {
-
-            // First, make sure this fact hasn't already been processed, if it
-            // has don't process it again
-            //
-            if (_.any(arr, { displayKeyPath: basisFact[nameKey] })) {
-                return arr;
-            }
-
-            var searcher = {};
-            searcher[nameKey] = basisFact[nameKey];
-
-            var containsValueArray = false;
-            var matchingFacts = _.where(comparatorFacts.facts, searcher);
-            var comparisonResults;
-            var diffs;
-
-            // If this fact exists more than once in `basisFacts`, then
-            // we need to process it differently
-            //
-            var otherBasisFacts = _.where(basisFacts.facts, searcher);
-            if (renderOptions.supportsValueArray && otherBasisFacts.length > 1) {
-                comparisonResults = processFactsForValueArray(basisFacts.position, otherBasisFacts, matchingFacts);
-            } else {
-                comparisonResults = processFactsForSingleValue(basisFact, matchingFacts[0] || {});
-            }
-
-            function processFactsForValueArray(basisPosition, basisFacts, comparatorFacts) {
-
-                function renderFactValues(facts) {
-                    return facts.map(function(fact) {
-                        return factTemplate.render(fact);
-                    });
-                }
-
-                var basisFactValues = renderFactValues(basisFacts);
-                var comparatorFactValues = renderFactValues(comparatorFacts);
-
-                var slottedValues = slotFactValues(basisPosition, basisFactValues, comparatorFactValues);
-
-                var remaining = _.difference(slottedValues.left, slottedValues.right);
-
-                if (_.isEmpty(remaining)) {
-                    slottedValues.isDivergent = false;
-                } else {
-                    slottedValues.isDivergent = true;
-                    containsValueArray = true;
-                }
-
-                return slottedValues;
-            }
-
-            function processFactsForSingleValue(basisFact, comparatorFact) {
-                // Perform comparison and get back comparisonResults; like:
-                //  {   'value':
-                //      {   leftValue: 'blah',
-                //          rightValue: 'doo'
-                //      }
-                //  };
-                //
-                return _.reduce(compareKeys, function(result, compareKey) {
-
-                        var isNestedDisplay = false;
-                        var basisFactValue = basisFact[compareKey];
-                        var comparatorFactValue = comparatorFact[compareKey];
-                        var slottedValues;
-
-                        if (_.isUndefined(basisFactValue) && _.isUndefined(comparatorFactValue)) {
-                            return result;
-                        }
-
-                        var template = factTemplate;
-
-                        if (_.isObject(template) && template.hasOwnProperty(compareKey)) {
-                            template = template[compareKey];
-
-                            // 'true' means render the key without formatting
-                            if (template === true) {
-                                template =
-                                    {   render: function(fact) { return fact[compareKey]; }
-                                    };
-                            }
-
-                            isNestedDisplay = true;
-                        } else if (typeof template.hasTemplate === 'function' && !template.hasTemplate()) {
-                            template =
-                                {   render: function(fact) { return fact[compareKey]; }
-                                };
-                            isNestedDisplay = true;
-                        } else if (typeof factTemplate.render === 'function') {
-                            template = factTemplate;
-                        } else if (!template.hasOwnProperty(compareKey)) {
-                            return result;
-                        }
-
-                        // if (!renderOptions.supportsValueArray) {
-                        //     comparatorFact = comparatorFact[0];
-                        // }
-
-                        basisFactValue = template.render(basisFact);
-                        comparatorFactValue = template.render(comparatorFact);
-
-                        slottedValues = slotFactValues(basisFacts.position,
-                                                       basisFactValue,
-                                                       comparatorFactValue);
-
-                        if (slottedValues.left !== slottedValues.right) {
-                            slottedValues.isDivergent = true;
-                        } else {
-                            slottedValues.isDivergent = false;
-                        }
-
-                        if (isNestedDisplay) {
-                            result[compareKey] = slottedValues;
-                        } else {
-                            result = slottedValues;
-                        }
-
-                        return result;
-                    }, {});
-            }
-
-                var hasDiffs =
-                    _.any(comparisonResults, { isDivergent: true }) ||
-                        comparisonResults.isDivergent === true;
-
-                if (hasDiffs && typeof factTemplate.render === 'function') {
-
-                    diffs =
-                        {  keyName: basisFact[nameKey],
-                            value1: comparisonResults.left,
-                            value2: comparisonResults.right
-                        };
-
-                } else if (hasDiffs) {
-
-                    diffs =
-                        _(comparisonResults).map(function(slottedValues, key) {
-
-                            var keyName = key;
-
-                            if (keyNameMap && keyNameMap[key]) {
-                                keyName = keyNameMap[key];
-                            }
-
-                            return {    keyName: keyName,
-                                        value1: slottedValues.left,
-                                        value2: slottedValues.right,
-                                        isDivergent: slottedValues.isDivergent
-                                   };
-                        }).compact()
-                        .value();
-                }
-
-            var descriptor =
-                    {   displayKeyPath: basisFact[nameKey],
-                        nestingLevel: 0,
-                        containsValueArray: containsValueArray,
-                        facts: diffs
-                    };
-
-            return arr.concat(descriptor);
-        }, []).filter(function(diff) {
-            return !_.isEmpty(diff.facts);
-        });
-
-    }

awx/ui/client/src/system-tracking/compare-facts/main.js

@@ -1,55 +0,0 @@
-/*************************************************
- * Copyright (c) 2015 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-import compareNestedFacts from './nested';
-import compareFlatFacts from './flat';
-import FactTemplate from './fact-template';
-
-export function compareFacts(module, facts) {
-
-
-    var renderOptions = _.merge({}, module);
-
-    // If the module has a template or includes a list of keys to display,
-    // then perform a flat comparison, otherwise assume nested
-    //
-    if (renderOptions.factTemplate || renderOptions.nameKey) {
-        // For flat structures we compare left-to-right, then right-to-left to
-        // make sure we get a good comparison between both hosts
-
-        if (_.isPlainObject(renderOptions.factTemplate)) {
-            renderOptions.factTemplate =
-                _.mapValues(renderOptions.factTemplate, function(template) {
-                    if (typeof template === 'string' || typeof template === 'function') {
-                        return new FactTemplate(template);
-                    } else {
-                        return template;
-                    }
-                });
-        } else {
-            renderOptions.factTemplate = new FactTemplate(renderOptions.factTemplate);
-        }
-
-        var leftToRight = compareFlatFacts(facts[0], facts[1], renderOptions);
-        var rightToLeft = compareFlatFacts(facts[1], facts[0], renderOptions);
-
-        return _(leftToRight)
-                    .concat(rightToLeft)
-                    .unique('displayKeyPath')
-                    .thru(function(result) {
-                        return  {   factData: result,
-                                    isNestedDisplay: _.isPlainObject(renderOptions.factTemplate),
-                                    leftData: facts[0].facts,
-                                    rightData: facts[1].facts
-                                };
-                    })
-                    .value();
-    } else {
-        return {    factData: compareNestedFacts(facts[0], facts[1]),
-                    isNestedDisplay: true
-               };
-    }
-}

awx/ui/client/src/system-tracking/compare-facts/nested-helpers.js

@@ -1,204 +0,0 @@
-/*************************************************
- * Copyright (c) 2015 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-export function formatFacts(diffedResults) {
-
-    var loggingEnabled = false;
-
-    function log(msg, obj) {
-        if (loggingEnabled) {
-            /* jshint ignore:start */
-            console.log(msg, obj);
-            /* jshint ignore:end */
-        }
-        return obj;
-    }
-
-    function isFlatFactArray(fact) {
-        // Flat arrays will have the index as their
-        // keyName
-        return !_.isNaN(Number(fact.keyName));
-    }
-
-    function isNestedFactArray(fact) {
-        // Nested arrays will have the index as the last element
-        // in the keypath
-        return !_.isNaN(Number(_.last(fact.keyPath)));
-    }
-    function isFactArray(fact) {
-        return isNestedFactArray(fact) || isFlatFactArray(fact);
-    }
-
-        // Explode flat results into groups based matching
-        // parent keypaths
-        var grouped = _.groupBy(diffedResults, function(obj) {
-            var leftKeyPathStr = obj.keyPath.join('.');
-            log('obj.keyPath', obj.keyPath);
-            return log('    reduced key', _.reduce(diffedResults, function(result, obj2) {
-                log('        obj2.keyPath', obj2.keyPath);
-                var rightKeyPathStr = obj2.keyPath.join('.');
-                if (isFactArray(obj)) {
-                    log('            number hit!', Number(_.last(obj.keyPath)));
-                    return obj.keyPath.slice(0,-1);
-                } else if (rightKeyPathStr && leftKeyPathStr !== rightKeyPathStr && log('        intersection', _.intersection(obj.keyPath, obj2.keyPath).join('.')) === rightKeyPathStr) {
-                    log('            hit!');
-                    return obj2.keyPath;
-                } else {
-                    log('            else hit!');
-                    return result;
-                }
-            }, obj.keyPath)).join('.');
-        });
-
-        var normalized = _.mapValues(grouped, function(arr, rootKey) {
-            log('processing', rootKey);
-            var nestingLevel = 0;
-            var trailingLength;
-            return _(arr).sortBy('keyPath.length').tap(function(arr) {
-                // Initialize trailing length to the shortest keyPath length
-                // in the array (first item because we know it's sorted now)
-                trailingLength = arr[0].keyPath.length;
-            }).map(function(obj) {
-                var keyPathStr = obj.keyPath.join('.');
-                log('    calculating displayKeyPath for', keyPathStr);
-                var rootKeyPath = rootKey.split('.');
-                var displayKeyPath;
-                // var factArrayIndex;
-                var isFactArrayProp = isFactArray(obj);
-
-                if (obj.keyPath.length > trailingLength) {
-                    nestingLevel++;
-                    trailingLength = obj.keyPath.length;
-                }
-
-                if (isNestedFactArray(obj)) {
-                    // factArrayIndex = obj.keyPath.length > 1 ? Number(_.last(obj.keyPath)) : obj.keyName;
-                    displayKeyPath = _.initial(obj.keyPath).join('.');
-                // } else {
-                    // displayKeyPath = _.difference(obj.keyPath, rootKeyPath).join('.');
-                } else {
-                    displayKeyPath = rootKeyPath.join('.');
-                }
-
-
-                obj.displayKeyPath = displayKeyPath;
-                obj.nestingLevel = nestingLevel;
-                // obj.arrayPosition = factArrayIndex;
-                obj.isArrayMember = isFactArrayProp;
-                return obj;
-            }).value();
-        });
-
-        var flattened = _.reduce(normalized, function(flat, value) {
-
-            var groupedValues = _.groupBy(value, 'displayKeyPath');
-
-            var groupArr =
-                _.reduce(groupedValues, function(groupArr, facts, key) {
-                    var isArray = facts[0].isArrayMember;
-                    var nestingLevel = facts[0].nestingLevel;
-
-                    if (isArray) {
-                        facts = _(facts)
-                                    .groupBy('arrayPosition')
-                                    .values()
-                                    .value();
-                    }
-
-                    var displayObj =
-                        {   keyPath: key.split('.'),
-                            displayKeyPath: key,
-                            isNestedDisplay: true,
-                            facts: facts,
-                            isFactArray: isArray,
-                            nestingLevel: nestingLevel
-                        };
-                    return groupArr.concat(displayObj);
-                }, []);
-
-            return flat.concat(groupArr);
-
-        }, []);
-
-        return flattened;
-}
-
-export function findFacts(factData) {
-    var leftData = factData[0].facts;
-    var rightData = factData[1].facts;
-
-    // For value types (boolean, number) or complex objects use the value
-    // as is. For collection types, return 'absent' if it's empty
-    // otherwise, use the value as is.
-    //
-    function factValueOrAbsent(value) {
-
-        if (_.isBoolean(value) ||
-                _.isNumber(value)) {
-            return value;
-        }
-
-        if (_.isNull(value) || _.isEmpty(value)) {
-            return 'absent';
-        }
-
-        return value;
-    }
-
-    function factObject(keyPath, key, leftValue, rightValue) {
-        var obj =
-            {   keyPath: keyPath,
-                keyName: key
-            };
-
-        leftValue = factValueOrAbsent(leftValue);
-        rightValue = factValueOrAbsent(rightValue);
-
-        if (factData[0].position === 'left') {
-                obj.value1 = leftValue;
-                obj.value2 = rightValue;
-        } else {
-                obj.value1 = rightValue;
-                obj.value2 = leftValue;
-        }
-
-        return obj;
-    }
-
-    function descend(parentValue, parentKey, parentKeys) {
-        if (_.isObject(parentValue)) {
-            return _.reduce(parentValue, function(all, value, key) {
-                var merged = descend(value, key, parentKeys.concat(key));
-                return all.concat(merged);
-            }, []);
-        } else {
-
-            // default value in _.get ('absent') only hits if it's undefined, so we need to handle other falsey cases with ||
-            var rightValue =
-                _.get(rightData,
-                      parentKeys);
-
-            return factObject(
-                // TODO: Currently parentKeys is getting passed with the final key
-                // as the last element. Figure out how to have it passed
-                // in correctly, so that it's all the keys leading up to
-                // the value, but not the value's key itself
-                // In the meantime, slicing the last element off the array
-                parentKeys.slice(0,-1),
-                parentKey,
-                parentValue,
-                rightValue);
-        }
-    }
-
-    return _.reduce(leftData, function(mergedFacts, parentValue, parentKey) {
-
-        var merged = descend(parentValue, parentKey, [parentKey]);
-
-        return _.flatten(mergedFacts.concat(merged));
-
-    }, []);
-}

awx/ui/client/src/system-tracking/compare-facts/nested.js

@@ -1,76 +0,0 @@
-/*************************************************
- * Copyright (c) 2015 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-import {formatFacts, findFacts} from './nested-helpers';
-
-export default function nestedCompare(basisFacts, comparatorFacts) {
-
-    if (_.isEmpty(basisFacts.facts)) {
-        var tmp = _.merge({}, basisFacts);
-        basisFacts = _.merge({}, comparatorFacts);
-        comparatorFacts = tmp;
-    }
-
-    var factsList = [basisFacts, comparatorFacts];
-    factsList = findFacts(factsList);
-    factsList = compareFacts(factsList);
-    return formatFacts(factsList);
-
-    function compareFacts(factsList) {
-
-        function serializedFactKey(fact) {
-            return fact.keyPath.join('.');
-        }
-
-        var groupedByParent =
-            _.groupBy(factsList, function(fact) {
-                return serializedFactKey(fact);
-            });
-
-
-        var diffed = _.mapValues(groupedByParent, function(facts) {
-            return facts.filter(function(fact) {
-                return fact.value1 !== fact.value2;
-            }).map(function(fact) {
-                // TODO: Can we determine a "compare order" and be able say
-                // which property is actually divergent?
-                return _.merge({}, fact, { isDivergent: true });
-            });
-        });
-
-        var itemsWithDiffs =
-            _.filter(factsList, function(facts) {
-                var groupedData = diffed[serializedFactKey(facts)];
-                return !_.isEmpty(groupedData);
-            });
-
-        var keysWithDiffs =
-            _.reduce(diffed, function(diffs, facts, key) {
-                diffs[key] =
-                    facts.reduce(function(diffKeys, fact) {
-                        if (fact.isDivergent) {
-                            return diffKeys.concat(fact.keyName);
-                        }
-                        return diffKeys;
-                    }, []);
-                return diffs;
-            }, {});
-
-        var factsWithDivergence =
-             _.mapValues(itemsWithDiffs, function(fact) {
-                var divergentKeys = keysWithDiffs[serializedFactKey(fact)];
-                if (divergentKeys) {
-                    var isDivergent = _.include(divergentKeys, fact.keyName);
-                    return _.merge({}, fact, { isDivergent: isDivergent });
-                } else {
-                    return _.merge({}, fact, { isDivergent: false });
-                }
-            });
-
-        return factsWithDivergence;
-
-    }
-}

awx/ui/client/src/system-tracking/data-services/dedupe-versions.js

@@ -1,42 +0,0 @@
-export default
-    function dedupeVersions(nonEmptyResults) {
-
-        if (_.any(nonEmptyResults, 'versions.length', 0)) {
-            return _.pluck(nonEmptyResults, 'versions[0]');
-        }
-
-        // if the version that will be displayed on the left is before the
-        // version that will be displayed on the right, flip them
-        if (nonEmptyResults[0].versions[0].timestamp > nonEmptyResults[1].versions[0].timestamp) {
-            nonEmptyResults = nonEmptyResults.reverse();
-        }
-
-        var firstTimestamp = nonEmptyResults[0].versions[0].timestamp;
-
-        var hostIdsWithDupes =
-            _(nonEmptyResults)
-                .pluck('versions[0]')
-                .filter('timestamp', firstTimestamp)
-                .map(function(version, index) {
-                    return nonEmptyResults[index].hostId;
-                })
-                .value();
-
-        if (hostIdsWithDupes.length === 1) {
-            return _.pluck(nonEmptyResults, 'versions[0]');
-        }
-
-        var bestScanResults = _.max(nonEmptyResults, "versions.length");
-
-        return nonEmptyResults.map(function(scan, index) {
-            var hasDupe =
-                _.include(hostIdsWithDupes, scan.hostId);
-
-            if (hasDupe && index === 1) {
-                return bestScanResults.versions[0];
-            } else {
-                return bestScanResults.versions[1];
-            }
-        });
-
-    }

awx/ui/client/src/system-tracking/data-services/fact-scan-data.service.js

@@ -1,65 +0,0 @@
-/*************************************************
- * Copyright (c) 2015 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-export default ['Rest', 'GetBasePath', 'ProcessErrors', 'lodashAsPromised',
-function (Rest, GetBasePath, ProcessErrors, _) {
-
-    function buildUrl (host_id, module, startDate, endDate) {
-        var url = GetBasePath('hosts') + host_id + '/fact_versions/',
-            params= [["module", module] , ['from', startDate.format()],  ['to', endDate.format()]];
-
-        params = params.filter(function(p){
-            return !_.isEmpty(p[1]);
-        });
-        params = params.map(function(p){
-            return p.join("=");
-        }).join("&");
-        url = _.compact([url, params]).join("?");
-        return url;
-    }
-
-    return {
-        getFacts: function(version) {
-            var promise;
-            Rest.setUrl(version.related.fact_view);
-            promise = Rest.get();
-            return promise.then(function (response) {
-                return response.data;
-            }).catch(function (response) {
-                ProcessErrors(null, response.data, response.status, null, {
-                    hdr: 'Error!',
-                    msg: 'Failed to get license info. GET returned status: ' +
-                    response.status
-                });
-            });
-        },
-
-        getVersion: function(versionParams){
-            //move the build url into getVersion and have the
-            // parameters passed into this
-            var promise;
-            var hostId = versionParams.hostId;
-            var startDate = versionParams.dateRange.from;
-            var endDate = versionParams.dateRange.to;
-            var module = versionParams.moduleName;
-
-            var url = buildUrl(hostId, module, startDate, endDate);
-
-            Rest.setUrl(url);
-            promise = Rest.get();
-            return promise.then(function(response) {
-                versionParams.versions = response.data.results;
-                return versionParams;
-            }).catch(function (response) {
-                ProcessErrors(null, response.data, response.status, null, {
-                    hdr: 'Error!',
-                    msg: 'Failed to get license info. GET returned status: ' +
-                    response.status
-                });
-            });
-        }
-    };
-}];

awx/ui/client/src/system-tracking/data-services/get-data-for-comparison.factory.js

@@ -1,68 +0,0 @@
-/*************************************************
- * Copyright (c) 2015 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-import dedupeVersions from './dedupe-versions';
-
-export default
-    [   'factScanDataService',
-        'resolveEmptyVersions',
-        'lodashAsPromised',
-        function(factScanDataService, resolveEmptyVersions, _) {
-            return function(hostIds, moduleName, leftDate, rightDate) {
-
-                var singleHostMode = false;
-
-                if (hostIds.length === 1) {
-                    singleHostMode = true;
-                    hostIds = hostIds.concat(hostIds[0]);
-                }
-
-                var hostVersionParams =
-                    [{  hostId: hostIds[0],
-                        dateRange: leftDate,
-                        moduleName: moduleName
-                     },
-                     {  hostId: hostIds[1],
-                         dateRange: rightDate,
-                         moduleName: moduleName
-                     }
-                    ];
-
-                return _(factScanDataService.getVersion(hostVersionParams[1]))
-                        .then(function(result) {
-                            return resolveEmptyVersions(result);
-                        }).thenAll(function(firstResult) {
-
-                            return factScanDataService.getVersion(hostVersionParams[0])
-                                    .then(function(secondResult) {
-                                        if (_.isEmpty(secondResult.versions)) {
-                                            secondResult = resolveEmptyVersions(secondResult);
-                                        }
-
-                                        return [firstResult, secondResult];
-                                    });
-                        }).thenAll(function(results) {
-                            var finalSet;
-
-                            if (singleHostMode) {
-                                finalSet = dedupeVersions(results.reverse());
-                            } else {
-                                finalSet = _.pluck(results, 'versions[0]').reverse();
-                            }
-
-                            return finalSet;
-                        }).thenMap(function(versionData) {
-                            if (versionData) {
-                                return factScanDataService.getFacts(versionData);
-                            } else {
-                                return { fact: [] };
-                            }
-                        }).thenAll(function(hostFacts) {
-                            return hostFacts;
-                        });
-            };
-        }
-    ];

awx/ui/client/src/system-tracking/data-services/get-module-options.factory.js

@@ -1,79 +0,0 @@
-var moduleConfig =
-    {   'packages':
-            {   compareKey: ['release', 'version'],
-                nameKey: 'name',
-                sortKey: 1,
-                factTemplate: "{{epoch|append:':'}}{{version}}-{{release}}{{arch|prepend:'.'}}",
-                supportsValueArray: true
-            },
-        'services':
-            {   compareKey: ['state', 'source'],
-                nameKey: 'name',
-                factTemplate: '{{state}} ({{source}})',
-                sortKey: 2
-            },
-        'files':
-            {   compareKey: ['size', 'mode', 'checksum', 'mtime', 'gid', 'uid'],
-                keyNameMap:
-                    {   'uid': 'ownership'
-                    },
-                factTemplate:
-                    {   'uid': 'user id: {{uid}}, group id: {{gid}}',
-                        'mode': true,
-                        'checksum': true,
-                        'size': true,
-                        'mtime': '{{mtime|formatEpoch}}'
-                    },
-                nameKey: 'path',
-                sortKey: 3
-            },
-        'ansible':
-            {   sortKey: 4
-            },
-        'custom':
-            {
-            }
-    };
-
-function makeModule(option, index) {
-    var name = option[0];
-    var displayName = option[1];
-    var config = moduleConfig.hasOwnProperty(name) ?
-                    moduleConfig[name] : moduleConfig.custom;
-    var modulesCount = _.keys(moduleConfig).length - 1;
-
-    config.name = name;
-    config.displayName = displayName;
-
-    // Use index to sort custom modules,
-    // offset by built-in modules since
-    // they have a hardcoded sort key
-    //
-    if (_.isUndefined(config.sortKey)) {
-        config.sortKey = (index - 1) + modulesCount;
-    }
-
-    return config;
-}
-
-function factory(hostId, rest, getBasePath, _) {
-    var url = [ getBasePath('hosts') + hostId,
-                'fact_versions'
-              ].join('/');
-
-    rest.setUrl(url);
-    return _(rest.options())
-        .then(function(response) {
-            var choices = response.data.actions.GET.module.choices;
-            return _.sortBy(choices, '1');
-        }).thenMap(makeModule);
-}
-
-export default
-    [   'Rest',
-        'GetBasePath',
-        'lodashAsPromised',
-        function(rest, getBasePath, lodash) {
-            return _.partialRight(factory, rest, getBasePath, lodash);
-        }
-    ];

awx/ui/client/src/system-tracking/data-services/main.js

@@ -1,12 +0,0 @@
-import factScanDataService from './fact-scan-data.service';
-import getDataForComparison from './get-data-for-comparison.factory';
-import getModuleOptions from './get-module-options.factory';
-import resolveEmptyVersions from './resolve-empty-versions.factory';
-import shared from '../../shared/main';
-
-export default
-    angular.module('systemTracking.dataServices', [shared.name])
-        .factory('getModuleOptions', getModuleOptions)
-        .factory('getDataForComparison', getDataForComparison)
-        .factory('resolveEmptyVersions', resolveEmptyVersions)
-        .service('factScanDataService', factScanDataService);

awx/ui/client/src/system-tracking/data-services/resolve-empty-versions.factory.js

@@ -1,33 +0,0 @@
-import moment from '../../shared/moment/moment';
-
-function resolveEmptyVersions(service, _, candidate, previousResult) {
-
-    candidate = _.merge({}, candidate);
-
-    // theoretically, returning no versions, but also returning only a single version for _a particular date_ acts as an empty version problem.  If there is only one version returned, you'll need to check previous dates as well.
-    if (_.isEmpty(candidate.versions) || candidate.versions.length === 1) {
-        // this marks the end of the date put in the datepicker.  this needs to be the end, rather than the beginning of the date, because you may have returned one valid version on the date the datepicker had in it.
-        var originalStartDate = candidate.dateRange.to.clone();
-
-        if (!_.isUndefined(previousResult)) {
-            candidate.dateRange.from = moment(previousResult.versions[0].timestamp);
-        } else {
-            candidate.dateRange.from = originalStartDate.clone().subtract(1, 'year');
-        }
-
-        candidate.dateRange.to = originalStartDate;
-
-        return service.getVersion(candidate);
-    }
-
-    return _.promise(candidate);
-
-}
-
-export default
-    [   'factScanDataService',
-        'lodashAsPromised',
-        function(factScanDataService, lodash) {
-            return _.partial(resolveEmptyVersions, factScanDataService, lodash);
-        }
-    ];

awx/ui/client/src/system-tracking/date-picker/date-picker.block.less

@@ -1,37 +0,0 @@
-.DatePicker {
-    flex: 1 0 auto;
-    display: flex;
-
-    &-icon {
-        flex: initial;
-        padding: 6px 12px;
-        font-size: 14px;
-        border-radius: 4px 0 0 4px;
-        border: 1px solid @b7grey;
-        border-right: 0;
-        background-color: @default-bg;
-    }
-
-    &-icon:hover {
-        background-color: @f6grey;
-    }
-
-    &-icon:focus,
-    &-icon:active {
-        background-color: @f6grey;
-    }
-
-    &-input {
-        flex: 1 0 auto;
-        border-radius: 0 4px 4px 0;
-        border: 1px solid @b7grey;
-        padding: 6px 12px;
-        background-color: @fcgrey;
-    }
-
-    &-input:focus,
-    &-input:active {
-        outline-offset: 0;
-        outline: 0;
-    }
-}

awx/ui/client/src/system-tracking/date-picker/date-picker.directive.js

@@ -1,104 +0,0 @@
-/*************************************************
- * Copyright (c) 2015 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-/* jshint unused: vars */
-
-export default ['moment',
-    'templateUrl',
-    function(moment, templateUrl) {
-        return {
-            restrict: 'E',
-            scope: {
-                date: '=',
-                minDate: '=',
-                autoUpdate: '=?',
-                inputClass: '&'
-            },
-            templateUrl: templateUrl('system-tracking/date-picker/date-picker'),
-            link: function(scope, element, attrs) {
-
-                // We need to make sure this _never_ recurses, which sometimes happens
-                // with two-way binding.
-                var mustUpdateValue = true;
-                scope.autoUpdate = scope.autoUpdate === false ? false : true;
-
-                scope.$watch('minDate', function(newValue) {
-                    if (newValue) {
-
-                        if (scope.autoUpdate && scope.date.isBefore(newValue)) {
-                            scope.date = newValue;
-                        }
-
-                        $('.date', element).datepicker('setStartDate', newValue.toDate());
-                    }
-                });
-
-                scope.$watch('date', function(newValue) {
-                    if (newValue) {
-                        mustUpdateValue = false;
-                        scope.dateValue = newValue.format('L');
-                    }
-                }, true);
-
-                scope.$watch('dateValue', function(newValue) {
-                    var newDate = moment(newValue, ['L'], moment.locale());
-
-                    if (newValue && !newDate.isValid()) {
-                        scope.error = "That is not a valid date.";
-                    } else if (newValue) {
-                        scope.date = newDate;
-                    }
-                    mustUpdateValue = true;
-                });
-
-                var localeData =
-                    moment.localeData();
-                var dateFormat = momentFormatToDPFormat(localeData._longDateFormat.L);
-                var localeKey = momentLocaleToDPLocale(moment.locale());
-
-                element.find(".DatePicker").addClass("input-prepend date");
-                element.find(".DatePicker").find(".DatePicker-icon").addClass("add-on");
-                $(".date").datepicker({
-                    autoclose: true,
-                    language: localeKey,
-                    format: dateFormat
-                });
-
-                function momentLocaleToDPLocale(localeKey) {
-                    var parts = localeKey.split('-');
-
-                    if (parts.length === 2) {
-                        var lastPart = parts[1].toUpperCase();
-                        return [parts[0], lastPart].join('-');
-                    } else {
-                        return localeKey;
-                    }
-
-                }
-
-                function momentFormatToDPFormat(momentFormat) {
-                    var resultFormat = momentFormat;
-
-                    function lowerCase(str) {
-                        return str.toLowerCase();
-                    }
-
-                    resultFormat = resultFormat.replace(/D{1,2}/, lowerCase);
-
-                    if (/MMM/.test(resultFormat)) {
-                        resultFormat = resultFormat.replace('MMM', 'M');
-                    } else {
-                        resultFormat = resultFormat.replace(/M{1,2}/, 'm');
-                    }
-
-                    resultFormat = resultFormat.replace(/Y{2,4}/, lowerCase);
-
-                    return resultFormat;
-                }
-            }
-        };
-    }
-];

awx/ui/client/src/system-tracking/date-picker/date-picker.partial.html

@@ -1,11 +0,0 @@
-<div class="DatePicker">
-    <button class="DatePicker-icon" ng-disabled="disabled"><i class="fa fa-calendar"></i></button>
-    <input
-        class="DatePicker-input"
-        type="text"
-        readonly
-        ng-model="dateValue"
-        ng-class="inputClass()"
-        ng-disabled="disabled">
-    <p class="error" ng-if="error">{{error}}</p>
-</div>

awx/ui/client/src/system-tracking/date-picker/main.js

@@ -1,12 +0,0 @@
-/*************************************************
- * Copyright (c) 2015 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-import datePicker from './date-picker.directive';
-
-export default
-    angular.module('systemTracking.datePicker',
-                    [])
-        .directive('datePicker', datePicker);

awx/ui/client/src/system-tracking/fact-data-table/fact-data-table.block.less

@@ -1,138 +0,0 @@
-/** @define FactDataTable */
-
-.FactDataTable {
-    &-row, &-headingRow, &-groupHeadingRow {
-        display: flex;
-    }
-
-    &-row {
-      padding: .5em 0;
-      align-items: center;
-      transition: background-color 100ms, border-color 100ms;
-      border: solid 1px @default-bg;
-
-      &:nth-child(even) {
-          background-color: @default-no-items-bord;
-      }
-
-      &:hover {
-        background-color: @default-list-header-bg;
-        border-color: @default-border;
-      }
-
-      &--flexible {
-          max-height: initial;
-          align-items: flex-start;
-      }
-
-    }
-
-    &-repeat {
-        &:nth-child(even) {
-            background-color: @default-no-items-bord;
-        }
-    }
-
-    &-headingRow {
-      background-color: @default-list-header-bg;
-      border: none;
-      padding: 8px 12px;
-
-      .FactDataTable-column.FactDataTableHeading:first-child {
-          padding-left: 0;
-      }
-    }
-
-    &-groupHeadingRow {
-        background-color: @default-icon-hov;
-        padding: 1em 12px;
-        color: @default-interface-txt;
-        font-size: 14px;
-    }
-
-    &-column {
-        padding: 8px;
-        flex: 1 0 33%;
-        align-self: flex-start;
-        padding: 0;
-        margin: 0;
-        overflow: hidden;
-        padding: 8px;
-        word-wrap: break-word;
-        &--offsetLeft {
-            margin-left: 33%;
-        }
-    }
-
-    &-columnArray {
-        display: flex;
-        flex-direction: column;
-    }
-
-    &-columnMember {
-        margin-bottom: 16px;
-        &:last-child {
-            margin-bottom: inherit;
-        }
-    }
-}
-
-.FactDataError {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 100%;
-    height: 200px;
-    border-radius: 5px;
-    border: 1px solid @list-no-items-bord;
-    background-color: @default-no-items-bord;
-    color: @list-no-items-txt;
-    text-transform: uppercase;
-}
-
-.FactDataGroup {
-    &-headings {
-        &:hover {
-            background-color: @default-bg;
-            border-color: transparent;
-        }
-    }
-    &-header {
-        padding: 0;
-    }
-}
-
-.FactDataTableHeading {
-    display: flex;
-    flex-wrap: wrap;
-    align-items: flex-end;
-    font-size: 14px;
-    color: @default-interface-txt;
-    text-transform: uppercase;
-
-    &-host {
-        margin: 0;
-    }
-    &-date {
-        flex-basis: auto;
-    }
-
-    // Override some global styling on h3 tags
-    h3 {
-        margin: 1em initial;
-    }
-}
-
-.FactDatum {
-    &--divergent {
-        //margin-bottom: 0.5rem;
-        background-color: @default-err;
-        border: none;
-        color: @default-bg;
-
-        &:hover {
-            background-color: @default-err;
-            border: none;
-        }
-    }
-}

awx/ui/client/src/system-tracking/fact-data-table/fact-data-table.directive.js

@@ -1,21 +0,0 @@
-/* jshint unused: vars */
-
-export default
-    [   'templateUrl',
-        function(templateUrl) {
-            return  {   restrict: 'E',
-                        templateUrl: templateUrl('system-tracking/fact-data-table/fact-data-table'),
-                        scope:
-                            {   leftHostname: '=',
-                                rightHostname: '=',
-                                leftScanDate: '=',
-                                rightScanDate: '=',
-                                leftDataNoScans: '=',
-                                rightDataNoScans: '=',
-                                isNestedDisplay: '=',
-                                singleResultView: '=',
-                                factData: '='
-                            }
-                    };
-        }
-    ];

awx/ui/client/src/system-tracking/fact-data-table/fact-data-table.partial.html

@@ -1,93 +0,0 @@
-<section class="FactDataTable SystemTrackingContainer-main" ng-if="!error">
-    <div class="alert alert-info" ng-if="singleResultView">
-        The selected fact scans were identical for this module. Showing all facts from the latest selected scan instead.
-    </div>
-    <div class="FactDataTable-headingRow">
-        <span class="FactDataTable-column FactDataTableHeading">
-          <span class="FactDataTableHeading-label">
-            Comparing facts from:
-          </span>
-      </span>
-        <span class="FactDataTable-column FactDataTableHeading">
-          <span ng-if="leftDataNoScans">
-              <span class="u-unbold">No scans for</span>
-              {{leftHostname}}
-              <span class="u-unbold">on</span>
-          </span>
-          <span class="FactDataTableHeading-host" ng-if="!leftDataNoScans">{{leftHostname}}&ensp;-&ensp;</span>
-          <span class="FactDataTableHeading-date" ng-if="!singleResultView"> {{leftScanDate|longDate}}</span>
-          <span class="FactDataTableHeading-date" ng-if="singleResultView"> {{rightScanDate|longDate}}</span>
-      </span>
-        <span class="FactDataTable-column FactDataTableHeading" ng-if="!singleResultView">
-          <span ng-if="rightDataNoScans">No scans for {{rightHostname}} on</span>
-          <span class="FactDataTableHeading-host" ng-if="!rightDataNoScans">{{rightHostname}}&ensp;-&ensp;</span>
-          <span class="FactDataTableHeading-date">{{rightScanDate|longDate}}</span>
-      </span>
-    </div>
-    <div ng-if="!isNestedDisplay">
-        <div class="FactDataTable-repeat" ng-repeat="group in factData | orderBy: 'displayKeyPath'">
-            <div class="FactDataTable-row FactDataTable-row--flexible" ng-if="group.containsValueArray">
-                <span class="FactDataTable-column">{{group.facts.keyName}}</span>
-                <span class="FactDataTable-column FactDataTable-columnArray">
-                    <span class="FactDataTable-columnMember u-wrappedText" ng-repeat="value in group.facts.value1" style="position: relative;">
-                        {{value}}
-                    </span>
-                </span>
-                <span class="FactDataTable-column FactDataTable-columnArray" ng-if="!singleResultView">
-                    <span class="FactDataTable-columnMember u-wrappedText" ng-repeat="value in group.facts.value2" style="position: relative;">
-                        {{value}}
-                    </span>
-                </span>
-            </div>
-            <div class="FactDataTable-row" ng-if="!group.containsValueArray">
-                <span class="FactDataTable-column">{{group.facts.keyName}}</span>
-                <span class="FactDataTable-column u-wrappedText" style="position: relative;">{{group.facts.value1}}</span>
-                <span class="FactDataTable-column u-wrappedText" ng-if="!singleResultView" style="position: relative;">{{group.facts.value2}}</span>
-            </div>
-        </div>
-    </div>
-    <div ng-if="isNestedDisplay">
-
-        <div class="FactDataTable-factGroup FactDataGroup" ng-repeat="group in factData | orderBy: 'displayKeyPath'">
-
-            <div class="FactDataTable-groupHeadingRow" ng-if="group.displayKeyPath">
-                <span class="FactDataTable-column FactDataTable-column--full FactDataGroup-header">
-                    {{group.displayKeyPath}}
-                </span>
-            </div>
-            <div class="FactDataGroup-facts" data-facts="{{group.facts}}">
-                <div class="FactDataTable-arrayGroup" ng-if="group.isFactArray" ng-repeat="arrayGroup in group.facts" data-array-group="{{arrayGroup}}">
-                    <div class="FactDataTable-row FactDatum" ng-class="{'FactDatum--divergent': fact.isDivergent }" ng-repeat="fact in arrayGroup" data-fact="{{fact}}">
-                        <span class="FactDatum-keyName FactDataTable-column" ng-if="!fact.isArrayMember">
-                        {{fact.keyName}}
-                        </span>
-                        <span class="FactDatum-keyName FactDataTable-column u-wrappedText" ng-if="fact.isArrayMember">
-                          {{fact.keyPath[0]}}.{{fact.keyName}}
-                        </span>
-                        <span class="FactDatum-value FactDataTable-column u-wrappedText" style="position: relative;">
-                        {{fact.value1}}
-                        </span>
-                        <span class="FactDatum-value FactDataTable-column u-wrappedText" ng-if="!singleResultView" style="position: relative;">
-                        {{fact.value2}}
-                        </span>
-                    </div>
-                </div>
-                <div class="FactDataTable-row FactDatum" ng-class="{'FactDatum--divergent': fact.isDivergent }" ng-repeat="fact in group.facts" ng-unless="group.isFactArray" data-fact="{{fact}}">
-                    <span class="FactDataTable-column FactDatum-keyName" ng-if="!fact.isArrayMember">
-                    {{fact.keyName}}
-                    </span>
-                    <span class="FactDataTable-column FactDatum-keyName" ng-if="fact.isArrayMember">
-                      {{fact.keyPath[0]}}.{{fact.keyName}}
-                    </span>
-                    <span class="FactDataTable-column FactDatum-value u-wrappedText" style="position: relative;">
-                    {{fact.value1}}
-                    </span>
-                    <span class="FactDataTable-column FactDatum-value u-wrappedText" ng-if="!singleResultView" style="position: relative;">
-                    {{fact.value2}}
-                    </span>
-                </div>
-            </div>
-        </div>
-    </div>
-
-</section>

awx/ui/client/src/system-tracking/fact-data-table/main.js

@@ -1,5 +0,0 @@
-import factDataTable from './fact-data-table.directive';
-
-export default
-    angular.module('systemTracking.factDataTable', [])
-        .directive('factDataTable', factDataTable);

awx/ui/client/src/system-tracking/fact-module-filter.block.less

@@ -1,54 +0,0 @@
-/** @define FactModuleFilter */
-
-.FactModuleFilter {
-    width: 100%;
-    display: flex;
-    flex-flow: row wrap;
-    margin-bottom: 2.8rem;
-
-    .btn, .btn-default {
-        margin-right: 20px;
-        width: 10rem;
-    }
-
-    &-module {
-
-        background-color: @enabled-item-background;
-        border-color: @default-icon-hov;
-        color: @default-interface-txt;
-
-        @media screen and (max-width: 750px) {
-            flex-basis: 50%;
-        }
-        &:active, &:focus {
-            // copied from bootstrap's .btn:focus
-            background-color: @default-icon-hov;
-            border-color: @enabled-item-border;
-            color: @enabled-item-text;
-            box-shadow: none;
-            z-index: 2;
-        }
-
-        &:hover {
-            border-color: @default-icon-hov;
-        }
-    }
-
-    &-module.is-active {
-        cursor: default;
-
-        z-index: 2;
-
-        background-color: @default-icon;
-        color: @default-bg;
-        border-color: @default-icon;
-
-        &:active, &:focus {
-            box-shadow: none;
-        }
-
-        &:hover {
-            background-color: @default-interface-txt;
-        }
-    }
-}

awx/ui/client/src/system-tracking/fact-module-pickers.block.less

@@ -1,16 +0,0 @@
-.FactModulePickers-label {
-    padding-right: 0;
-    text-align: right;
-    font-size: 11px;
-    text-transform: uppercase;
-    color: @default-interface-txt;
-    line-height: 17px;
-}
-
-.FactModulePickers-warning {
-    float: right;
-    clear: both;
-    font-size: 12px;
-    width: 75%;
-    text-align: right;
-}

awx/ui/client/src/system-tracking/format-facts.js

@@ -1,13 +0,0 @@
-export function formatFactForDisplay(fact, renderOptions) {
-
-    var factTemplate = renderOptions.factTemplate;
-
-    var template = factTemplate;
-
-    // if (!renderOptions.supportsValueArray) {
-    //     comparatorFact = comparatorFact[0];
-    // }
-
-    return template.render(fact);
-
-}

awx/ui/client/src/system-tracking/main.js

@@ -1,27 +0,0 @@
-/*************************************************
- * Copyright (c) 2015 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-import route from './system-tracking.route';
-import controller from './system-tracking.controller';
-import shared from '../shared/main';
-import utilities from '../shared/Utilities';
-
-import datePicker from './date-picker/main';
-import dataServices from './data-services/main';
-import factDataTable from './fact-data-table/main';
-
-export default
-    angular.module('systemTracking',
-                   [   utilities.name,
-                       shared.name,
-                       datePicker.name,
-                       factDataTable.name,
-                       dataServices.name
-                   ])
-        .controller('systemTracking', controller)
-        .run(['$stateExtender', function($stateExtender) {
-            $stateExtender.addState(route);
-        }]);

awx/ui/client/src/system-tracking/search-date-range.js

@@ -1,28 +0,0 @@
-/*************************************************
- * Copyright (c) 2015 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-import moment from '../shared/moment/moment';
-
-export function searchDateRange(dateString) {
-    var date;
-
-    switch(dateString) {
-        case 'yesterday':
-            date = moment().subtract(1, 'day');
-            break;
-        case 'tomorrow':
-            date = moment().add(1, 'day');
-            break;
-        default:
-            date = moment(dateString);
-    }
-
-
-    return {
-        from: date.clone().startOf('day'),
-        to: date.clone().add(1, 'day').startOf('day')
-    };
-}

awx/ui/client/src/system-tracking/system-tracking-container.block.less

@@ -1,37 +0,0 @@
-.SystemTrackingContainer {
-    display: flex;
-    flex-direction: column;
-    min-height: 85vh;
-    > * {
-        flex: 0 0 auto;
-    }
-
-    &-main {
-        flex: 1 0 auto;
-        align-self: stretch;
-    }
-
-    .DatePicker {
-        flex: none;
-    }
-
-    .DatePicker-input {
-        width: 100%;
-        flex: none;
-        background: @fcgrey;
-    }
-
-    .DatePicker-icon {
-        i {
-            color: @default-icon;
-        }
-    }
-
-    .SystemTrackingContainer-main {
-        margin-top: 20px;
-    }
-
-    .FactDatum--divergent {
-        background-color: @default-err;
-    }
-}

awx/ui/client/src/system-tracking/system-tracking.controller.js

@@ -1,336 +0,0 @@
-/*************************************************
- * Copyright (c) 2015 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-import {searchDateRange} from './search-date-range';
-import {compareFacts} from './compare-facts/main';
-import {formatFactForDisplay} from './format-facts';
-import FactTemplate from './compare-facts/fact-template';
-
-function controller($scope,
-                    $stateParams,
-                    $location,
-                    $q,
-                    $state,
-                    moduleOptions,
-                    inventory,
-                    hosts,
-                    getDataForComparison,
-                    waitIndicator,
-                    moment,
-                    _) {
-
-    // var inventoryId = $stateParams.id;
-    var hostIds = $stateParams.hostIds.split(',');
-    var moduleParam = $stateParams.module || 'packages';
-
-    $scope.compareMode =
-        hostIds.length === 1 ? 'single-host' : 'host-to-host';
-    $scope.hostIds = $stateParams.hosts;
-    $scope.inventory = inventory;
-    $scope.noModuleData = false;
-
-    // this means no scans have been run
-    if (_.isEmpty(moduleOptions)) {
-        $scope.noModuleData = true;
-        return;
-    }
-
-    if ($scope.compareMode === 'host-to-host') {
-        $scope.factModulePickersLabelLeft = "Compare latest facts collected across both hosts on or before";
-    } else {
-        $scope.factModulePickersLabelLeft = "Compare latest facts collected on or before";
-        $scope.factModulePickersLabelRight = "To latest facts collected on or before";
-    }
-
-    $scope.modules = _.clone(moduleOptions, true);
-
-    var leftSearchRange = searchDateRange();
-    var rightSearchRange = searchDateRange();
-
-    var searchConfig =
-        {   leftRange: leftSearchRange,
-            rightRange: rightSearchRange
-        };
-
-    $scope.leftDate = leftSearchRange.from;
-    $scope.rightDate = rightSearchRange.from;
-
-    $scope.leftHostname = hosts[0].name;
-    $scope.rightHostname = hosts.length > 1 ? hosts[1].name : hosts[0].name;
-
-    function reloadData(params) {
-
-        searchConfig = _.assign({}, searchConfig, params);
-
-        var leftRange = searchConfig.leftRange;
-        var rightRange = searchConfig.rightRange;
-        var activeModule = searchConfig.module;
-
-        if ($scope.compareMode === 'host-to-host') {
-            rightRange = searchConfig.leftRange;
-        }
-
-        $scope.leftDataNoScans = false;
-        $scope.rightDataNoScans = false;
-        $scope.leftDateWarning = false;
-        $scope.rightDateWarning = false;
-
-        $scope.singleFactOnly = false;
-
-        waitIndicator('start');
-
-        return getDataForComparison(
-                            hostIds,
-                            activeModule.name,
-                            leftRange,
-                            rightRange)
-                .then(function(responses) {
-                    var data = [];
-                    _.each(responses, function(response) {
-                        if(response.fact) {
-                            data.push(response.fact);
-                        } else if (response.facts) {
-                            data.push(response.facts);
-                        }
-                    });
-
-                    if (_.isEmpty(data[0]) && _.isEmpty(data[1])) {
-                        return _.reject({
-                                name: 'NoScanData',
-                                message: 'There was insufficient scan data for the date you selected. Please try selecting a different date or module.',
-                                dateValues:
-                                    {   leftDate: $scope.leftDate.clone(),
-                                        rightDate: $scope.rightDate.clone()
-                                    }
-                            });
-                    }
-                    if (_.isEmpty(data[0])) {
-                        $scope.leftDataNoScans = true;
-                        $scope.leftScanDate = $scope.leftDate;
-                    } else {
-                        $scope.leftScanDate = moment(responses[0].timestamp);
-
-                        if (!$scope.leftScanDate.isSame($scope.leftDate, 'd')) {
-                            $scope.leftDateWarning = true;
-                        }
-                    }
-
-                    if (_.isEmpty(data[1])) {
-                        $scope.rightDataNoScans = true;
-                        $scope.rightScanDate = $scope.rightDate;
-                    } else {
-                        $scope.rightScanDate = moment(responses[1].timestamp);
-
-                        if (!$scope.rightScanDate.isSame($scope.rightDate, 'd')) {
-                            $scope.rightDateWarning = true;
-                        }
-                    }
-
-                    return data;
-                })
-
-                .then(function(facts) {
-                    // Make sure we always start comparison against
-                    // a non-empty array
-                    //
-                    // Partition with _.isEmpty will give me an array
-                    // with empty arrays in index 0, and non-empty
-                    // arrays in index 1
-                    //
-
-                    var wrappedFacts =
-                        facts.map(function(facts, index) {
-                            return {    position: index === 0 ? 'left' : 'right',
-                                        isEmpty: _.isEmpty(facts),
-                                        facts: facts
-                                   };
-                        });
-
-                    var splitFacts = _.partition(facts, 'isEmpty');
-                    var emptyScans = splitFacts[0];
-                    var nonEmptyScans = splitFacts[1];
-                    var result;
-
-                    if (_.isEmpty(nonEmptyScans)) {
-                        // we have NO data, throw an error
-                        result = _.reject({
-                            name: 'NoScanData',
-                            message: 'No scans ran on either of the dates you selected. Please try selecting different dates.',
-                            dateValues:
-                                {   leftDate: $scope.leftDate.clone(),
-                                    rightDate: $scope.rightDate.clone()
-                                }
-                        });
-                    } else if (nonEmptyScans.length === 1) {
-                        // one of them is not empty, throw an error
-                        result = _.reject({
-                            name: 'InsufficientScanData',
-                            message: 'No scans ran on one of the selected dates. Please try selecting a different date.',
-                            dateValue: emptyScans[0].position === 'left' ? $scope.leftDate.clone() : $scope.rightDate.clone()
-                        });
-                    } else {
-                        result = _.promise(wrappedFacts);
-                    }
-
-                    // all scans have data, rejoice!
-                    return result;
-
-                })
-                .then(_.partial(compareFacts, activeModule))
-                .then(function(info) {
-
-                    // Clear out any errors from the previous run...
-                    $scope.error = null;
-
-                    if (_.isEmpty(info.factData)) {
-
-                        if ($scope.compareMode === 'host-to-host') {
-                            info = _.reject({
-                                name: 'NoScanDifferences',
-                                message: 'No differences in the scans on the dates you selected. Please try selecting different dates.',
-                                dateValues:
-                                    {   leftDate: $scope.leftDate.clone(),
-                                        rightDate: $scope.rightDate.clone()
-                                    }
-                            });
-                        } else {
-                            $scope.singleFactOnly = true;
-                            $scope.factData = info.leftData.map(function(fact) {
-                                var keyNameMap = activeModule.keyNameMap;
-                                var nameKey = activeModule.nameKey;
-                                var renderOptions = _.merge({}, activeModule);
-                                var isNestedDisplay = false;
-                                var facts;
-
-                                if (_.isObject(renderOptions.factTemplate) &&
-                                        _.isArray(renderOptions.compareKey)) {
-
-                                    isNestedDisplay = true;
-
-                                    var templates = _.mapValues(renderOptions.factTemplate, function(template, key) {
-                                        if (template === true) {
-                                            return  {   render: function(fact) {
-                                                            return fact[key];
-                                                        }
-                                                    };
-                                        } else {
-                                            return new FactTemplate(template);
-                                        }
-                                    });
-
-                                    facts = _.map(templates, function(template, key) {
-                                        var keyName = key;
-
-                                        if (_.isObject(keyNameMap) && keyNameMap.hasOwnProperty(key)) {
-                                            keyName = keyNameMap[key];
-                                        }
-
-                                        renderOptions.factTemplate = template;
-                                        var formattedValue = formatFactForDisplay(fact, renderOptions);
-                                        return {   keyName: keyName,
-                                                    isNestedDisplay: true,
-                                                    value1: formattedValue
-                                                };
-                                    });
-
-
-                                } else {
-                                    renderOptions.factTemplate = new FactTemplate(renderOptions.factTemplate);
-                                    var formattedValue = formatFactForDisplay(fact, renderOptions);
-                                    isNestedDisplay = false;
-                                    facts = {   keyName: fact[nameKey],
-                                                value1: formattedValue
-                                            };
-                                }
-
-                                $scope.isNestedDisplay = isNestedDisplay;
-
-                                return {    displayKeyPath: fact[renderOptions.nameKey],
-                                            nestingLevel: 0,
-                                            containsValueArray: false,
-                                            facts: facts
-                                       };
-                            });
-                        }
-                    } else {
-                        $scope.singleFactOnly = false;
-                        $scope.factData =  info.factData;
-                        $scope.isNestedDisplay = info.isNestedDisplay;
-                    }
-                    return info;
-
-                }).catch(function(error) {
-                    $scope.error = error;
-                }).finally(function() {
-                    waitIndicator('stop');
-                });
-    }
-
-    $scope.setActiveModule = function(newModuleName, initialData) {
-        var newModule = _.find($scope.modules, function(module) {
-            return module.name === newModuleName;
-        });
-
-        if (newModule) {
-            if (newModule.isActive) {
-                return;
-            }
-            $scope.modules.forEach(function(module) {
-                module.isActive = false;
-            });
-
-            newModule.isActive = true;
-
-            $location.replace();
-            $location.search('module', newModuleName);
-
-            reloadData({   module: newModule
-                       }, initialData).value();
-        }
-    };
-
-    function dateWatcher(dateProperty) {
-        return function(newValue, oldValue) {
-                // passing in `true` for the 3rd param to $watch should make
-                // angular use `angular.equals` for comparing these values;
-                // the watcher should not fire, but it still is. Therefore,
-                // using `moment.isSame` to keep from reloading data when the
-                // dates did not actually change
-                if (newValue.isSame(oldValue)) {
-                    return;
-                }
-
-                var newDate = searchDateRange(newValue);
-
-                var params = {};
-                params[dateProperty] = newDate;
-
-                reloadData(params).value();
-            };
-    }
-
-    $scope.$watch('leftDate', dateWatcher('leftRange'), true);
-
-    $scope.$watch('rightDate', dateWatcher('rightRange'), true);
-
-    $scope.setActiveModule(moduleParam);
-}
-
-export default
-    [   '$scope',
-        '$stateParams',
-        '$location',
-        '$q',
-        '$state',
-        'moduleOptions',
-        'inventory',
-        'hosts',
-        'getDataForComparison',
-        'Wait',
-        'moment',
-        'lodashAsPromised',
-        controller
-    ];

awx/ui/client/src/system-tracking/system-tracking.partial.html

@@ -1,66 +0,0 @@
-<section class="SystemTrackingContainer Panel" ng-if="noModuleData">
-    <section class="FactDataError SystemTrackingContainer-main">
-        <p class="FactDataError-note--full">
-            To set up scan jobs, create a <a ui-sref="inventoryJobTemplateAdd({inventory_id: inventory.id})">job template</a> that targets the "<a ui-sref="inventories.edit({inventory_id: inventory.id})">{{inventory.name}}</a>" inventory and check "Store Ansible Facts."
-        </p>
-    </section>
-</section>
-<section class="SystemTrackingContainer Panel" ng-hide="noModuleData">
-    <div class="row">
-        <div class="Form-title ng-binding col-md-3">SYSTEM TRACKING <div class="List-titleLockup"></div>{{inventory.name}}</div>
-        <div class="FactModulePickers row col-md-8 col-md-offset-1">
-            <div class="row">
-                <div class="FactModulePickers-dateContainer FactModulePickers-dateContainer--left col-md-6">
-                    <span class="FactModulePickers-label col-md-6">{{ factModulePickersLabelLeft }}</span>
-                    <date-picker date="leftDate" input-class='{ "u-input-info-alert": leftDateWarning }' class="col-md-5">
-                    </date-picker>
-                    <span class="FactModulePickers-warning" ng-class='{ "u-hiddenVisually": !leftDateWarning, "u-info-alert": leftDateWarning }'>
-                            There were no fact scans on this date, using a prior scan instead.
-                        </span>
-                </div>
-                <div class="FactModulePickers-dateContainer FactModulePickers-dateContainer--right col-md-6" ng-show="compareMode == 'single-host'">
-                    <span class="FactModulePickers-label col-md-6">{{ factModulePickersLabelRight }}</span>
-                    <date-picker date="rightDate" min-date="leftDate" input-class='{ "u-input-info-alert": rightDateWarning }' class="col-md-5">
-                    </date-picker>
-                    <span class="FactModulePickers-warning" ng-class='{ "u-hiddenVisually": !rightDateWarning, "u-info-alert": rightDateWarning }'>
-                                There were no fact scans on this date, using a prior scan instead.
-                            </span>
-                </div>
-            </div>
-        </div>
-    </div>
-    </div>
-
-    <nav class="FactModuleFilter">
-        <button ng-class="{  'btn': true,
-                         'btn-default': true,
-                         'FactModuleFilter-module': true,
-                         'is-active': module.isActive,
-                      }" ng-click="setActiveModule(module.name)" ng-repeat="module in modules | orderBy: 'sortKey' track by $index">
-            {{module.displayName}}
-        </button>
-    </nav>
-
-    <section class="FactDataError SystemTrackingContainer-main" ng-if="error" ng-switch="error.name">
-        <p class="FactDataError-message" ng-switch-when="NoScanData">
-            <span ng-if="compareMode == 'single-host'">
-                There was insufficient scan data for one or both of the dates you selected. Please try selecting a different date or module.
-            </span>
-            <span ng-if="compareMode == 'host-to-host'">
-                There was insufficient scan data for the date you selected. Please try selecting a different date or module.
-            </span>
-        </p>
-        <p class="FactDataError-message" ng-switch-when="InsufficientScanData">
-            There were no facts collected on or before one of the dates you selected ({{error.dateValue|amDateFormat:'L'}}). Please select a different date and try again.
-        </p>
-        <p class="FactDataError-message" ng-switch-when="NoScanDifferences">
-            The two fact scans were identical for this module.
-        </p>
-        <p class="FactDataError-note" ng-switch-default>
-            We were not able to find any facts collected for this inventory or module. To setup or run scan jobs, edit the "<a link-to="inventoryEdit" model="{ inventory_id: inventory }">{{inventory.name}}</a>" inventory and check "Store Ansible Facts."
-        </p>
-    </section>
-    <fact-data-table ng-if="!error" left-hostname="leftHostname" right-hostname="rightHostname" left-scan-date="leftScanDate" right-scan-date="rightScanDate" left-data-no-scans="leftDataNoScans" right-data-no-scans="rightDataNoScans" is-nested-display="isNestedDisplay"
-        single-result-view="singleFactOnly" fact-data="factData">
-    </fact-data-table>
-</section>

awx/ui/client/src/system-tracking/system-tracking.route.js

@@ -1,108 +0,0 @@
-/*************************************************
- * Copyright (c) 2015 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-import {templateUrl} from '../shared/template-url/template-url.factory';
-import { N_ } from '../i18n';
-
-export default {
-    name: 'systemTracking',
-    route: '/inventories/:inventoryId/system-tracking/:hostIds',
-    controller: 'systemTracking',
-    templateUrl: templateUrl('system-tracking/system-tracking'),
-    params: {hosts: null, inventory: null},
-    reloadOnSearch: false,
-    ncyBreadcrumb: {
-        label: N_("SYSTEM TRACKING")
-    },
-    resolve: {
-            moduleOptions:
-                [   'getModuleOptions',
-                    'ProcessErrors',
-                    '$stateParams',
-                    function(getModuleOptions, ProcessErrors, $stateParams) {
-
-                    var hostIds = $stateParams.hostIds.split(',');
-
-                    var data =
-                        getModuleOptions(hostIds[0])
-                            .catch(function (response) {
-                                ProcessErrors(null, response.data, response.status, null, {
-                                    hdr: 'Error!',
-                                    msg: 'Failed to get license info. GET returned status: ' +
-                                    response.status
-                                });
-                            })
-                            .value();
-
-                    return data;
-
-                    }
-                ],
-            inventory:
-            [   '$stateParams',
-                '$q',
-                'Rest',
-                'GetBasePath',
-                'ProcessErrors',
-                function($stateParams, $q, rest, getBasePath, ProcessErrors) {
-
-                    if ($stateParams.inventory) {
-                        return $q.when($stateParams.inventory);
-                    }
-
-                    var inventoryId = $stateParams.inventoryId;
-
-                    var url = getBasePath('inventory') + inventoryId + '/';
-                    rest.setUrl(url);
-                    return rest.get()
-                            .then(function(data) {
-                                return data.data;
-                            }).catch(function (response) {
-                ProcessErrors(null, response.data, response.status, null, {
-                    hdr: 'Error!',
-                    msg: 'Failed to get license info. GET returned status: ' +
-                    response.status
-                });
-            });
-                }
-            ],
-            hosts:
-            [   '$stateParams',
-                '$q',
-                'Rest',
-                'GetBasePath',
-                'ProcessErrors',
-                function($stateParams, $q, rest, getBasePath, ProcessErrors) {
-                    if ($stateParams.hosts) {
-                        return $q.when($stateParams.hosts);
-                    }
-
-                    var hostIds = $stateParams.hostIds.split(',');
-
-                    var hosts =
-                        hostIds.map(function(hostId) {
-                            var url = getBasePath('hosts') +
-                                hostId + '/';
-
-                            rest.setUrl(url);
-                            return rest.get()
-                                    .then(function(data) {
-                                        return data.data;
-                                    }).catch(function (response) {
-                ProcessErrors(null, response.data, response.status, null, {
-                    hdr: 'Error!',
-                    msg: 'Failed to get license info. GET returned status: ' +
-                    response.status
-                });
-            });
-                        });
-
-                    return $q.all(hosts);
-                }
-
-            ]
-    }
-};

awx/ui/client/src/templates/job_templates/job-template.form.js

@@ -245,7 +245,7 @@ function(NotificationsList, i18n) {
                     dataTitle: i18n._('Ansible Environment'),
                     dataContainer: 'body',
                     dataPlacement: 'right',
-                    ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAdd)',
+                    ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)',
                     ngShow: 'custom_virtualenvs_options.length > 1'
                 },
                 instance_groups: {

awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.block.less

@@ -102,13 +102,6 @@
     width: 90px;
     color: @default-interface-txt;
 }
-.WorkflowChart-conflictIcon {
-    color: @default-err;
-}
-.WorkflowChart-conflictText {
-    width: 90px;
-    color: @default-interface-txt;
-}
 .WorkflowChart-activeNode {
     fill: @default-link;
 }

awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.directive.js

@@ -327,16 +327,6 @@ export default ['$state','moment', '$timeout', '$window', '$filter', 'Rest', 'Ge
                                     return (d.unifiedJobTemplate && d.unifiedJobTemplate.name) ? d.unifiedJobTemplate.name : "";
                                 }).each(wrap);
 
-                            thisNode.append("foreignObject")
-                                 .attr("x", 54)
-                                 .attr("y", 45)
-                                 .style("font-size","0.7em")
-                                 .attr("class", "WorkflowChart-conflictText")
-                                 .html(function () {
-                                     return `<span class=\"WorkflowChart-conflictIcon\">\uf06a</span><span> ${TemplatesStrings.get('workflow_maker.EDGE_CONFLICT')}</span>`;
-                                 })
-                                 .style("display", function(d) { return (d.edgeConflict && !d.placeholder) ? null : "none"; });
-
                             thisNode.append("foreignObject")
                                 .attr("x", 62)
                                 .attr("y", 22)
@@ -831,9 +821,6 @@ export default ['$state','moment', '$timeout', '$window', '$filter', 'Rest', 'Ge
                     t.selectAll(".WorkflowChart-deletedText")
                         .style("display", function(d){ return d.unifiedJobTemplate || d.placeholder ? "none" : null; });
 
-                    t.selectAll(".WorkflowChart-conflictText")
-                        .style("display", function(d) { return (d.edgeConflict && !d.placeholder) ? null : "none"; });
-
                     t.selectAll(".WorkflowChart-activeNode")
                         .style("display", function(d) { return d.isActiveEdit ? null : "none"; });
 

awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js

@@ -4,13 +4,12 @@
  * All Rights Reserved
  *************************************************/
 
-export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
-    '$state', 'ProcessErrors', 'CreateSelect2', '$q', 'JobTemplateModel',
+export default ['$scope', 'WorkflowService', 'TemplatesService',
+    'ProcessErrors', 'CreateSelect2', '$q', 'JobTemplateModel',
     'Empty', 'PromptService', 'Rest', 'TemplatesStrings', '$timeout',
-    'i18n',
-    function($scope, WorkflowService, GetBasePath, TemplatesService,
-    $state, ProcessErrors, CreateSelect2, $q, JobTemplate,
-    Empty, PromptService, Rest, TemplatesStrings, $timeout, i18n) {
+    function ($scope, WorkflowService, TemplatesService,
+        ProcessErrors, CreateSelect2, $q, JobTemplate,
+        Empty, PromptService, Rest, TemplatesStrings, $timeout) {
 
         let promptWatcher, surveyQuestionWatcher, credentialsWatcher;
 
@@ -31,24 +30,7 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
             value: "check"
         }];
 
-        $scope.edgeFlags = {
-             conflict: false
-         };
-
-         $scope.edgeTypeOptions = [
-             {
-                 label: $scope.strings.get('workflow_maker.ALWAYS'),
-                 value: 'always'
-             },
-             {
-                 label: $scope.strings.get('workflow_maker.ON_SUCCESS'),
-                 value: 'success'
-             },
-             {
-                 label: $scope.strings.get('workflow_maker.ON_FAILURE'),
-                 value: 'failure'
-             }
-         ];
+        $scope.edgeTypeOptions = createEdgeTypeOptions();
 
         let editRequests = [];
         let associateRequests = [];
@@ -59,6 +41,22 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
         $scope.toggleKey = () => $scope.showKey = !$scope.showKey;
         $scope.keyClassList = `{ 'Key-menuIcon--active': showKey }`;
 
+        function createEdgeTypeOptions() {
+            return ([{
+                    label: $scope.strings.get('workflow_maker.ALWAYS'),
+                    value: 'always'
+                },
+                {
+                    label: $scope.strings.get('workflow_maker.ON_SUCCESS'),
+                    value: 'success'
+                },
+                {
+                    label: $scope.strings.get('workflow_maker.ON_FAILURE'),
+                    value: 'failure'
+                }
+            ]);
+        }
+
         function resetNodeForm() {
             $scope.workflowMakerFormConfig.nodeMode = "idle";
             delete $scope.selectedTemplate;
@@ -74,7 +72,7 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
             // params.parentId
             // params.node
 
-            let buildSendableNodeData = function() {
+            let buildSendableNodeData = function () {
                 // Create the node
                 let sendableNodeData = {
                     unified_job_template: params.node.unifiedJobTemplate.id,
@@ -122,7 +120,7 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
                 return sendableNodeData;
             };
 
-            let continueRecursing = function(parentId) {
+            let continueRecursing = function (parentId) {
                 $scope.totalIteratedNodes++;
 
                 if ($scope.totalIteratedNodes === $scope.treeData.data.totalNodes) {
@@ -130,7 +128,7 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
                     completionCallback();
                 } else {
                     if (params.node.children && params.node.children.length > 0) {
-                        _.forEach(params.node.children, function(child) {
+                        _.forEach(params.node.children, function (child) {
                             if (child.edgeType === "success") {
                                 recursiveNodeUpdates({
                                     parentId: parentId,
@@ -155,49 +153,51 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
             if (params.node.isNew) {
 
                 TemplatesService.addWorkflowNode({
-                    url: $scope.treeData.workflow_job_template_obj.related.workflow_nodes,
-                    data: buildSendableNodeData()
-                })
-                .then(function(data) {
+                        url: $scope.treeData.workflow_job_template_obj.related.workflow_nodes,
+                        data: buildSendableNodeData()
+                    })
+                    .then(function (data) {
 
-                    if (!params.node.isRoot) {
-                        associateRequests.push({
-                            parentId: params.parentId,
-                            nodeId: data.data.id,
-                            edge: params.node.edgeType
+                        if (!params.node.isRoot) {
+                            associateRequests.push({
+                                parentId: params.parentId,
+                                nodeId: data.data.id,
+                                edge: params.node.edgeType
+                            });
+                        }
+
+                        if (_.get(params, 'node.promptData.launchConf.ask_credential_on_launch')) {
+                            // This finds the credentials that were selected in the prompt but don't occur
+                            // in the template defaults
+                            let credentialsToPost = params.node.promptData.prompts.credentials.value.filter(function (credFromPrompt) {
+                                let defaultCreds = _.get(params, 'node.promptData.launchConf.defaults.credentials', []);
+                                return !defaultCreds.some(function (defaultCred) {
+                                    return credFromPrompt.id === defaultCred.id;
+                                });
+                            });
+
+                            credentialsToPost.forEach((credentialToPost) => {
+                                credentialRequests.push({
+                                    id: data.data.id,
+                                    data: {
+                                        id: credentialToPost.id
+                                    }
+                                });
+                            });
+                        }
+
+                        params.node.isNew = false;
+                        continueRecursing(data.data.id);
+                    }, function ({ data, config, status }) {
+                        ProcessErrors($scope, data, status, null, {
+                            hdr: $scope.strings.get('error.HEADER'),
+                            msg: $scope.strings.get('error.CALL', {
+                                path: `${config.url}`,
+                                action: `${config.method}`,
+                                status
+                            })
                         });
-                    }
-
-                    if (_.get(params, 'node.promptData.launchConf.ask_credential_on_launch')){
-                         // This finds the credentials that were selected in the prompt but don't occur
-                         // in the template defaults
-                         let credentialsToPost = params.node.promptData.prompts.credentials.value.filter(function(credFromPrompt) {
-                             let defaultCreds = params.node.promptData.launchConf.defaults.credentials ? params.node.promptData.launchConf.defaults.credentials : [];
-                             return !defaultCreds.some(function(defaultCred) {
-                                 return credFromPrompt.id === defaultCred.id;
-                             });
-                         });
-
-                         credentialsToPost.forEach((credentialToPost) => {
-                             credentialRequests.push({
-                                 id: data.data.id,
-                                 data: {
-                                     id: credentialToPost.id
-                                 }
-                             });
-                         });
-                     }
-
-                    params.node.isNew = false;
-                    continueRecursing(data.data.id);
-                }, function(error) {
-                    ProcessErrors($scope, error.data, error.status, null, {
-                        hdr: 'Error!',
-                        msg: 'Failed to add workflow node. ' +
-                        'POST returned status: ' +
-                        error.status
                     });
-                });
             } else {
                 if (params.node.edited || !params.node.originalParentId || (params.node.originalParentId && params.parentId !== params.node.originalParentId)) {
 
@@ -208,56 +208,56 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
                             data: buildSendableNodeData()
                         });
 
-                        if (_.get(params, 'node.promptData.launchConf.ask_credential_on_launch')){
-                             let credentialsNotInPriorCredentials = params.node.promptData.prompts.credentials.value.filter(function(credFromPrompt) {
-                                 let defaultCreds = params.node.promptData.launchConf.defaults.credentials ? params.node.promptData.launchConf.defaults.credentials : [];
-                                 return !defaultCreds.some(function(defaultCred) {
-                                     return credFromPrompt.id === defaultCred.id;
-                                 });
-                             });
+                        if (_.get(params, 'node.promptData.launchConf.ask_credential_on_launch')) {
+                            let credentialsNotInPriorCredentials = params.node.promptData.prompts.credentials.value.filter(function (credFromPrompt) {
+                                let defaultCreds = _.get(params, 'node.promptData.launchConf.defaults.credentials', []);
+                                return !defaultCreds.some(function (defaultCred) {
+                                    return credFromPrompt.id === defaultCred.id;
+                                });
+                            });
 
-                             let credentialsToAdd = credentialsNotInPriorCredentials.filter(function(credNotInPrior) {
-                                 let previousOverrides = params.node.promptData.prompts.credentials.previousOverrides ? params.node.promptData.prompts.credentials.previousOverrides : [];
-                                 return !previousOverrides.some(function(priorCred) {
-                                     return credNotInPrior.id === priorCred.id;
-                                 });
-                             });
+                            let credentialsToAdd = credentialsNotInPriorCredentials.filter(function (credNotInPrior) {
+                                let previousOverrides = _.get(params, 'node.promptData.prompts.credentials.previousOverrides', []);
+                                return !previousOverrides.some(function (priorCred) {
+                                    return credNotInPrior.id === priorCred.id;
+                                });
+                            });
 
-                             let credentialsToRemove = [];
+                            let credentialsToRemove = [];
 
-                             if (_.has(params, 'node.promptData.prompts.credentials.previousOverrides')) {
-                                 credentialsToRemove = params.node.promptData.prompts.credentials.previousOverrides.filter(function(priorCred) {
-                                     return !credentialsNotInPriorCredentials.some(function(credNotInPrior) {
-                                         return priorCred.id === credNotInPrior.id;
-                                     });
-                                 });
-                             }
+                            if (_.has(params, 'node.promptData.prompts.credentials.previousOverrides')) {
+                                credentialsToRemove = params.node.promptData.prompts.credentials.previousOverrides.filter(function (priorCred) {
+                                    return !credentialsNotInPriorCredentials.some(function (credNotInPrior) {
+                                        return priorCred.id === credNotInPrior.id;
+                                    });
+                                });
+                            }
 
-                             credentialsToAdd.forEach((credentialToAdd) => {
-                                 credentialRequests.push({
-                                     id: params.node.nodeId,
-                                     data: {
-                                         id: credentialToAdd.id
-                                     }
-                                 });
-                             });
+                            credentialsToAdd.forEach((credentialToAdd) => {
+                                credentialRequests.push({
+                                    id: params.node.nodeId,
+                                    data: {
+                                        id: credentialToAdd.id
+                                    }
+                                });
+                            });
 
-                             credentialsToRemove.forEach((credentialToRemove) => {
-                                 credentialRequests.push({
-                                     id: params.node.nodeId,
-                                     data: {
-                                         id: credentialToRemove.id,
-                                         disassociate: true
-                                     }
-                                 });
-                             });
-                         }
+                            credentialsToRemove.forEach((credentialToRemove) => {
+                                credentialRequests.push({
+                                    id: params.node.nodeId,
+                                    data: {
+                                        id: credentialToRemove.id,
+                                        disassociate: true
+                                    }
+                                });
+                            });
+                        }
                     }
 
                     if (params.node.originalParentId && (params.parentId !== params.node.originalParentId || params.node.originalEdge !== params.node.edgeType)) {
                         let parentIsDeleted = false;
 
-                        _.forEach($scope.treeData.data.deletedNodes, function(deletedNode) {
+                        _.forEach($scope.treeData.data.deletedNodes, function (deletedNode) {
                             if (deletedNode === params.node.originalParentId) {
                                 parentIsDeleted = true;
                             }
@@ -297,44 +297,15 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
             }
         }
 
-        let updateEdgeDropdownOptions = (optionsToInclude) => {
-            // Not passing optionsToInclude will include all by default
-            if (!optionsToInclude) {
-                $scope.edgeTypeOptions = [
-                    {
-                        label: i18n._('Always'),
-                        value: 'always'
-                    },
-                    {
-                        label: i18n._('On Success'),
-                        value: 'success'
-                    },
-                    {
-                        label: i18n._('On Failure'),
-                        value: 'failure'
-                    }
-                ];
-            } else {
-                $scope.edgeTypeOptions = [];
+        let updateEdgeDropdownOptions = (edgeTypeValue) => {
+            // Not passing an edgeTypeValue will include all by default
 
-                optionsToInclude.forEach((optionToInclude) => {
-                    if (optionToInclude === "always") {
-                        $scope.edgeTypeOptions.push({
-                            label: $scope.strings.get('workflow_maker.ALWAYS'),
-                            value: 'always'
-                        });
-                    } else if (optionToInclude === "success") {
-                        $scope.edgeTypeOptions.push({
-                            label: $scope.strings.get('workflow_maker.ON_SUCCESS'),
-                            value: 'success'
-                        });
-                    } else if (optionToInclude === "failure") {
-                        $scope.edgeTypeOptions.push({
-                            label: $scope.strings.get('workflow_maker.ON_FAILURE'),
-                            value: 'failure'
-                        });
-                    }
+            if (edgeTypeValue) {
+                $scope.edgeTypeOptions = _.filter(createEdgeTypeOptions(), {
+                    'value': edgeTypeValue
                 });
+            } else {
+                $scope.edgeTypeOptions = createEdgeTypeOptions();
             }
 
             CreateSelect2({
@@ -347,9 +318,9 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
             let credentialRequiresPassword = false;
             $scope.promptData.prompts.credentials.value.forEach((credential) => {
                 if ((credential.passwords_needed &&
-                    credential.passwords_needed.length > 0) ||
+                        credential.passwords_needed.length > 0) ||
                     (_.has(credential, 'inputs.vault_password') &&
-                    credential.inputs.vault_password === "ASK")
+                        credential.inputs.vault_password === "ASK")
                 ) {
                     credentialRequiresPassword = true;
                 }
@@ -364,7 +335,7 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
                 'missingSurveyValue'
             ];
 
-            promptWatcher = $scope.$watchGroup(promptDataToWatch, function() {
+            promptWatcher = $scope.$watchGroup(promptDataToWatch, function () {
                 let missingPromptValue = false;
                 if ($scope.missingSurveyValue) {
                     missingPromptValue = true;
@@ -381,20 +352,20 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
             }
         };
 
-        $scope.closeWorkflowMaker = function() {
+        $scope.closeWorkflowMaker = function () {
             // Revert the data to the master which was created when the dialog was opened
             $scope.treeData.data = angular.copy($scope.treeDataMaster);
             $scope.closeDialog();
         };
 
-        $scope.saveWorkflowMaker = function() {
+        $scope.saveWorkflowMaker = function () {
 
             $scope.totalIteratedNodes = 0;
 
             if ($scope.treeData && $scope.treeData.data && $scope.treeData.data.children && $scope.treeData.data.children.length > 0) {
-                let completionCallback = function() {
+                let completionCallback = function () {
 
-                    let disassociatePromises = disassociateRequests.map(function(request) {
+                    let disassociatePromises = disassociateRequests.map(function (request) {
                         return TemplatesService.disassociateWorkflowNode({
                             parentId: request.parentId,
                             nodeId: request.nodeId,
@@ -402,67 +373,68 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
                         });
                     });
 
-                    let editNodePromises = editRequests.map(function(request) {
+                    let editNodePromises = editRequests.map(function (request) {
                         return TemplatesService.editWorkflowNode({
                             id: request.id,
                             data: request.data
                         });
                     });
 
-                    let deletePromises = $scope.treeData.data.deletedNodes.map(function(nodeId) {
+                    let deletePromises = $scope.treeData.data.deletedNodes.map(function (nodeId) {
                         return TemplatesService.deleteWorkflowJobTemplateNode(nodeId);
                     });
 
                     $q.all(disassociatePromises.concat(editNodePromises, deletePromises))
-                    .then(function() {
+                        .then(function () {
 
-                        let credentialPromises = credentialRequests.map(function(request) {
-                            return TemplatesService.postWorkflowNodeCredential({
-                                id: request.id,
-                                data: request.data
+                            let credentialPromises = credentialRequests.map(function (request) {
+                                return TemplatesService.postWorkflowNodeCredential({
+                                    id: request.id,
+                                    data: request.data
+                                });
                             });
-                        });
 
-                        let associatePromises = associateRequests.map(function(request) {
-                            return TemplatesService.associateWorkflowNode({
-                                parentId: request.parentId,
-                                nodeId: request.nodeId,
-                                edge: request.edge
+                            let associatePromises = associateRequests.map(function (request) {
+                                return TemplatesService.associateWorkflowNode({
+                                    parentId: request.parentId,
+                                    nodeId: request.nodeId,
+                                    edge: request.edge
+                                });
                             });
-                        });
 
-                        $q.all(associatePromises.concat(credentialPromises))
-                        .then(function() {
-                            $scope.closeDialog();
-                        }).catch(({data, status}) => {
+                            return $q.all(associatePromises.concat(credentialPromises))
+                                .then(function () {
+                                    $scope.closeDialog();
+                                });
+                        }).catch(({
+                            data,
+                            status
+                        }) => {
                             ProcessErrors($scope, data, status, null, {});
                         });
-                    }).catch(({data, status}) => {
-                        ProcessErrors($scope, data, status, null, {});
-                    });
                 };
 
-                _.forEach($scope.treeData.data.children, function(child) {
+                _.forEach($scope.treeData.data.children, function (child) {
                     recursiveNodeUpdates({
                         node: child
                     }, completionCallback);
                 });
             } else {
 
-                let deletePromises = $scope.treeData.data.deletedNodes.map(function(nodeId) {
+                let deletePromises = $scope.treeData.data.deletedNodes.map(function (nodeId) {
                     return TemplatesService.deleteWorkflowJobTemplateNode(nodeId);
                 });
 
                 $q.all(deletePromises)
-                .then(function() {
-                    $scope.closeDialog();
-                });
+                    .then(function () {
+                        $scope.closeDialog();
+                    });
             }
         };
 
         /* ADD NODE FUNCTIONS */
 
-        $scope.startAddNode = function(parent, betweenTwoNodes) {
+        $scope.startAddNode = function (parent, betweenTwoNodes) {
 
             if ($scope.placeholderNode || $scope.nodeBeingEdited) {
                 $scope.cancelNodeForm();
@@ -481,41 +453,29 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
 
             $scope.treeData.nextIndex++;
 
-            let siblingConnectionTypes = WorkflowService.getSiblingConnectionTypes({
-                tree: $scope.treeData.data,
-                parentId: betweenTwoNodes ? parent.source.id : parent.id,
-                childId: $scope.placeholderNode.id
-            });
-
             // Set the default to success
-            let edgeType = {label: $scope.strings.get('workflow_maker.ON_SUCCESS'), value: "success"};
+            let edgeType = {
+                label: $scope.strings.get('workflow_maker.ON_SUCCESS'),
+                value: "success"
+            };
 
             if (parent && ((betweenTwoNodes && parent.source.isStartNode) || (!betweenTwoNodes && parent.isStartNode))) {
-                // We don't want to give the user the option to select
-                // a type as this node will always be executed
-                updateEdgeDropdownOptions(["always"]);
-                edgeType = {label: $scope.strings.get('workflow_maker.ALWAYS'), value: "always"};
+                // This node will always be executed
+                updateEdgeDropdownOptions('always');
+                edgeType = {
+                    label: $scope.strings.get('workflow_maker.ALWAYS'),
+                    value: "always"
+                };
             } else {
-                if (_.includes(siblingConnectionTypes, "success") || _.includes(siblingConnectionTypes, "failure")) {
-                    updateEdgeDropdownOptions(["success", "failure"]);
-                    edgeType = {label: $scope.strings.get('workflow_maker.ON_SUCCESS'), value: "success"};
-                } else if (_.includes(siblingConnectionTypes, "always")) {
-                    updateEdgeDropdownOptions(["always"]);
-                    edgeType = {label: $scope.strings.get('workflow_maker.ALWAYS'), value: "always"};
-                } else {
-                    updateEdgeDropdownOptions();
-                }
+                updateEdgeDropdownOptions();
             }
 
-            // Reset the edgeConflict flag
-            resetEdgeConflict();
-
             $scope.edgeType = edgeType;
             $scope.$broadcast("refreshWorkflowChart");
 
         };
 
-        $scope.confirmNodeForm = function() {
+        $scope.confirmNodeForm = function () {
             if ($scope.workflowMakerFormConfig.nodeMode === "add") {
                 if ($scope.selectedTemplate && $scope.edgeType && $scope.edgeType.value) {
 
@@ -565,13 +525,10 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
 
             $scope.promptData = null;
 
-            // Reset the edgeConflict flag
-            resetEdgeConflict();
-
             $scope.$broadcast("refreshWorkflowChart");
         };
 
-        $scope.cancelNodeForm = function() {
+        $scope.cancelNodeForm = function () {
             if ($scope.workflowMakerFormConfig.nodeMode === "add") {
                 // Remove the placeholder node from the tree
                 WorkflowService.removeNodeFromTree({
@@ -598,9 +555,6 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
             $scope.selectedTemplateInvalid = false;
             $scope.showPromptButton = false;
 
-            // Reset the edgeConflict flag
-            resetEdgeConflict();
-
             // Reset the form
             resetNodeForm();
 
@@ -609,7 +563,7 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
 
         /* EDIT NODE FUNCTIONS */
 
-        $scope.startEditNode = function(nodeToEdit) {
+        $scope.startEditNode = function (nodeToEdit) {
 
             if (!$scope.nodeBeingEdited || ($scope.nodeBeingEdited && $scope.nodeBeingEdited.id !== nodeToEdit.id)) {
                 if ($scope.placeholderNode || $scope.nodeBeingEdited) {
@@ -636,7 +590,7 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
 
                 $scope.nodeBeingEdited.isActiveEdit = true;
 
-                let finishConfiguringEdit = function() {
+                let finishConfiguringEdit = function () {
 
                     let jobTemplate = new JobTemplate();
 
@@ -656,8 +610,8 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
                             !launchConf.credential_needed_to_start &&
                             !launchConf.ask_variables_on_launch &&
                             launchConf.variables_needed_to_start.length === 0) {
-                                $scope.showPromptButton = false;
-                                $scope.promptModalMissingReqFields = false;
+                            $scope.showPromptButton = false;
+                            $scope.promptModalMissingReqFields = false;
                         } else {
                             $scope.showPromptButton = true;
 
@@ -729,7 +683,7 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
                                 let credentialRequiresPassword = false;
 
                                 prompts.credentials.value.forEach((credential) => {
-                                    if(credential.inputs) {
+                                    if (credential.inputs) {
                                         if ((credential.inputs.password && credential.inputs.password === "ASK") ||
                                             (credential.inputs.become_password && credential.inputs.become_password === "ASK") ||
                                             (credential.inputs.ssh_key_unlock && credential.inputs.ssh_key_unlock === "ASK") ||
@@ -756,8 +710,8 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
                                     !launchConf.credential_needed_to_start &&
                                     !launchConf.ask_variables_on_launch &&
                                     launchConf.variables_needed_to_start.length === 0) {
-                                        $scope.showPromptButton = false;
-                                        $scope.promptModalMissingReqFields = false;
+                                    $scope.showPromptButton = false;
+                                    $scope.promptModalMissingReqFields = false;
                                 } else {
                                     $scope.showPromptButton = true;
 
@@ -816,7 +770,7 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
                                         watchForPromptChanges();
                                     }
                                 }
-                        });
+                            });
                     }
 
                     if (_.get($scope, 'nodeBeingEdited.unifiedJobTemplate')) {
@@ -855,32 +809,30 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
                         $scope.workflowMakerFormConfig.activeTab = "jobs";
                     }
 
-                    let siblingConnectionTypes = WorkflowService.getSiblingConnectionTypes({
-                         tree: $scope.treeData.data,
-                         parentId: parent.id,
-                         childId: nodeToEdit.id
-                     });
+                    let edgeDropdownOptions = null;
 
-                     let edgeDropdownOptions = null;
-
-                     switch($scope.nodeBeingEdited.edgeType) {
+                    // Select RUN dropdown option
+                    switch ($scope.nodeBeingEdited.edgeType) {
                         case "always":
-                            $scope.edgeType = {label: i18n._("Always"), value: "always"};
-                            if (siblingConnectionTypes.length === 1 && _.includes(siblingConnectionTypes, "always") || $scope.nodeBeingEdited.isRoot) {
-                                edgeDropdownOptions = ["always"];
+                            $scope.edgeType = {
+                                label: $scope.strings.get('workflow_maker.ALWAYS'),
+                                value: "always"
+                            };
+                            if ($scope.nodeBeingEdited.isRoot) {
+                                edgeDropdownOptions = 'always';
                             }
                             break;
                         case "success":
-                            $scope.edgeType = {label: i18n._("On Success"), value: "success"};
-                            if (siblingConnectionTypes.length !== 0 && (!_.includes(siblingConnectionTypes, "always"))) {
-                                edgeDropdownOptions = ["success", "failure"];
-                            }
+                            $scope.edgeType = {
+                                label: $scope.strings.get('workflow_maker.ON_SUCCESS'),
+                                value: "success"
+                            };
                             break;
                         case "failure":
-                            $scope.edgeType = {label: i18n._("On Failure"), value: "failure"};
-                            if (siblingConnectionTypes.length !== 0 && (!_.includes(siblingConnectionTypes, "always"))) {
-                                edgeDropdownOptions = ["success", "failure"];
-                            }
+                            $scope.edgeType = {
+                                label: $scope.strings.get('workflow_maker.ON_FAILURE'),
+                                value: "failure"
+                            };
                             break;
                     }
 
@@ -897,15 +849,18 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
                     // unified job template so we're going to pull down the whole object
 
                     TemplatesService.getUnifiedJobTemplate($scope.nodeBeingEdited.unifiedJobTemplate.id)
-                        .then(function(data) {
+                        .then(function (data) {
                             $scope.nodeBeingEdited.unifiedJobTemplate = _.clone(data.data.results[0]);
                             finishConfiguringEdit();
-                        }, function(error) {
-                            ProcessErrors($scope, error.data, error.status, null, {
-                                hdr: 'Error!',
-                                msg: 'Failed to get unified job template. GET returned ' +
-                                    'status: ' + error.status
-                            });
+                        }, function ({ data, status, config }) {
+                          ProcessErrors($scope, data, status, null, {
+                            hdr: $scope.strings.get('error.HEADER'),
+                            msg: $scope.strings.get('error.CALL', {
+                                path: `${config.url}`,
+                                action: `${config.method}`,
+                                status
+                            })
+                        });
                         });
                 } else {
                     finishConfiguringEdit();
@@ -922,16 +877,16 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
             $scope.deleteOverlayVisible = false;
         }
 
-        $scope.startDeleteNode = function(nodeToDelete) {
+        $scope.startDeleteNode = function (nodeToDelete) {
             $scope.nodeToBeDeleted = nodeToDelete;
             $scope.deleteOverlayVisible = true;
         };
 
-        $scope.cancelDeleteNode = function() {
+        $scope.cancelDeleteNode = function () {
             resetDeleteNode();
         };
 
-        $scope.confirmDeleteNode = function() {
+        $scope.confirmDeleteNode = function () {
             if ($scope.nodeToBeDeleted) {
 
                 // TODO: turn this into a promise so that we can handle errors
@@ -949,95 +904,56 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
                     resetNodeForm();
                 }
 
-                // Reset the edgeConflict flag
-                resetEdgeConflict();
-
                 resetDeleteNode();
 
                 $scope.$broadcast("refreshWorkflowChart");
 
                 if ($scope.placeholderNode) {
-                    let edgeType = {label: "On Success", value: "success"};
+                    let edgeType = {
+                        label: $scope.strings.get('workflow_maker.ON_SUCCESS'),
+                        value: "success"
+                    };
+
                     if ($scope.placeholderNode.isRoot) {
-                        updateEdgeDropdownOptions(["always"]);
-                        edgeType = {label: "Always", value: "always"};
-                    } else {
-                        // we need to update the possible edges based on any new siblings
-                        let siblingConnectionTypes = WorkflowService.getSiblingConnectionTypes({
-                            tree: $scope.treeData.data,
-                            parentId: $scope.placeholderNode.parent.id,
-                            childId: $scope.placeholderNode.id
-                        });
-
-                        if (
-                            (_.includes(siblingConnectionTypes, "success") || _.includes(siblingConnectionTypes, "failure")) &&
-                            !_.includes(siblingConnectionTypes, "always")
-                        ) {
-                            updateEdgeDropdownOptions(["success", "failure"]);
-                        } else if (
-                            _.includes(siblingConnectionTypes, "always") &&
-                            !_.includes(siblingConnectionTypes, "success") &&
-                            !_.includes(siblingConnectionTypes, "failure")
-                        ) {
-                            updateEdgeDropdownOptions(["always"]);
-                            edgeType = {label: "Always", value: "always"};
-                        } else {
-                            updateEdgeDropdownOptions();
-                        }
-
-                    }
-                    $scope.edgeType = edgeType;
-                } else if ($scope.nodeBeingEdited) {
-                    let siblingConnectionTypes = WorkflowService.getSiblingConnectionTypes({
-                        tree: $scope.treeData.data,
-                        parentId: $scope.nodeBeingEdited.parent.id,
-                        childId: $scope.nodeBeingEdited.id
-                    });
-
-                    if (_.includes(siblingConnectionTypes, "success") || _.includes(siblingConnectionTypes, "failure")) {
-                        updateEdgeDropdownOptions(["success", "failure"]);
-                    } else if (_.includes(siblingConnectionTypes, "always") && $scope.nodeBeingEdited.edgeType === "always") {
-                        updateEdgeDropdownOptions(["always"]);
+                        updateEdgeDropdownOptions('always');
+                        edgeType = {
+                            label: $scope.strings.get('workflow_maker.ALWAYS'),
+                            value: "always"
+                        };
                     } else {
                         updateEdgeDropdownOptions();
                     }
 
-                    switch($scope.nodeBeingEdited.edgeType) {
-                       case "always":
-                           $scope.edgeType = {label: i18n._("Always"), value: "always"};
-                           if (
-                               _.includes(siblingConnectionTypes, "always") &&
-                               !_.includes(siblingConnectionTypes, "success") &&
-                               !_.includes(siblingConnectionTypes, "failure")
-                           ) {
-                               updateEdgeDropdownOptions(["always"]);
-                           } else {
-                               updateEdgeDropdownOptions();
-                           }
-                           break;
-                       case "success":
-                           $scope.edgeType = {label: i18n._("On Success"), value: "success"};
-                           if (
-                               (_.includes(siblingConnectionTypes, "success") || _.includes(siblingConnectionTypes, "failure")) &&
-                               !_.includes(siblingConnectionTypes, "always")
-                           ) {
-                               updateEdgeDropdownOptions(["success", "failure"]);
-                           } else {
-                               updateEdgeDropdownOptions();
-                           }
-                           break;
-                       case "failure":
-                           $scope.edgeType = {label: i18n._("On Failure"), value: "failure"};
-                           if (
-                               (_.includes(siblingConnectionTypes, "success") || _.includes(siblingConnectionTypes, "failure")) &&
-                               !_.includes(siblingConnectionTypes, "always")
-                           ) {
-                               updateEdgeDropdownOptions(["success", "failure"]);
-                           } else {
-                               updateEdgeDropdownOptions();
-                           }
-                           break;
-                   }
+                    $scope.edgeType = edgeType;
+                } else if ($scope.nodeBeingEdited) {
+
+                    switch ($scope.nodeBeingEdited.edgeType) {
+                        case "always":
+                            $scope.edgeType = {
+                                label: $scope.strings.get('workflow_maker.ALWAYS'),
+                                value: "always"
+                            };
+                            if ($scope.nodeBeingEdited.isRoot) {
+                                updateEdgeDropdownOptions('always');
+                            } else {
+                                updateEdgeDropdownOptions();
+                            }
+                            break;
+                        case "success":
+                            $scope.edgeType = {
+                                label: $scope.strings.get('workflow_maker.ON_SUCCESS'),
+                                value: "success"
+                            };
+                            updateEdgeDropdownOptions();
+                            break;
+                        case "failure":
+                            $scope.edgeType = {
+                                label: $scope.strings.get('workflow_maker.ON_FAILURE'),
+                                value: "failure"
+                            };
+                            updateEdgeDropdownOptions();
+                            break;
+                    }
                 }
 
                 $scope.treeData.data.totalNodes--;
@@ -1045,13 +961,13 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
 
         };
 
-        $scope.toggleFormTab = function(tab) {
+        $scope.toggleFormTab = function (tab) {
             if ($scope.workflowMakerFormConfig.activeTab !== tab) {
                 $scope.workflowMakerFormConfig.activeTab = tab;
             }
         };
 
-        $scope.templateManuallySelected = function(selectedTemplate) {
+        $scope.templateManuallySelected = function (selectedTemplate) {
 
             if (promptWatcher) {
                 promptWatcher();
@@ -1100,8 +1016,8 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
                             !launchConf.credential_needed_to_start &&
                             !launchConf.ask_variables_on_launch &&
                             launchConf.variables_needed_to_start.length === 0) {
-                                $scope.showPromptButton = false;
-                                $scope.promptModalMissingReqFields = false;
+                            $scope.showPromptButton = false;
+                            $scope.promptModalMissingReqFields = false;
                         } else {
                             $scope.showPromptButton = true;
 
@@ -1168,56 +1084,47 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
             }
         };
 
-        function resetEdgeConflict(){
-            $scope.edgeFlags.conflict = false;
-
-            WorkflowService.checkForEdgeConflicts({
-                treeData: $scope.treeData.data,
-                edgeFlags: $scope.edgeFlags
-            });
-        }
-
-        $scope.toggleManualControls = function() {
+        $scope.toggleManualControls = function () {
             $scope.showManualControls = !$scope.showManualControls;
         };
 
-        $scope.panChart = function(direction) {
+        $scope.panChart = function (direction) {
             $scope.$broadcast('panWorkflowChart', {
                 direction: direction
             });
         };
 
-        $scope.zoomChart = function(zoom) {
+        $scope.zoomChart = function (zoom) {
             $scope.$broadcast('zoomWorkflowChart', {
                 zoom: zoom
             });
         };
 
-        $scope.resetChart = function() {
+        $scope.resetChart = function () {
             $scope.$broadcast('resetWorkflowChart');
         };
 
-        $scope.workflowZoomed = function(zoom) {
+        $scope.workflowZoomed = function (zoom) {
             $scope.$broadcast('workflowZoomed', {
                 zoom: zoom
             });
         };
 
-        $scope.zoomToFitChart = function() {
+        $scope.zoomToFitChart = function () {
             $scope.$broadcast('zoomToFitChart');
         };
 
-        $scope.openPromptModal = function() {
+        $scope.openPromptModal = function () {
             $scope.promptData.triggerModalOpen = true;
         };
 
         let allNodes = [];
         let page = 1;
 
-        let buildTreeFromNodes = function(){
+        let buildTreeFromNodes = function () {
             WorkflowService.buildTree({
                 workflowNodes: allNodes
-            }).then(function(data){
+            }).then(function (data) {
                 $scope.treeData = data;
 
                 // TODO: I think that the workflow chart directive (and eventually d3) is meddling with
@@ -1234,33 +1141,35 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
             });
         };
 
-        let getNodes = function(){
+        let getNodes = function () {
             // Get the workflow nodes
             TemplatesService.getWorkflowJobTemplateNodes($scope.workflowJobTemplateObj.id, page)
-            .then(function(data){
-                for(var i=0; i<data.data.results.length; i++) {
-                    allNodes.push(data.data.results[i]);
-                }
-                if (data.data.next) {
-                    // Get the next page
-                    page++;
-                    getNodes();
-                } else {
-                    // This is the last page
-                    buildTreeFromNodes();
-                }
-            }, function(error){
-                ProcessErrors($scope, error.data, error.status, null, {
-                    hdr: 'Error!',
-                    msg: 'Failed to get workflow job template nodes. GET returned ' +
-                    'status: ' + error.status
+                .then(function (data) {
+                    for (var i = 0; i < data.data.results.length; i++) {
+                        allNodes.push(data.data.results[i]);
+                    }
+                    if (data.data.next) {
+                        // Get the next page
+                        page++;
+                        getNodes();
+                    } else {
+                        // This is the last page
+                        buildTreeFromNodes();
+                    }
+                }, function ({ data, status, config }) {
+                    ProcessErrors($scope, data, status, null, {
+                        hdr: $scope.strings.get('error.HEADER'),
+                        msg: $scope.strings.get('error.CALL', {
+                            path: `${config.url}`,
+                            action: `${config.method}`,
+                            status
+                        })
+                    });
                 });
-            });
         };
 
         getNodes();
 
         updateEdgeDropdownOptions();
-
     }
 ];

awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html

@@ -139,7 +139,7 @@
     </div>
     <div class="WorkflowMaker-buttonHolder">
         <button type="button" class="btn btn-sm WorkflowMaker-cancelButton" ng-click="closeWorkflowMaker()"> {{:: strings.get('CLOSE') }}</button>
-        <button type="button" class="btn btn-sm WorkflowMaker-saveButton" ng-click="saveWorkflowMaker()" ng-show="workflowJobTemplateObj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate" ng-disabled="edgeFlags.conflict || workflowMakerFormConfig.nodeMode === 'add'"> {{:: strings.get('SAVE') }}</button>
+        <button type="button" class="btn btn-sm WorkflowMaker-saveButton" ng-click="saveWorkflowMaker()" ng-show="workflowJobTemplateObj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate" ng-disabled="workflowMakerFormConfig.nodeMode === 'add'"> {{:: strings.get('SAVE') }}</button>
     </div>
     <prompt prompt-data="promptData" action-text="{{:: strings.get('prompt.CONFIRM')}}" prevent-creds-with-passwords="preventCredsWithPasswords" read-only-prompts="!(workflowJobTemplateObj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate)"></prompt>
 </div>

awx/ui/client/src/templates/workflows/workflow.service.js

@@ -290,39 +290,5 @@ export default ['$q', function($q){
             }
 
         },
-        checkForEdgeConflicts: function(params) {
-            //params.treeData
-            //params.edgeFlags
-
-            let hasAlways = false;
-            let hasSuccessFailure = false;
-            let _this = this;
-
-            _.forEach(params.treeData.children, function(child) {
-                // Flip the flag to false for now - we'll set it to true later on
-                // if we detect a conflict
-                child.edgeConflict = false;
-                if(child.edgeType === 'always') {
-                    hasAlways = true;
-                }
-                else if(child.edgeType === 'success' || child.edgeType === 'failure') {
-                    hasSuccessFailure = true;
-                }
-
-                _this.checkForEdgeConflicts({
-                    treeData: child,
-                    edgeFlags: params.edgeFlags
-                });
-            });
-
-            if(hasAlways && hasSuccessFailure) {
-                // We have a conflict
-                _.forEach(params.treeData.children, function(child) {
-                    child.edgeConflict = true;
-                });
-
-                params.edgeFlags.conflict = true;
-            }
-        }
     };
 }];