From 18f3c79bc3894ed301f5dd0bde35e3ff5cdaad45 Mon Sep 17 00:00:00 2001 From: Marliana Lara Date: Mon, 5 Mar 2018 13:21:37 -0500 Subject: [PATCH 1/5] Denote invalid job templates and scheduled jobs by displaying a red invalid bar --- .../templates/list-templates.controller.js | 17 +++++++++++ .../client/features/templates/list.view.html | 3 ++ .../features/templates/templates.strings.js | 3 +- awx/ui/client/legacy/styles/lists.less | 28 ++++++++++++++++--- awx/ui/client/lib/components/list/_index.less | 24 ++++++++++++++++ .../src/scheduler/schedulerList.controller.js | 14 ++++++++++ awx/ui/client/src/scheduler/schedules.list.js | 10 ++++++- awx/ui/client/src/shared/generator-helpers.js | 5 ++++ 8 files changed, 98 insertions(+), 6 deletions(-) diff --git a/awx/ui/client/features/templates/list-templates.controller.js b/awx/ui/client/features/templates/list-templates.controller.js index a85a71204b..e25bdf7de2 100644 --- a/awx/ui/client/features/templates/list-templates.controller.js +++ b/awx/ui/client/features/templates/list-templates.controller.js @@ -34,6 +34,15 @@ function ListTemplatesController( vm.strings = strings; vm.templateTypes = mapChoices(choices); vm.activeId = parseInt($state.params.job_template_id || $state.params.workflow_template_id); + vm.invalidTooltip = { + popover: { + text: strings.get('error.INVALID'), + on: 'mouseenter', + icon: 'fa-exclamation', + position: 'right', + arrowHeight: 15 + } + } $scope.canAddJobTemplate = jobTemplate.options('actions.POST'); $scope.canAddWorkflowJobTemplate = workflowTemplate.options('actions.POST'); @@ -53,6 +62,14 @@ function ListTemplatesController( $scope[name] = dataset.results; }); + vm.isInvalid = (template) => { + if(isJobTemplate(template)) { + return (template.inventory === null || template.project == null) + } else { + return false; + } + }; + vm.runTemplate = template => { if (!template) { Alert(strings.get('error.LAUNCH'), strings.get('alert.MISSING_PARAMETER')); diff --git a/awx/ui/client/features/templates/list.view.html b/awx/ui/client/features/templates/list.view.html index 7759287085..c6d2e19db0 100644 --- a/awx/ui/client/features/templates/list.view.html +++ b/awx/ui/client/features/templates/list.view.html @@ -50,6 +50,9 @@ +
+ +
:first-child { - padding-left: 10px; -} - .List-tableRow--disabled { .List-tableCell, .List-tableCell * { color: @b7grey; @@ -98,6 +94,25 @@ table, tbody { } } +.List-tableRow--invalid { + height: 40px; +} + +.List-tableRow--invalidBar { + align-items: center; + border-left: solid @at-space-2x @at-color-error; + color: @at-white; + display: flex; + height: 100%; + justify-content: center; + position: relative; + + i { + position: absolute; + left: -7px; + } +} + .List-tableCell { padding: 7px 15px; border-top:0px!important; @@ -387,6 +402,11 @@ table, tbody { max-width: 164px; } +.List-staticColumn--invalidBar { + width: 10px; + padding-right: 0px!important; +} + .List-staticColumnAdjacent { padding-left: 10px!important; } diff --git a/awx/ui/client/lib/components/list/_index.less b/awx/ui/client/lib/components/list/_index.less index a4daa3248b..0deaa7c250 100644 --- a/awx/ui/client/lib/components/list/_index.less +++ b/awx/ui/client/lib/components/list/_index.less @@ -72,6 +72,7 @@ justify-content: space-between; align-items: center; padding: @at-padding-list-row; + position: relative; } .at-Row--active { @@ -80,6 +81,29 @@ border-top-right-radius: @at-border-radius; } +.at-Row--invalid { + align-items: center; + background: @at-color-error; + display: flex; + height: 100%; + justify-content: center; + left: 0; + position: absolute; + width: @at-space-2x; + + .at-Popover { + padding: 0; + + &-icon i { + color: @at-white; + } + + &-icon i:hover { + color: @at-white; + } + } +} + .at-Row ~ .at-Row { border-top-left-radius: 0px; border-top-right-radius: 0px; diff --git a/awx/ui/client/src/scheduler/schedulerList.controller.js b/awx/ui/client/src/scheduler/schedulerList.controller.js index c0ad965239..3ae664216a 100644 --- a/awx/ui/client/src/scheduler/schedulerList.controller.js +++ b/awx/ui/client/src/scheduler/schedulerList.controller.js @@ -46,6 +46,20 @@ export default [ // _.forEach($scope[list.name], buildTooltips); } + $scope.isValid = (schedule) => { + let type = schedule.summary_fields.unified_job_template.unified_job_type; + switch(type){ + case 'job': + return _.every(['project', 'inventory'], _.partial(_.has, schedule.related)); + case 'project_update': + return _.has(schedule, 'related.project'); + case 'inventory_update': + return _.has(schedule, 'related.inventory'); + default: + return true; + } + }; + $scope.$on(`${list.iterator}_options`, function(event, data){ $scope.options = data.data.actions.GET; optionsRequestDataProcessing(); diff --git a/awx/ui/client/src/scheduler/schedules.list.js b/awx/ui/client/src/scheduler/schedules.list.js index b6fbf4b811..70f785ecdf 100644 --- a/awx/ui/client/src/scheduler/schedules.list.js +++ b/awx/ui/client/src/scheduler/schedules.list.js @@ -4,7 +4,6 @@ * All Rights Reserved *************************************************/ - export default ['i18n', function(i18n) { return { @@ -17,6 +16,15 @@ export default ['i18n', function(i18n) { hover: true, fields: { + invalid: { + columnClass: "List-staticColumn--invalidBar", + label: '', + type: 'invalid', + nosort: true, + awToolTip: i18n._("Resources are missing from this template."), + dataPlacement: 'right', + ngShow: '!isValid(schedule)' + }, toggleSchedule: { ngDisabled: "!schedule.summary_fields.user_capabilities.edit", label: '', diff --git a/awx/ui/client/src/shared/generator-helpers.js b/awx/ui/client/src/shared/generator-helpers.js index f2fd9f2f1f..f5ab269ac7 100644 --- a/awx/ui/client/src/shared/generator-helpers.js +++ b/awx/ui/client/src/shared/generator-helpers.js @@ -549,6 +549,11 @@ angular.module('GeneratorHelpers', [systemStatus.name]) html += "ng-show='!" + list.iterator + "." ; html += (field.flag) ? field.flag : "enabled"; html += "' class='ScheduleToggle-switch' ng-click='" + field.ngClick + "'>" + i18n._("OFF") + "
"; + } else if (field.type === 'invalid') { + html += `
`; + html += ""; + html += "
"; } else { html += " Date: Mon, 12 Feb 2018 22:13:00 -0500 Subject: [PATCH 2/5] Constrain requests --- requirements/requirements.in | 1 + requirements/requirements_ansible.in | 1 + 2 files changed, 2 insertions(+) diff --git a/requirements/requirements.in b/requirements/requirements.in index dff8dd4d26..678a599056 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -46,6 +46,7 @@ social-auth-core==1.5.0 social-auth-app-django==2.0.0 pyvmomi==6.5 redbaron==0.6.3 +requests<2.16 # Older versions rely on certify requests-futures==0.9.7 service-identity==16.0.0 shade==1.20.0 diff --git a/requirements/requirements_ansible.in b/requirements/requirements_ansible.in index b4ab5f60f6..e59e54c92c 100644 --- a/requirements/requirements_ansible.in +++ b/requirements/requirements_ansible.in @@ -23,6 +23,7 @@ psphere==0.5.2 psutil==5.2.2 pyvmomi==6.5 pywinrm[kerberos]==0.2.2 +requests<2.16 # Older versions rely on certify secretstorage==2.3.1 shade==1.20.0 setuptools==36.0.1 From 556e6c4a117597fc36fdab53b32a4e29ed494a34 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Thu, 1 Mar 2018 11:17:46 -0500 Subject: [PATCH 3/5] Dependency Updates Upgrades of minor dependency upgrades Inventory scripts were upgraded in separate commit Major exclusions from this update - celery was already downgraded for other reasons - Django / DRF major update already done, minor bumps here - asgi-amqp has fixes coming independently, not touched - TACACS plus added features not needed Removals of note - remove shade from AWX requirements - remove kombu from Ansible requirements Other notes Add note about pinning setuptools and pip, done but not mentioned previously Stop pinning gevent-websocket and twisted upgrade Azure to Ansible core requirements more detailed notes https://gist.github.com/AlanCoding/9442a512ab6977940bc7b5b346d4f70b upgrade version of Django for Exception --- awx/wsgi.py | 6 +- requirements/README.md | 6 +- requirements/requirements.in | 61 +++--- requirements/requirements.txt | 286 +++++++++++++------------ requirements/requirements_ansible.in | 28 +-- requirements/requirements_ansible.txt | 185 +++++++--------- requirements/requirements_isolated.txt | 4 +- 7 files changed, 284 insertions(+), 292 deletions(-) diff --git a/awx/wsgi.py b/awx/wsgi.py index abb62da5d7..6f153bffbc 100644 --- a/awx/wsgi.py +++ b/awx/wsgi.py @@ -35,10 +35,10 @@ if MODE == 'production': raise Exception("Missing or incorrect metadata for Tower version. Ensure Tower was installed using the setup playbook.") -if django.__version__ != '1.11.7': - raise RuntimeError("Django version other than 1.11.7 detected {}. \ +if django.__version__ != '1.11.10': + raise RuntimeError("Django version other than 1.11.10 detected {}. \ Inherit from WSGIHandler to support short-circuit Django Middelware. \ - This is known to work for Django 1.11.7 and may not work with other, \ + This is known to work for Django 1.11.10 and may not work with other, \ even minor, versions.".format(django.__version__)) diff --git a/requirements/README.md b/requirements/README.md index a55eb998e2..e93b1a6162 100644 --- a/requirements/README.md +++ b/requirements/README.md @@ -1,6 +1,8 @@ The requirements.txt and requirements_ansible.txt files are generated from requirements.in and requirements_ansible.in, respectively, using `pip-tools` `pip-compile`. The following commands should do this if ran inside the tower_tools container. -NOTE: before running `pip-compile`, please copy-paste contents in `requirements/requirements_git.txt` to the top of `requirements/requirements.in` and prepend each copied line with `-e `. Later after `requirements.txt` is generated, don't forget to remove all `git+https://github.com...`-like lines from both `requirements.txt` and `requirements.in` +NOTE: before running `pip-compile`, please copy-paste contents in `requirements/requirements_git.txt` to the top of `requirements/requirements.in` and prepend each copied line with `-e `. Later after `requirements.txt` is generated, don't forget to remove all `git+https://github.com...`-like lines from both `requirements.txt` and `requirements.in` (repeat for `requirements_ansible_git.txt` and `requirements_ansible.in`) + +At the end of `requirements/requirements.in`, pip and setuptools need to have their versions pinned. ``` virtualenv /buildit @@ -20,6 +22,4 @@ pip-compile requirements/requirements_ansible.in > requirements/requirements_ans * can't use `pip install --no-deps` because other deps WILL be sucked in * all dependencies are NOT captured in our `.txt` files. This means you can't rely on the `.txt` when gathering licenses. -* Packages `gevent-websocket` and `twisted` are put in `requirements.in` *not* because they are primary dependency of Tower, but because their versions needs to be freezed as dependencies of django channel. Please be mindful when doing dependency updates. - * Package `docutils`, as an upstream of `boto3`, is commented out in both `requirements.txt` and `requirements_ansible.txt` because the official package has a bug that causes RPM build failure. [Here](https://sourceforge.net/p/docutils/bugs/321/) is the bug report. Please do not uncomment it before the bug fix lands. For now we are using [a monkey-patch version of `docutils`](https://github.com/ansible/docutils.git) that comes with the bug fix. It's included in `requirements_git.txt` and `requirements_ansible_git.txt`. diff --git a/requirements/requirements.in b/requirements/requirements.in index 678a599056..c77a73805d 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -1,60 +1,57 @@ -apache-libcloud==2.0.0 +apache-libcloud==2.2.1 appdirs==1.4.2 asgi-amqp==1.1.1 asgiref==1.1.2 -azure==2.0.0rc6 +azure==3.0.0 backports.ssl-match-hostname==3.5.0.1 -boto==2.46.1 -boto3==1.4.4 +boto==2.47.0 +boto3==1.6.2 channels==1.1.8 celery==3.1.25 -daphne==1.3.0 -Django==1.11.7 +daphne==1.3.0 # Last before backwards-incompatible channels 2 upgrade +Django==1.11.10 django-auth-ldap==1.2.8 django-celery==3.2.2 -django-crum==0.7.1 -django-extensions==1.7.8 +django-crum==0.7.2 +django-extensions==2.0.0 django-jsonfield==1.0.1 django-oauth-toolkit==1.0.0 -django-polymorphic==1.3 +django-polymorphic==2.0.2 django-pglocks==1.0.2 -django-radius==1.1.0 -django-solo==1.1.2 -django-split-settings==0.2.5 -django-taggit==0.22.1 -djangorestframework==3.7.3 +django-radius==1.3.3 +django-solo==1.1.3 +django-split-settings==0.3.0 +django-taggit==0.22.2 +djangorestframework==3.7.7 djangorestframework-yaml==1.0.3 -gevent-websocket==0.9.5 -irc==15.1.1 +irc==16.2 jsonschema==2.6.0 -M2Crypto==0.25.1 -Markdown==2.6.7 +M2Crypto==0.29.0 +Markdown==2.6.11 ordereddict==1.1 pexpect==4.4.0 psphere==0.5.2 -psutil==5.2.2 -psycopg2==2.7.3.2 +psutil==5.4.3 +psycopg2==2.7.3.2 # problems with Segmentation faults / wheels on upgrade pycrypto==2.6.1 -pygerduty==0.35.2 -pyOpenSSL==17.0.0 +pygerduty==0.37.0 +pyOpenSSL==17.5.0 pyparsing==2.2.0 python-logstash==0.4.6 -python-memcached==1.58 +python-memcached==1.59 python-radius==1.0 -python-saml==2.2.1 -social-auth-core==1.5.0 -social-auth-app-django==2.0.0 +python-saml==2.2.2 # pinned due to open issue awx/issues/1421 +social-auth-core==1.7.0 +social-auth-app-django==2.1.0 pyvmomi==6.5 redbaron==0.6.3 requests<2.16 # Older versions rely on certify requests-futures==0.9.7 -service-identity==16.0.0 -shade==1.20.0 -slackclient==1.0.6 +service-identity==17.0.0 +slackclient==1.1.2 tacacs_plus==1.0 -twilio==6.1.0 -twisted==17.9.0 -uWSGI==2.0.14 +twilio==6.10.4 +uWSGI==2.0.17 xmltodict==0.11.0 pip==9.0.1 setuptools==36.0.1 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index f4270c457c..87c1b27af7 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -4,188 +4,202 @@ # # pip-compile --output-file requirements/requirements.txt requirements/requirements.in # -adal==0.4.5 # via msrestazure +adal==0.5.0 # via azure-datalake-store, msrestazure amqp==1.4.9 # via kombu anyjson==0.3.3 # via kombu -apache-libcloud==2.0.0 +apache-libcloud==2.2.1 appdirs==1.4.2 asgi-amqp==1.1.1 asgiref==1.1.2 -asn1crypto==0.22.0 # via cryptography -attrs==17.2.0 # via automat, service-identity -autobahn==17.10.1 # via daphne +asn1crypto==0.24.0 # via cryptography +attrs==17.4.0 # via automat, service-identity +autobahn==18.3.1 # via daphne automat==0.6.0 # via twisted -azure-batch==1.0.0 # via azure -azure-common[autorest]==1.1.4 # via azure-batch, azure-mgmt-batch, azure-mgmt-compute, azure-mgmt-keyvault, azure-mgmt-logic, azure-mgmt-network, azure-mgmt-redis, azure-mgmt-resource, azure-mgmt-scheduler, azure-mgmt-storage, azure-servicebus, azure-servicemanagement-legacy, azure-storage -azure-mgmt-batch==1.0.0 # via azure-mgmt -azure-mgmt-compute==0.30.0rc6 # via azure-mgmt -azure-mgmt-keyvault==0.30.0rc6 # via azure-mgmt -azure-mgmt-logic==1.0.0 # via azure-mgmt -azure-mgmt-network==0.30.0rc6 # via azure-mgmt -azure-mgmt-nspkg==2.0.0 # via azure-batch, azure-mgmt-batch, azure-mgmt-compute, azure-mgmt-keyvault, azure-mgmt-logic, azure-mgmt-network, azure-mgmt-redis, azure-mgmt-resource, azure-mgmt-scheduler, azure-mgmt-storage -azure-mgmt-redis==1.0.0 # via azure-mgmt -azure-mgmt-resource==0.30.0rc6 # via azure-mgmt -azure-mgmt-scheduler==1.0.0 # via azure-mgmt -azure-mgmt-storage==0.30.0rc6 # via azure-mgmt -azure-mgmt==0.30.0rc6 # via azure -azure-nspkg==2.0.0 # via azure-common, azure-mgmt-nspkg, azure-storage -azure-servicebus==0.20.3 # via azure -azure-servicemanagement-legacy==0.20.4 # via azure -azure-storage==0.33.0 # via azure -azure==2.0.0rc6 -babel==2.3.4 # via osc-lib, oslo.i18n, python-cinderclient, python-glanceclient, python-neutronclient, python-novaclient, python-openstackclient -backports.functools-lru-cache==1.4 # via jaraco.functools +azure-batch==4.0.0 # via azure +azure-common==1.1.8 # via azure-batch, azure-cosmosdb-table, azure-eventgrid, azure-graphrbac, azure-keyvault, azure-mgmt-advisor, azure-mgmt-applicationinsights, azure-mgmt-authorization, azure-mgmt-batch, azure-mgmt-batchai, azure-mgmt-billing, azure-mgmt-cdn, azure-mgmt-cognitiveservices, azure-mgmt-commerce, azure-mgmt-compute, azure-mgmt-consumption, azure-mgmt-containerinstance, azure-mgmt-containerregistry, azure-mgmt-containerservice, azure-mgmt-cosmosdb, azure-mgmt-datafactory, azure-mgmt-datalake-analytics, azure-mgmt-datalake-store, azure-mgmt-devtestlabs, azure-mgmt-dns, azure-mgmt-eventgrid, azure-mgmt-eventhub, azure-mgmt-hanaonazure, azure-mgmt-iothub, azure-mgmt-iothubprovisioningservices, azure-mgmt-keyvault, azure-mgmt-loganalytics, azure-mgmt-logic, azure-mgmt-machinelearningcompute, azure-mgmt-managementpartner, azure-mgmt-marketplaceordering, azure-mgmt-media, azure-mgmt-monitor, azure-mgmt-msi, azure-mgmt-network, azure-mgmt-notificationhubs, azure-mgmt-powerbiembedded, azure-mgmt-rdbms, azure-mgmt-recoveryservices, azure-mgmt-recoveryservicesbackup, azure-mgmt-redis, azure-mgmt-relay, azure-mgmt-reservations, azure-mgmt-resource, azure-mgmt-scheduler, azure-mgmt-search, azure-mgmt-servermanager, azure-mgmt-servicebus, azure-mgmt-servicefabric, azure-mgmt-sql, azure-mgmt-storage, azure-mgmt-subscription, azure-mgmt-trafficmanager, azure-mgmt-web, azure-servicebus, azure-servicefabric, azure-servicemanagement-legacy, azure-storage-blob, azure-storage-common, azure-storage-file, azure-storage-queue +azure-cosmosdb-nspkg==2.0.2 # via azure-cosmosdb-table +azure-cosmosdb-table==1.0.2 # via azure +azure-datalake-store==0.0.18 # via azure +azure-eventgrid==0.1.0 # via azure +azure-graphrbac==0.40.0 # via azure +azure-keyvault==0.3.7 # via azure +azure-mgmt-advisor==1.0.1 # via azure-mgmt +azure-mgmt-applicationinsights==0.1.1 # via azure-mgmt +azure-mgmt-authorization==0.30.0 # via azure-mgmt +azure-mgmt-batch==5.0.0 # via azure-mgmt +azure-mgmt-batchai==0.2.0 # via azure-mgmt +azure-mgmt-billing==0.1.0 # via azure-mgmt +azure-mgmt-cdn==2.0.0 # via azure-mgmt +azure-mgmt-cognitiveservices==2.0.0 # via azure-mgmt +azure-mgmt-commerce==1.0.1 # via azure-mgmt +azure-mgmt-compute==3.0.1 # via azure-mgmt +azure-mgmt-consumption==2.0.0 # via azure-mgmt +azure-mgmt-containerinstance==0.3.1 # via azure-mgmt +azure-mgmt-containerregistry==1.0.1 # via azure-mgmt +azure-mgmt-containerservice==3.0.1 # via azure-mgmt +azure-mgmt-cosmosdb==0.3.1 # via azure-mgmt +azure-mgmt-datafactory==0.4.0 # via azure-mgmt +azure-mgmt-datalake-analytics==0.3.0 # via azure-mgmt +azure-mgmt-datalake-nspkg==2.0.0 # via azure-mgmt-datalake-analytics, azure-mgmt-datalake-store +azure-mgmt-datalake-store==0.3.0 # via azure-mgmt +azure-mgmt-devtestlabs==2.2.0 # via azure-mgmt +azure-mgmt-dns==1.2.0 # via azure-mgmt +azure-mgmt-eventgrid==0.4.0 # via azure-mgmt +azure-mgmt-eventhub==1.2.0 # via azure-mgmt +azure-mgmt-hanaonazure==0.1.0 # via azure-mgmt +azure-mgmt-iothub==0.4.0 # via azure-mgmt +azure-mgmt-iothubprovisioningservices==0.1.0 # via azure-mgmt +azure-mgmt-keyvault==0.40.0 # via azure-mgmt +azure-mgmt-loganalytics==0.1.0 # via azure-mgmt +azure-mgmt-logic==2.1.0 # via azure-mgmt +azure-mgmt-machinelearningcompute==0.4.0 # via azure-mgmt +azure-mgmt-managementpartner==0.1.0 # via azure-mgmt +azure-mgmt-marketplaceordering==0.1.0 # via azure-mgmt +azure-mgmt-media==0.2.0 # via azure-mgmt +azure-mgmt-monitor==0.4.0 # via azure-mgmt +azure-mgmt-msi==0.1.0 # via azure-mgmt +azure-mgmt-network==1.7.1 # via azure-mgmt +azure-mgmt-notificationhubs==1.0.0 # via azure-mgmt +azure-mgmt-nspkg==2.0.0 # via azure-mgmt-advisor, azure-mgmt-applicationinsights, azure-mgmt-authorization, azure-mgmt-batch, azure-mgmt-batchai, azure-mgmt-billing, azure-mgmt-cdn, azure-mgmt-cognitiveservices, azure-mgmt-commerce, azure-mgmt-compute, azure-mgmt-consumption, azure-mgmt-containerinstance, azure-mgmt-containerregistry, azure-mgmt-containerservice, azure-mgmt-cosmosdb, azure-mgmt-datafactory, azure-mgmt-datalake-nspkg, azure-mgmt-devtestlabs, azure-mgmt-dns, azure-mgmt-eventgrid, azure-mgmt-eventhub, azure-mgmt-hanaonazure, azure-mgmt-iothub, azure-mgmt-iothubprovisioningservices, azure-mgmt-keyvault, azure-mgmt-loganalytics, azure-mgmt-logic, azure-mgmt-machinelearningcompute, azure-mgmt-managementpartner, azure-mgmt-marketplaceordering, azure-mgmt-media, azure-mgmt-monitor, azure-mgmt-msi, azure-mgmt-network, azure-mgmt-notificationhubs, azure-mgmt-powerbiembedded, azure-mgmt-rdbms, azure-mgmt-recoveryservices, azure-mgmt-recoveryservicesbackup, azure-mgmt-redis, azure-mgmt-relay, azure-mgmt-reservations, azure-mgmt-resource, azure-mgmt-scheduler, azure-mgmt-search, azure-mgmt-servermanager, azure-mgmt-servicebus, azure-mgmt-servicefabric, azure-mgmt-sql, azure-mgmt-storage, azure-mgmt-subscription, azure-mgmt-trafficmanager, azure-mgmt-web +azure-mgmt-powerbiembedded==1.0.0 # via azure-mgmt +azure-mgmt-rdbms==0.1.0 # via azure-mgmt +azure-mgmt-recoveryservices==0.2.0 # via azure-mgmt +azure-mgmt-recoveryservicesbackup==0.1.1 # via azure-mgmt +azure-mgmt-redis==5.0.0 # via azure-mgmt +azure-mgmt-relay==0.1.0 # via azure-mgmt +azure-mgmt-reservations==0.1.0 # via azure-mgmt +azure-mgmt-resource==1.2.2 # via azure-mgmt +azure-mgmt-scheduler==1.1.3 # via azure-mgmt +azure-mgmt-search==1.0.0 # via azure-mgmt +azure-mgmt-servermanager==1.2.0 # via azure-mgmt +azure-mgmt-servicebus==0.4.0 # via azure-mgmt +azure-mgmt-servicefabric==0.1.0 # via azure-mgmt +azure-mgmt-sql==0.8.5 # via azure-mgmt +azure-mgmt-storage==1.5.0 # via azure-mgmt +azure-mgmt-subscription==0.1.0 # via azure-mgmt +azure-mgmt-trafficmanager==0.40.0 # via azure-mgmt +azure-mgmt-web==0.34.1 # via azure-mgmt +azure-mgmt==2.0.0 # via azure +azure-nspkg==2.0.0 # via azure-batch, azure-common, azure-cosmosdb-nspkg, azure-eventgrid, azure-graphrbac, azure-keyvault, azure-mgmt-nspkg, azure-servicebus, azure-servicefabric, azure-servicemanagement-legacy, azure-storage-nspkg +azure-servicebus==0.21.1 # via azure +azure-servicefabric==6.1.2.9 # via azure +azure-servicemanagement-legacy==0.20.6 # via azure +azure-storage-blob==1.1.0 # via azure +azure-storage-common==1.1.0 # via azure-cosmosdb-table, azure-storage-blob, azure-storage-file, azure-storage-queue +azure-storage-file==1.1.0 # via azure +azure-storage-nspkg==3.0.0 # via azure-storage-blob, azure-storage-common, azure-storage-file, azure-storage-queue +azure-storage-queue==1.1.0 # via azure +azure==3.0.0 +backports.functools-lru-cache==1.5 # via jaraco.functools backports.ssl-match-hostname==3.5.0.1 baron==0.6.6 # via redbaron billiard==3.3.0.23 # via celery -boto3==1.4.4 -boto==2.46.1 -botocore==1.5.72 # via boto3, s3transfer +boto3==1.6.2 +boto==2.47.0 +botocore==1.9.3 # via boto3, s3transfer celery==3.1.25 -#certifi==2018.1.18 # via msrest -cffi==1.10.0 # via cryptography +certifi==2018.1.18 # via msrest +cffi==1.11.5 # via azure-datalake-store, cryptography channels==1.1.8 -cliff==2.7.0 # via osc-lib, python-designateclient, python-neutronclient, python-openstackclient -cmd2==0.7.2 # via cliff constantly==15.1.0 # via twisted -cryptography==1.9 # via adal, azure-storage, pyopenssl, secretstorage, twilio +cryptography==2.1.4 # via adal, azure-cosmosdb-table, azure-storage-common, pyopenssl, requests, secretstorage daphne==1.3.0 -debtcollector==1.15.0 # via oslo.config, oslo.utils, python-designateclient, python-keystoneclient, python-neutronclient -decorator==4.0.11 # via shade defusedxml==0.4.1 # via python-saml -deprecation==1.0.1 # via openstacksdk django-auth-ldap==1.2.8 django-celery==3.2.2 -django-crum==0.7.1 -django-extensions==1.7.8 +django-crum==0.7.2 +django-extensions==2.0.0 django-jsonfield==1.0.1 django-oauth-toolkit==1.0.0 django-pglocks==1.0.2 -django-polymorphic==1.3 -django-radius==1.1.0 -django-solo==1.1.2 -django-split-settings==0.2.5 -django-taggit==0.22.1 -django==1.11.7 +django-polymorphic==2.0.2 +django-radius==1.3.3 +django-solo==1.1.3 +django-split-settings==0.3.0 +django-taggit==0.22.2 +django==1.11.10 djangorestframework-yaml==1.0.3 -djangorestframework==3.7.3 -#dm.xmlsec.binding==1.3.2 # via python-saml -#docutils==0.14 # via botocore -dogpile.cache==0.6.3 # via python-ironicclient, shade +djangorestframework==3.7.7 enum34==1.1.6 # via cryptography, msrest -funcsigs==1.0.2 # via debtcollector, oslo.utils functools32==3.2.3.post2 # via jsonschema -futures==3.1.1 # via azure-storage, requests-futures, s3transfer, shade -gevent-websocket==0.9.5 -gevent==1.2.2 # via gevent-websocket -greenlet==0.4.12 # via gevent -hyperlink==17.3.1 # via twisted -idna==2.5 # via cryptography, twilio +future==0.16.0 # via django-radius +futures==3.2.0 # via azure-cosmosdb-table, azure-datalake-store, azure-storage-blob, azure-storage-file, requests-futures, s3transfer +hyperlink==18.0.0 # via twisted +idna==2.6 # via cryptography, hyperlink, requests incremental==17.5.0 # via twisted inflect==0.2.5 # via jaraco.itertools -ipaddress==1.0.18 # via cryptography, shade -irc==15.1.1 -iso8601==0.1.11 # via keystoneauth1, oslo.utils, python-neutronclient, python-novaclient -isodate==0.5.4 # via msrest, python-saml -jaraco.classes==1.4.1 # via jaraco.collections -jaraco.collections==1.5.1 # via irc, jaraco.text -jaraco.functools==1.16 # via irc, jaraco.text -jaraco.itertools==2.0.1 # via irc -jaraco.logging==1.5 # via irc +ipaddress==1.0.19 # via cryptography +irc==16.2 +isodate==0.6.0 # via msrest, python-saml +jaraco.classes==1.4.3 # via jaraco.collections +jaraco.collections==1.5.2 # via irc, jaraco.text +jaraco.functools==1.17 # via irc, jaraco.text +jaraco.itertools==2.1.1 # via irc +jaraco.logging==1.5.1 # via irc jaraco.stream==1.1.2 # via irc jaraco.text==1.9.2 # via irc, jaraco.collections -jmespath==0.9.3 # via boto3, botocore, shade -jsonpatch==1.16 # via openstacksdk, shade, warlock -jsonpickle==0.9.5 # via asgi-amqp -jsonpointer==1.10 # via jsonpatch +jmespath==0.9.3 # via boto3, botocore +jsonpickle==0.9.6 # via asgi-amqp jsonschema==2.6.0 -keyring==10.3.3 # via msrestazure -keystoneauth1==2.21.0 # via openstacksdk, os-client-config, osc-lib, python-cinderclient, python-designateclient, python-glanceclient, python-ironicclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient, shade +keyring==11.0.0 # via msrestazure kombu==3.0.37 # via asgi-amqp, celery -lxml==3.8.0 # via dm.xmlsec.binding, pyvmomi -m2crypto==0.25.1 -markdown==2.6.7 -monotonic==1.3 # via oslo.utils -more-itertools==3.2.0 # via irc, jaraco.functools, jaraco.itertools -msgpack-python==0.4.8 # via asgi-amqp, oslo.serialization -msrest==0.4.10 # via azure-common, msrestazure -msrestazure==0.4.9 # via azure-common -munch==2.1.1 # via shade -netaddr==0.7.19 # via oslo.config, oslo.utils, pyrad, python-neutronclient -netifaces==0.10.6 # via oslo.utils, shade -oauthlib==2.0.2 # via requests-oauthlib, social-auth-core -openstacksdk==0.9.17 # via python-openstackclient +lxml==4.1.1 # via pyvmomi +m2crypto==0.29.0 +markdown==2.6.11 +more-itertools==4.1.0 # via irc, jaraco.functools, jaraco.itertools +msgpack-python==0.5.5 # via asgi-amqp +msrest==0.4.26 # via azure-datalake-store, azure-eventgrid, azure-servicefabric, msrestazure +msrestazure==0.4.22 # via azure-batch, azure-graphrbac, azure-keyvault, azure-mgmt-advisor, azure-mgmt-applicationinsights, azure-mgmt-authorization, azure-mgmt-batch, azure-mgmt-batchai, azure-mgmt-billing, azure-mgmt-cdn, azure-mgmt-cognitiveservices, azure-mgmt-commerce, azure-mgmt-compute, azure-mgmt-consumption, azure-mgmt-containerinstance, azure-mgmt-containerregistry, azure-mgmt-containerservice, azure-mgmt-cosmosdb, azure-mgmt-datafactory, azure-mgmt-datalake-analytics, azure-mgmt-datalake-store, azure-mgmt-devtestlabs, azure-mgmt-dns, azure-mgmt-eventgrid, azure-mgmt-eventhub, azure-mgmt-hanaonazure, azure-mgmt-iothub, azure-mgmt-iothubprovisioningservices, azure-mgmt-keyvault, azure-mgmt-loganalytics, azure-mgmt-logic, azure-mgmt-machinelearningcompute, azure-mgmt-managementpartner, azure-mgmt-marketplaceordering, azure-mgmt-media, azure-mgmt-monitor, azure-mgmt-msi, azure-mgmt-network, azure-mgmt-notificationhubs, azure-mgmt-powerbiembedded, azure-mgmt-rdbms, azure-mgmt-recoveryservices, azure-mgmt-recoveryservicesbackup, azure-mgmt-redis, azure-mgmt-relay, azure-mgmt-reservations, azure-mgmt-resource, azure-mgmt-scheduler, azure-mgmt-search, azure-mgmt-servermanager, azure-mgmt-servicebus, azure-mgmt-servicefabric, azure-mgmt-sql, azure-mgmt-storage, azure-mgmt-subscription, azure-mgmt-trafficmanager, azure-mgmt-web +netaddr==0.7.19 # via pyrad +oauthlib==2.0.6 # via django-oauth-toolkit, requests-oauthlib, social-auth-core ordereddict==1.1 -os-client-config==1.27.0 # via openstacksdk, osc-lib, python-neutronclient, shade -osc-lib==1.6.0 # via python-designateclient, python-ironicclient, python-neutronclient, python-openstackclient -oslo.config==4.6.0 # via python-keystoneclient -oslo.i18n==3.15.3 # via osc-lib, oslo.config, oslo.utils, python-cinderclient, python-glanceclient, python-ironicclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient -oslo.serialization==2.18.0 # via python-ironicclient, python-keystoneclient, python-neutronclient, python-novaclient -oslo.utils==3.26.0 # via osc-lib, oslo.serialization, python-cinderclient, python-designateclient, python-glanceclient, python-ironicclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient -pbr==3.1.1 # via cliff, debtcollector, keystoneauth1, openstacksdk, osc-lib, oslo.i18n, oslo.serialization, oslo.utils, positional, python-cinderclient, python-designateclient, python-glanceclient, python-ironicclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient, requestsexceptions, shade, stevedore +pathlib2==2.3.0 # via azure-datalake-store pexpect==4.4.0 -positional==1.1.1 # via keystoneauth1, python-keystoneclient -prettytable==0.7.2 # via cliff, python-cinderclient, python-glanceclient, python-ironicclient, python-novaclient psphere==0.5.2 -psutil==5.2.2 +psutil==5.4.3 psycopg2==2.7.3.2 ptyprocess==0.5.2 # via pexpect -pyasn1-modules==0.0.9 # via service-identity -pyasn1==0.2.3 # via pyasn1-modules, service-identity -pycparser==2.17 # via cffi +pyasn1-modules==0.2.1 # via service-identity +pyasn1==0.4.2 # via pyasn1-modules, service-identity +pycparser==2.18 # via cffi pycrypto==2.6.1 -pygerduty==0.35.2 -pyjwt==1.5.0 # via adal, social-auth-core, twilio -pyopenssl==17.0.0 +pygerduty==0.37.0 +pyjwt==1.6.0 # via adal, social-auth-core, twilio +pyopenssl==17.5.0 pyparsing==2.2.0 pyrad==2.1 # via django-radius -python-cinderclient==2.2.0 # via python-openstackclient, shade -python-dateutil==2.6.0 # via adal, azure-storage, botocore -python-designateclient==2.6.0 # via shade -python-glanceclient==2.7.0 # via python-openstackclient -python-ironicclient==1.13.0 # via shade -python-keystoneclient==3.11.0 # via python-neutronclient, python-openstackclient, shade -python-ldap==2.4.39 # via django-auth-ldap +python-dateutil==2.6.1 # via adal, azure-cosmosdb-table, azure-storage-common, botocore +python-ldap==2.5.2 # via django-auth-ldap python-logstash==0.4.6 -python-memcached==1.58 -python-neutronclient==6.3.0 # via shade -python-novaclient==9.0.1 # via python-openstackclient, shade +python-memcached==1.59 python-openid==2.2.5 # via social-auth-core -python-openstackclient==3.11.0 # via python-ironicclient python-radius==1.0 -python-saml==2.2.1 -pytz==2017.3 # via babel, celery, django, irc, oslo.serialization, oslo.utils, tempora, twilio +python-saml==2.2.2 +pytz==2018.3 # via celery, django, irc, tempora, twilio pyvmomi==6.5 -pyyaml==3.12 # via cliff, djangorestframework-yaml, os-client-config, oslo.config, psphere, python-ironicclient +pyyaml==3.12 # via djangorestframework-yaml, psphere redbaron==0.6.3 requests-futures==0.9.7 requests-oauthlib==0.8.0 # via msrest, social-auth-core -requests==2.14.2 # via adal, apache-libcloud, azure-servicebus, azure-servicemanagement-legacy, azure-storage, keystoneauth1, msrest, python-designateclient, python-glanceclient, python-ironicclient, python-keystoneclient, python-neutronclient, pyvmomi, requests-futures, requests-oauthlib, slackclient, social-auth-core, twilio -requestsexceptions==1.2.0 # via os-client-config, shade -rfc3986==1.0.0 # via oslo.config -rply==0.7.4 # via baron -s3transfer==0.1.10 # via boto3 +requests[security]==2.15.1 +rply==0.7.5 # via baron +s3transfer==0.1.13 # via boto3 +scandir==1.7 # via pathlib2 secretstorage==2.3.1 # via keyring -service-identity==16.0.0 -shade==1.20.0 -simplejson==3.11.1 # via osc-lib, python-cinderclient, python-neutronclient, python-novaclient -six==1.10.0 # via asgi-amqp, asgiref, autobahn, automat, cliff, cmd2, cryptography, debtcollector, django-extensions, irc, jaraco.classes, jaraco.collections, jaraco.itertools, jaraco.logging, jaraco.stream, keystoneauth1, more-itertools, munch, openstacksdk, osc-lib, oslo.config, oslo.i18n, oslo.serialization, oslo.utils, pygerduty, pyopenssl, pyrad, python-cinderclient, python-dateutil, python-designateclient, python-glanceclient, python-ironicclient, python-keystoneclient, python-memcached, python-neutronclient, python-novaclient, python-openstackclient, pyvmomi, shade, slackclient, social-auth-app-django, social-auth-core, stevedore, tacacs-plus, tempora, twilio, txaio, warlock, websocket-client -slackclient==1.0.6 -social-auth-app-django==2.0.0 -social-auth-core==1.5.0 -stevedore==1.23.0 # via cliff, keystoneauth1, openstacksdk, osc-lib, oslo.config, python-designateclient, python-keystoneclient +service-identity==17.0.0 +six==1.11.0 # via asgi-amqp, asgiref, autobahn, automat, cryptography, django-extensions, irc, isodate, jaraco.classes, jaraco.collections, jaraco.itertools, jaraco.logging, jaraco.stream, more-itertools, pathlib2, pygerduty, pyopenssl, pyrad, python-dateutil, python-memcached, pyvmomi, slackclient, social-auth-app-django, social-auth-core, tacacs-plus, tempora, twilio, txaio, websocket-client +slackclient==1.1.2 +social-auth-app-django==2.1.0 +social-auth-core==1.7.0 suds==0.4 # via psphere tacacs_plus==1.0 -tempora==1.7 # via irc, jaraco.logging -twilio==6.1.0 -twisted==17.9.0 -txaio==2.8.2 # via autobahn -typing==3.6.2 # via m2crypto -unicodecsv==0.14.1 # via cliff -uwsgi==2.0.14 -warlock==1.2.0 # via python-glanceclient -websocket-client==0.44.0 # via slackclient -wrapt==1.10.10 # via debtcollector, positional, python-glanceclient +tempora==1.10 # via irc, jaraco.logging +twilio==6.10.4 +twisted==17.9.0 # via daphne +txaio==2.9.0 # via autobahn +typing==3.6.4 # via django-extensions, m2crypto +uwsgi==2.0.17 +websocket-client==0.47.0 # via slackclient xmltodict==0.11.0 zope.interface==4.4.3 # via twisted diff --git a/requirements/requirements_ansible.in b/requirements/requirements_ansible.in index e59e54c92c..54ec18470b 100644 --- a/requirements/requirements_ansible.in +++ b/requirements/requirements_ansible.in @@ -1,30 +1,34 @@ -apache-libcloud==2.0.0 +apache-libcloud==2.2.1 # azure deps from https://github.com/ansible/ansible/blob/fe1153c0afa1ffd648147af97454e900560b3532/packaging/requirements/requirements-azure.txt -azure-mgmt-compute>=2.0.0,<3 +azure-mgmt-compute>=2.0.0,<3 # Taken from Ansible core module requirements azure-mgmt-network>=1.3.0,<2 -azure-mgmt-storage>=1.2.0,<2 +azure-mgmt-storage>=1.5.0,<2 azure-mgmt-resource>=1.1.0,<2 azure-storage>=0.35.1,<0.36 azure-cli-core>=2.0.12,<3 +msrest!=0.4.15 msrestazure>=0.4.11,<0.5 azure-mgmt-dns>=1.0.1,<2 azure-mgmt-keyvault>=0.40.0,<0.41 azure-mgmt-batch>=4.1.0,<5 azure-mgmt-sql>=0.7.1,<0.8 azure-mgmt-web>=0.32.0,<0.33 -azure-mgmt-containerservice>=1.0.0 +azure-mgmt-containerservice>=2.0.0,<3.0.0 +azure-mgmt-containerregistry>=1.0.1 +azure-mgmt-rdbms>=0.2.0rc1,<0.3.0 +azure-mgmt-containerinstance>=0.3.1 backports.ssl-match-hostname==3.5.0.1 -kombu==3.0.37 -boto==2.46.1 -boto3==1.4.4 -ovirt-engine-sdk-python==4.1.6 -python-memcached==1.58 +boto==2.47.0 # last which does not break ec2 scripts +boto3==1.6.2 +ovirt-engine-sdk-python==4.2.4 # minimum set inside Ansible facts module requirements +python-memcached==1.59 # same as AWX requirement psphere==0.5.2 -psutil==5.2.2 +psutil==5.4.3 # same as AWX requirement pyvmomi==6.5 -pywinrm[kerberos]==0.2.2 +pywinrm[kerberos]==0.3.0 requests<2.16 # Older versions rely on certify +requests-credssp==0.1.0 # For windows authentication awx/issues/1144 secretstorage==2.3.1 -shade==1.20.0 +shade==1.27.0 setuptools==36.0.1 pip==9.0.1 diff --git a/requirements/requirements_ansible.txt b/requirements/requirements_ansible.txt index 944b95f72a..a986e48cef 100644 --- a/requirements/requirements_ansible.txt +++ b/requirements/requirements_ansible.txt @@ -4,124 +4,101 @@ # # pip-compile --output-file requirements/requirements_ansible.txt requirements/requirements_ansible.in # -adal==0.4.7 # via azure-cli-core, msrestazure -amqp==1.4.9 # via kombu -anyjson==0.3.3 # via kombu -apache-libcloud==2.0.0 -appdirs==1.4.3 # via os-client-config, python-ironicclient, setuptools -applicationinsights==0.11.0 # via azure-cli-core -argcomplete==1.9.2 # via azure-cli-core -asn1crypto==0.22.0 # via cryptography -azure-cli-core==2.0.15 +adal==0.5.0 # via azure-cli-core, msrestazure +apache-libcloud==2.2.1 +appdirs==1.4.3 # via openstacksdk, os-client-config +applicationinsights==0.11.1 # via azure-cli-core +argcomplete==1.9.4 # via azure-cli-core, knack +asn1crypto==0.24.0 # via cryptography +azure-cli-core==2.0.28 azure-cli-nspkg==3.0.1 # via azure-cli-core -azure-common==1.1.8 # via azure-mgmt-batch, azure-mgmt-compute, azure-mgmt-containerservice, azure-mgmt-dns, azure-mgmt-keyvault, azu +azure-common==1.1.8 # via azure-mgmt-batch, azure-mgmt-compute, azure-mgmt-containerinstance, azure-mgmt-containerregistry, azure-mgmt-containerservice, azure-mgmt-dns, azure-mgmt-keyvault, azure-mgmt-network, azure-mgmt-rdbms, azure-mgmt-resource, azure-mgmt-sql, azure-mgmt-storage, azure-mgmt-web, azure-storage azure-mgmt-batch==4.1.0 azure-mgmt-compute==2.1.0 -azure-mgmt-containerservice==1.0.0 -azure-mgmt-dns==1.0.1 +azure-mgmt-containerinstance==0.3.1 +azure-mgmt-containerregistry==1.0.1 +azure-mgmt-containerservice==2.0.0 +azure-mgmt-dns==1.2.0 azure-mgmt-keyvault==0.40.0 -azure-mgmt-network==1.4.0 -azure-mgmt-nspkg==2.0.0 # via azure-mgmt-batch, azure-mgmt-compute, azure-mgmt-containerservice, azure-mgmt-dns, azure-mgmt-keyvault, azu -azure-mgmt-resource==1.1.0 +azure-mgmt-network==1.7.1 +azure-mgmt-nspkg==2.0.0 # via azure-mgmt-batch, azure-mgmt-compute, azure-mgmt-containerinstance, azure-mgmt-containerregistry, azure-mgmt-containerservice, azure-mgmt-dns, azure-mgmt-keyvault, azure-mgmt-network, azure-mgmt-rdbms, azure-mgmt-resource, azure-mgmt-sql, azure-mgmt-storage, azure-mgmt-web +azure-mgmt-rdbms==0.2.0rc1 +azure-mgmt-resource==1.2.2 azure-mgmt-sql==0.7.1 -azure-mgmt-storage==1.2.1 +azure-mgmt-storage==1.5.0 azure-mgmt-web==0.32.0 azure-nspkg==2.0.0 # via azure-cli-nspkg, azure-common, azure-mgmt-nspkg, azure-storage azure-storage==0.35.1 -babel==2.3.4 # via osc-lib, oslo.i18n, python-cinderclient, python-glanceclient, python-neutronclient, python-novaclient, python-openstackclient backports.ssl-match-hostname==3.5.0.1 -boto3==1.4.4 -boto==2.46.1 -botocore==1.5.72 # via boto3, s3transfer -certifi==2017.4.17 # via msrest -cffi==1.10.0 # via cryptography -cliff==2.7.0 # via osc-lib, python-designateclient, python-neutronclient, python-openstackclient -cmd2==0.7.2 # via cliff -colorama==0.3.9 # via azure-cli-core -cryptography==2.0.3 # via adal, azure-storage, paramiko, pyopenssl, secretstorage -debtcollector==1.15.0 # via oslo.config, oslo.utils, python-designateclient, python-keystoneclient, python-neutronclient -decorator==4.0.11 # via shade -deprecation==1.0.1 # via openstacksdk -#docutils==0.12 # via botocore -dogpile.cache==0.6.3 # via python-ironicclient, shade -enum34==1.1.6 # via cryptography, msrest, ovirt-engine-sdk-python -funcsigs==1.0.2 # via debtcollector, oslo.utils -functools32==3.2.3.post2 # via jsonschema -futures==3.1.1 # via azure-storage, s3transfer, shade -humanfriendly==4.4.1 # via azure-cli-core -idna==2.5 # via cryptography -ipaddress==1.0.18 # via cryptography, shade -iso8601==0.1.11 # via keystoneauth1, oslo.utils, python-neutronclient, python-novaclient -isodate==0.5.4 # via msrest -jmespath==0.9.3 # via boto3, botocore, shade -jsonpatch==1.16 # via openstacksdk, shade, warlock -jsonpointer==1.10 # via jsonpatch -jsonschema==2.6.0 # via python-designateclient, python-ironicclient, warlock -keyring==10.3.3 # via msrestazure -keystoneauth1==2.21.0 # via openstacksdk, os-client-config, osc-lib, python-cinderclient, python-designateclient, python-glanceclient, python-ironicclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient, shade -kombu==3.0.37 -lxml==3.8.0 # via pyvmomi -monotonic==1.3 # via oslo.utils -msgpack-python==0.4.8 # via oslo.serialization -msrest==0.4.14 # via azure-cli-core, msrestazure -msrestazure==0.4.13 -munch==2.1.1 # via shade -netaddr==0.7.19 # via oslo.config, oslo.utils, python-neutronclient -netifaces==0.10.6 # via oslo.utils, shade -ntlm-auth==1.0.4 # via requests-ntlm -oauthlib==2.0.2 # via requests-oauthlib -openstacksdk==0.9.17 # via python-openstackclient -ordereddict==1.1 # via ntlm-auth -os-client-config==1.27.0 # via openstacksdk, osc-lib, python-neutronclient, shade -osc-lib==1.6.0 # via python-designateclient, python-ironicclient, python-neutronclient, python-openstackclient -oslo.config==4.6.0 # via python-keystoneclient -oslo.i18n==3.15.3 # via osc-lib, oslo.config, oslo.utils, python-cinderclient, python-glanceclient, python-ironicclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient -oslo.serialization==2.18.0 # via python-ironicclient, python-keystoneclient, python-neutronclient, python-novaclient -oslo.utils==3.26.0 # via osc-lib, oslo.serialization, python-cinderclient, python-designateclient, python-glanceclient, python-ironicclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient -ovirt-engine-sdk-python==4.1.6 -packaging==16.8 # via setuptools -pbr==3.1.1 # via cliff, debtcollector, keystoneauth1, openstacksdk, osc-lib, oslo.i18n, oslo.serialization, oslo.utils, positional, python-cinderclient, python-designateclient, python-glanceclient, python-ironicclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient, requestsexceptions, shade, stevedore -positional==1.1.1 # via keystoneauth1, python-keystoneclient -prettytable==0.7.2 # via cliff, python-cinderclient, python-glanceclient, python-ironicclient, python-novaclient +bcrypt==3.1.4 # via paramiko +boto3==1.6.2 +boto==2.47.0 +botocore==1.9.3 # via boto3, s3transfer +certifi==2018.1.18 # via msrest +cffi==1.11.5 # via bcrypt, cryptography, pynacl +colorama==0.3.9 # via azure-cli-core, knack +cryptography==2.1.4 # via adal, azure-storage, paramiko, pyopenssl, requests-kerberos, requests-ntlm, secretstorage +decorator==4.2.1 # via openstacksdk +deprecation==2.0 # via openstacksdk +dogpile.cache==0.6.5 # via openstacksdk +enum34==1.1.6 # via cryptography, knack, msrest, ovirt-engine-sdk-python +futures==3.2.0 # via openstacksdk, s3transfer +humanfriendly==4.8 # via azure-cli-core +idna==2.6 # via cryptography +ipaddress==1.0.19 # via cryptography, openstacksdk +iso8601==0.1.12 # via keystoneauth1, openstacksdk +isodate==0.6.0 # via msrest +jmespath==0.9.3 # via azure-cli-core, boto3, botocore, knack, openstacksdk +jsonpatch==1.21 # via openstacksdk +jsonpointer==2.0 # via jsonpatch +keyring==11.0.0 # via msrestazure +keystoneauth1==3.4.0 # via openstacksdk, os-client-config +knack==0.3.1 # via azure-cli-core +lxml==4.1.1 # via pyvmomi +monotonic==1.4 # via humanfriendly +msrest==0.4.26 +msrestazure==0.4.22 +munch==2.2.0 # via openstacksdk +netifaces==0.10.6 # via openstacksdk +ntlm-auth==1.0.6 # via requests-credssp, requests-ntlm +oauthlib==2.0.6 # via requests-oauthlib +openstacksdk==0.12.0 # via shade +os-client-config==1.29.0 # via shade +os-service-types==1.2.0 # via openstacksdk +ovirt-engine-sdk-python==4.2.4 +packaging==17.1 # via deprecation +paramiko==2.4.0 # via azure-cli-core +pbr==3.1.1 # via keystoneauth1, openstacksdk, os-service-types, shade, stevedore psphere==0.5.2 -psutil==5.2.2 -pycparser==2.17 # via cffi -pygments==2.2.0 # via azure-cli-core -pyjwt==1.5.2 # via adal, azure-cli-core -pykerberos==1.1.14 # via requests-kerberos -pyopenssl==17.2.0 # via azure-cli-core, python-glanceclient, pyvmomi -pyparsing==2.2.0 # via cliff, cmd2, oslo.utils, packaging -python-cinderclient==2.2.0 # via python-openstackclient, shade -python-dateutil==2.6.0 # via adal, azure-storage, botocore -python-designateclient==2.6.0 # via shade -python-glanceclient==2.7.0 # via python-openstackclient -python-ironicclient==1.13.0 # via shade -python-keystoneclient==3.11.0 # via python-neutronclient, python-openstackclient, shade -python-memcached==1.58 -python-neutronclient==6.3.0 # via shade -python-novaclient==9.0.1 # via python-openstackclient, shade -python-openstackclient==3.11.0 # via python-ironicclient -pytz==2017.2 # via babel, oslo.serialization, oslo.utils +psutil==5.4.3 +pyasn1==0.4.2 # via paramiko +pycparser==2.18 # via cffi +pycurl==7.43.0.1 # via ovirt-engine-sdk-python +pygments==2.2.0 # via azure-cli-core, knack +pyjwt==1.6.0 # via adal, azure-cli-core +pykerberos==1.2.1 # via requests-kerberos +pynacl==1.2.1 # via paramiko +pyopenssl==17.5.0 # via azure-cli-core, pyvmomi, requests-credssp +pyparsing==2.2.0 # via packaging +python-dateutil==2.6.1 # via adal, azure-storage, botocore +python-memcached==1.59 pyvmomi==6.5 -pywinrm[kerberos]==0.2.2 -pyyaml==3.12 # via cliff, os-client-config, oslo.config, psphere, python-ironicclient -requests-kerberos==0.11.0 # via pywinrm -requests-ntlm==1.0.0 # via pywinrm +pywinrm[kerberos]==0.3.0 +pyyaml==3.12 # via azure-cli-core, knack, openstacksdk, os-client-config, psphere +requests-credssp==0.1.0 +requests-kerberos==0.12.0 # via pywinrm +requests-ntlm==1.1.0 # via pywinrm requests-oauthlib==0.8.0 # via msrest -requests==2.14.2 # via adal, apache-libcloud, azure-servicebus, azure-servicemanagement-legacy, azure-storage, keystoneauth1, msrest, python-designateclient, python-glanceclient, python-ironicclient, python-keystoneclient, python-neutronclient, pyvmomi, pywinrm, requests-kerberos, requests-ntlm, requests-oauthlib -requestsexceptions==1.2.0 # via os-client-config, shade -rfc3986==1.0.0 # via oslo.config -s3transfer==0.1.10 # via boto3 +requests==2.15.1 +requestsexceptions==1.4.0 # via openstacksdk, os-client-config +s3transfer==0.1.13 # via boto3 secretstorage==2.3.1 -shade==1.20.0 -simplejson==3.11.1 # via osc-lib, python-cinderclient, python-neutronclient, python-novaclient -six==1.10.0 # via cliff, cmd2, cryptography, debtcollector, keystoneauth1, munch, ntlm-auth, openstacksdk, osc-lib, oslo.config, oslo.i18n, oslo.serialization, oslo.utils, ovirt-engine-sdk-python, packaging, pyopenssl, python-cinderclient, python-dateutil, python-designateclient, python-glanceclient, python-ironicclient, python-keystoneclient, python-memcached, python-neutronclient, python-novaclient, python-openstackclient, pyvmomi, pywinrm, setuptools, shade, stevedore, warlock -stevedore==1.23.0 # via cliff, keystoneauth1, openstacksdk, osc-lib, oslo.config, python-designateclient, python-keystoneclient +shade==1.27.0 +six==1.11.0 # via azure-cli-core, bcrypt, cryptography, isodate, keystoneauth1, knack, munch, ntlm-auth, openstacksdk, ovirt-engine-sdk-python, packaging, pynacl, pyopenssl, python-dateutil, python-memcached, pyvmomi, pywinrm, stevedore +stevedore==1.28.0 # via keystoneauth1 suds==0.4 # via psphere -tabulate==0.7.7 # via azure-cli-core -unicodecsv==0.14.1 # via cliff -warlock==1.2.0 # via python-glanceclient -wrapt==1.10.10 # via debtcollector, positional, python-glanceclient +tabulate==0.7.7 # via azure-cli-core, knack +wheel==0.30.0 # via azure-cli-core xmltodict==0.11.0 # via pywinrm # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/requirements_isolated.txt b/requirements/requirements_isolated.txt index 7d538cdd0f..595ef46e3c 100644 --- a/requirements/requirements_isolated.txt +++ b/requirements/requirements_isolated.txt @@ -1,3 +1,3 @@ -psutil==5.2.2 -pexpect==4.2.1 +psutil==5.4.3 # same as AWX requirement +pexpect==4.4.0 # same as AWX requirement python-daemon==2.1.2 From 2861397433438c309adc99ef465662ee800f4d89 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Thu, 8 Mar 2018 09:38:48 -0500 Subject: [PATCH 4/5] Set imagePullPolicy to Always Not sure why we werent doing this before. --- installer/kubernetes/templates/deployment.yml.j2 | 2 ++ installer/openshift/templates/deployment.yml.j2 | 2 ++ 2 files changed, 4 insertions(+) diff --git a/installer/kubernetes/templates/deployment.yml.j2 b/installer/kubernetes/templates/deployment.yml.j2 index d6f0beb19d..00db600273 100644 --- a/installer/kubernetes/templates/deployment.yml.j2 +++ b/installer/kubernetes/templates/deployment.yml.j2 @@ -15,6 +15,7 @@ spec: containers: - name: awx-web image: {{ awx_web_kubernetes_image }} + imagePullPolicy: Always ports: - containerPort: 8052 volumeMounts: @@ -22,6 +23,7 @@ spec: name: awx-application-config - name: awx-celery image: {{ awx_task_kubernetes_image }} + imagePullPolicy: Always volumeMounts: - mountPath: /etc/tower name: awx-application-config diff --git a/installer/openshift/templates/deployment.yml.j2 b/installer/openshift/templates/deployment.yml.j2 index 130a3951e2..93a9c6cb8c 100644 --- a/installer/openshift/templates/deployment.yml.j2 +++ b/installer/openshift/templates/deployment.yml.j2 @@ -15,6 +15,7 @@ spec: containers: - name: awx-web image: {{ awx_web_openshift_image }} + imagePullPolicy: Always ports: - containerPort: 8052 volumeMounts: @@ -22,6 +23,7 @@ spec: name: awx-application-config - name: awx-celery image: {{ awx_task_openshift_image }} + imagePullPolicy: Always volumeMounts: - mountPath: /etc/tower name: awx-application-config From 02102f5ba8e722575be9608e483e6e24d493344c Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Thu, 8 Mar 2018 09:40:02 -0500 Subject: [PATCH 5/5] Fix container boots on AppArmor protected systems Link https://github.com/ansible/awx/issues/1297 Signed-off-by: Shane McDonald --- installer/image_build/files/nginx.conf | 3 --- installer/image_build/templates/Dockerfile.j2 | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/installer/image_build/files/nginx.conf b/installer/image_build/files/nginx.conf index 3746e869de..2b2defd056 100644 --- a/installer/image_build/files/nginx.conf +++ b/installer/image_build/files/nginx.conf @@ -2,7 +2,6 @@ worker_processes 1; -error_log /dev/stdout warn; pid /tmp/nginx.pid; events { @@ -17,8 +16,6 @@ http { '$status $body_bytes_sent "$http_referer" ' '"$http_user_agent" "$http_x_forwarded_for"'; - access_log /dev/stdout main; - map $http_upgrade $connection_upgrade { default upgrade; '' close; diff --git a/installer/image_build/templates/Dockerfile.j2 b/installer/image_build/templates/Dockerfile.j2 index ab3db53490..13b9f25617 100644 --- a/installer/image_build/templates/Dockerfile.j2 +++ b/installer/image_build/templates/Dockerfile.j2 @@ -55,6 +55,9 @@ RUN chmod +rx /usr/bin/launch_awx.sh && chmod +rx /usr/bin/launch_awx_task.sh && ADD settings.py /etc/tower/settings.py RUN chmod g+w /etc/passwd RUN chmod -R 777 /var/log/nginx && chmod -R 777 /var/lib/nginx +VOLUME /var/lib/nginx +RUN ln -sf /dev/stdout /var/log/nginx/access.log \ + && ln -sf /dev/stderr /var/log/nginx/error.log USER 1000 EXPOSE 8052 WORKDIR /var/lib/awx