Commit Graph

19417 Commits

Author SHA1 Message Date
Will Thames
b899096f99 Use use-context to set Kubernetes context
`kubectl config use-context` is the command to set the current context,
not `set-context`

Signed-off-by: Will Thames <will@thames.id.au>
2018-06-06 13:02:26 +10:00
chris meyers
b876c2af62 add total job count for instance + instance group 2018-06-05 12:05:22 -04:00
Dmytro Makovey
adaa164a19 allow nginx config extension 2018-06-05 08:16:08 -07:00
Matthew Jones
ba997f924e Merge pull request #2055 from matburt/remove_logstash
Remove the logstash container from the base dev docker compose
2018-06-05 09:55:48 -04:00
Matthew Jones
22dd6ddfea Remove the logstash container from the base dev docker compose
Now with less java running while you code!
2018-06-05 09:42:38 -04:00
Yunfan Zhang
c055666a9f Merge pull request #2035 from YunfanZhang42/release_3.3.0
Added awx-manage command for expiring sessions.
2018-06-05 09:36:37 -04:00
Wayne Witzel III
b0d1ba4861 Merge pull request #2054 from wwitzel3/release_3.3.0
Only duplicate nodes if original WFJT is not available
2018-06-05 09:22:41 -04:00
Yunfan Zhang
d8cb47bf82 Added awx-manage command for expiring sessions. 2018-06-05 09:18:55 -04:00
Wayne Witzel III
7affa15efe Only duplicate nodes if original WFJT is not available 2018-06-05 13:08:06 +00:00
Alan Rominger
88051cc9fc Merge pull request #2045 from AlanCoding/can_see_all_teams
Show org-admins all teams if ALL USERS setting enabled
2018-06-05 08:39:59 -04:00
AlanCoding
74c6c350a1 show org-admins all teams if ALL USERS setting enabled 2018-06-05 07:55:13 -04:00
Alan Rominger
d250b89f47 Merge pull request #2041 from AlanCoding/lazy_passwords
No launch config errors with replacable ASK credential
2018-06-05 07:49:43 -04:00
John Mitchell
e480639699 Merge pull request #2044 from jlmitch5/fixInvSourceNotifSearch
fix notifications search on inventory source form tab
2018-06-04 17:55:54 -04:00
John Mitchell
8bd801fd07 make sure instances list is always ordered 2018-06-04 17:53:08 -04:00
John Mitchell
5c874c6b3d fix wrapping issue for instances list 2018-06-04 17:36:30 -04:00
Yunfan Zhang
4fe7c9ea42 Merge pull request #1953 from YunfanZhang42/devel
Let create_oauth2_token print errors from std_err.
2018-06-04 16:42:44 -04:00
Ryan Petrello
bfb8e97a9d Merge pull request #2051 from ryanpetrello/space-for
fix a setting help text typo
2018-06-04 16:31:13 -04:00
Ryan Petrello
97fc745329 fix a setting help text typo 2018-06-04 16:28:26 -04:00
Yunfan Zhang
64b612921d Merge branch 'devel' into devel 2018-06-04 15:54:23 -04:00
Yunfan Zhang
9945a3bc64 Added an awx-manage command for generating OAuth2 token. 2018-06-04 15:49:04 -04:00
Ryan Petrello
5ceeb020cf Merge pull request #2048 from ryanpetrello/how-do-you-say-violet-in-french
fix an i18n-related bug that affects non-English hipchat users
2018-06-04 15:26:15 -04:00
Ryan Petrello
581756527e fix an i18n-related bug that affects non-English hipchat users
see: https://github.com/ansible/tower/issues/951
2018-06-04 15:02:27 -04:00
Chris Meyers
899084fa75 Merge pull request #1922 from chrismeyersfsu/improvement-accurate_capacity
per-instance accurate capacity consumption
2018-06-04 14:36:58 -04:00
John Mitchell
f9ed4296bb fix notifications search on inventory source form tab 2018-06-04 13:51:49 -04:00
John Mitchell
d2858e2d0e Merge pull request #2016 from jlmitch5/appTabOrgAdmin
make app tab visiable to org admins
2018-06-04 12:04:16 -04:00
AlanCoding
648ec3141b no launch config errors with replacable ASK credential 2018-06-04 11:19:22 -04:00
Christian Adams
17bc2a42ab Merge pull request #2040 from rooftopcellist/oauth2_doc_clean
updates oauth docs with quickstart
2018-06-04 11:14:18 -04:00
adamscmRH
d885d0fe22 updates oauth docs with quickstart 2018-06-04 10:57:18 -04:00
chris meyers
7b0b4f562d get isolated execution at the point its needed
* Instead of passing around the isolated host that the task is to
execute on; grab the isolated execution host from the instance further
down the call stack. Without passing the isolated hostname around.
2018-06-04 10:06:59 -04:00
chris meyers
b94cf379f6 do not choose offline instances 2018-06-04 10:06:59 -04:00
chris meyers
9d732cdbdf update unit and functional tests 2018-06-04 10:06:59 -04:00
chris meyers
9863fe71dc do not require privileged iso container
* The init call w/ privileged was causing my laptop to wig out. This
changeset still functions w/ out requiring privileged access.
2018-06-04 10:06:59 -04:00
chris meyers
8d352a4edf conform isolated system to new early node choice
* Randomly chose an instance in the controller instance group for which
to control the isolated node run. Note the chosen instance via a job
controller_node field
2018-06-04 10:06:59 -04:00
chris meyers
e720fe5dd0 decide the node a job will run early
* Deciding the Instance that a Job runs on at celery task run-time makes
it hard to evenly distribute tasks among Instnaces. Instead, the task
manager will look at the world of running jobs and choose an instance
node to run on; applying a deterministic job distribution algo.
2018-06-04 10:06:59 -04:00
Alan Rominger
f394c02afd Merge pull request #2013 from AlanCoding/big_trouble_in_0013
Fix tracebacks when running migrations
2018-06-04 09:51:44 -04:00
AlanCoding
239c60a2bd fix tracebacks when running migrations 2018-06-04 07:35:35 -04:00
Bill Nottingham
7ef32a8827 Merge pull request #2037 from wenottingham/tower-inv-fix
Fix syntax error
2018-06-02 12:07:00 -04:00
Bill Nottingham
427ea6752e Fix syntax error 2018-06-01 22:25:46 -04:00
Christian Adams
69a507ae19 Merge pull request #2008 from rooftopcellist/default_scope
Default scope
2018-06-01 13:43:11 -04:00
adamscmRH
97c5ff0b33 make scope write by default 2018-06-01 13:24:32 -04:00
Jake McDermott
b7bb80c79f Merge pull request #2020 from sangongs/fix_failed_badge_color
Fix the color of the tips badge for failed hosts in the host status bar
2018-06-01 11:38:10 -04:00
Guoqiang Zhang
7aa2b7f6a7 Fix the color of the tips badge for failed hosts in the host status bar 2018-06-01 10:25:41 -04:00
Ryan Petrello
330691f4a2 Merge pull request #2019 from ryanpetrello/back-to-the-future
fix a failing timezone test
2018-06-01 10:14:22 -04:00
Marliana Lara
7a997f0615 Merge pull request #2015 from marshmalien/fix/1970-1885-scheduler-bugs
Fix invalid schedule warning and disable save button
2018-06-01 10:04:29 -04:00
Ryan Petrello
6183e5166d fix a failing timezone test 2018-06-01 09:51:42 -04:00
Alan Rominger
a4efd0a5d2 Merge pull request #2005 from AlanCoding/dep_oauth
Make our oauth model creation a dependency of other app
2018-06-01 09:35:07 -04:00
Ryan Petrello
8c5f3404bf Merge pull request #2006 from ryanpetrello/port-jinja2-always
allow Jinja2 in ansible -a when ALLOW_JINJA_IN_EXTRA_VARS is 'always'
2018-06-01 07:32:48 -04:00
Jared Tabor
e2d3a7be26 Merge pull request #1999 from jaredevantabor/fix-1927
Fixes URL used for root groups for pagination purposes
2018-05-31 14:14:49 -07:00
Jared Tabor
7549d85619 Merge pull request #2001 from jaredevantabor/fix-741
Marking a Configure Tower string for translation
2018-05-31 14:06:06 -07:00
John Mitchell
a20eaae7bc make app tab visiable to org admins 2018-05-31 17:02:51 -04:00