Commit Graph

12237 Commits

Author SHA1 Message Date
Greg Considine 377b55dd2f Fix typo in reference to 2017-03-14 14:51:20 -04:00
Ryan Petrello ba9ce56c35 add callback plugin tests to CI 2017-03-14 14:07:56 -04:00
Ryan Petrello 66c786b971 simplify memcache patching in our callback plugin tests 2017-03-14 14:07:53 -04:00
jaredevantabor 081a545158 making insights credential required on projects page
and changing label to "Credential" instead of "Red Hat Insights"
2017-03-14 10:49:46 -07:00
Matthew Jones bc4174adf8 Ignore .retry files for project updates 2017-03-14 13:23:14 -04:00
Greg Considine d4addb83df Add logic to unset watchers using scope on destroy 2017-03-14 13:22:47 -04:00
Ryan Petrello 7a11d85b72 Merge pull request #5714 from ryanpetrello/callback-plugin-tests
add tests for our custom ansible callback plugin
2017-03-14 13:14:14 -04:00
Ryan Petrello a5ea468bfe add a test to ensure that job events properly strip out environment vars
see: #5601
2017-03-14 12:56:44 -04:00
Ryan Petrello 5bbb824865 add tests for no_log filtering
see: #5691
2017-03-14 12:56:44 -04:00
Ryan Petrello 1005782ee9 add tests for our custom ansible callback plugin 2017-03-14 12:56:40 -04:00
jlmitch5 ad40e509e4 Merge pull request #5694 from jlmitch5/addOrgToPermModal
add org to user/team perm modal
2017-03-14 11:18:35 -04:00
Michael Abashian d8592fc1f2 Merge pull request #5704 from mabashian/5677-rbac-org
Admin/non-org admin edit org in various resources bug fix
2017-03-14 09:51:28 -04:00
Wayne Witzel III 3b1556c0d5 Merge pull request #5709 from wwitzel3/issue-5702
correct unintentional stripping of - from order by fields
2017-03-13 22:35:18 -04:00
Matthew Jones 47a894a339 Fix up cloudforms license unit test 2017-03-13 21:02:36 -04:00
Wayne Witzel III ea1c4ee1d5 correct unintentional stripping of - from order by fields 2017-03-13 18:13:55 -04:00
Greg Considine 5d9f27db62 Fix default selection logic and revert link style
The default selection wasn't represented in the UI for inventory
and credential prompts, and the UI wasn't updated when revert
was clicked. This addresses those bugs and adjust the style of
the revert link to increase padding-left.
2017-03-13 17:40:40 -04:00
Greg Considine 1e5af1212d Add anchor tag in place of button 2017-03-13 17:40:29 -04:00
Wayne Witzel III 4fef391914 Merge pull request #5660 from wwitzel3/release_3.1.2
do not install psql as a tower dep
2017-03-13 16:43:23 -04:00
Matthew Jones 5270b830c9 Fixing CloudForms branding 2017-03-13 16:27:30 -04:00
Shane McDonald 90e30d348f Revert "Dont ignore installed packages when installing requirements"
This reverts commit 4ffc1a41f454d511fc523aaf8d3ab65dbe45c80e.
2017-03-13 16:21:27 -04:00
Matthew Jones 3510954254 Merge pull request #5703 from ansible/cloudforms_licensing
Implement cloudforms license
2017-03-13 16:16:21 -04:00
Michael Abashian 6fbb9c4da3 Roll back binding - didn't mean to commit this as it was for debugging 2017-03-13 16:13:20 -04:00
Michael Abashian 7b2b695fc6 Host event scrollbar fix 2017-03-13 16:08:55 -04:00
Shane McDonald 4875d60b97 Dont ignore installed packages when installing requirements
This was causing some packages to get unexpectedly upgraded... probably not what we want.
2017-03-13 16:00:47 -04:00
jlmitch5 f37765c2e9 Merge branch 'devel' into addOrgToPermModal 2017-03-13 15:35:56 -04:00
Graham Mainwaring 4082cb4e60 Merge pull request #5706 from ghjm/setup_params
Allow passing ansible-playbook parameters transparently through setup.sh
2017-03-13 15:14:39 -04:00
Chris Meyers 33dca18119 more tests 2017-03-13 15:05:33 -04:00
Chris Meyers a051b41773 add test 2017-03-13 14:45:20 -04:00
Jared Tabor 7019cb9b5a Merge pull request #5678 from jaredevantabor/read-role
filtering out READ roles from the RBAC modal
2017-03-13 10:58:49 -07:00
jaredevantabor d8fc447309 removing stale comment 2017-03-13 10:41:50 -07:00
jaredevantabor d6f70a22f3 filtering out READ roles from the RBAC modal
it was accidentally added in the 3.1 smart search snafoo
2017-03-13 10:41:50 -07:00
Chris Meyers 6a0916371b add job cancel dependency information
* Inventory updates that are canceled and are dependencies of jobs
result in the dependent job being canceled. This code adds a better
description to job_explanation so that a job marked as canceled can be
traced back to the inventory update that triggered this case.
2017-03-13 12:52:33 -04:00
Matthew Jones 2641b2a1c3 Implement cloudforms license
This is a special license that is triggered in the presence of two
directories:
  - /opt/rh/cfme-appliance
  - /opt/rh/cfme-gemset
and the rpms
  - cfme
  - cfme-appliance
  - cfme-gemset

All of which I'm assured are responsible for validating that this is
indeed an enterprise cloudforms environment.

When these are present then a license is used that is near perpetual,
allows for a stupid large number of instances, and turns on all features
2017-03-13 12:00:22 -04:00
Michael Abashian 1423772ac9 Admin/non-org admin edit org in various resources bug fix 2017-03-13 11:46:54 -04:00
Ryan Petrello c13242305f Merge pull request #5693 from ryanpetrello/ad_hoc_extra_vars
add ui support for specifying extra vars for ad-hoc commands
2017-03-13 11:39:02 -04:00
Chris Meyers 1bbc802816 Merge pull request #5699 from chrismeyersfsu/fix-5185
pass ansible the "raw" git repo url
2017-03-13 09:42:17 -04:00
Ryan Petrello b9a400cbc1 Merge pull request #5695 from ryanpetrello/fix-5691
job event data marked with _ansible_no_log should be censored
2017-03-13 09:38:47 -04:00
Chris Meyers c255c07ea5 pass ansible the "raw" git repo url
* I explored the |urlencode() filter instead. Ansible and git didn't
like this.
* Quoting doesn't seemed to be required. Ansible and the git module are
smart enough to do the right thing. I tested with a space in the repo
url path and it works.
2017-03-13 09:34:52 -04:00
Shane McDonald 388b0fdf04 Force reinstall of setuptools and pip
For some reason -I wasn't cutting it. Even though we were trying to install pip 8.1.2, this was happening:

Collecting pip==8.1.2
  Using cached pip-8.1.2-py2.py3-none-any.whl
Installing collected packages: pip
Successfully installed pip-9.0.1

¯\_(ツ)_/¯
2017-03-11 19:06:28 -05:00
Graham Mainwaring ead643eff4 Merge pull request #5692 from ghjm/windows_scan_packages_fix
Fix case where Get-ChildItems does not return any results
2017-03-10 16:52:36 -05:00
Ryan Petrello 6af9638d81 job event data marked with _ansible_no_log should be censored
see: #5691
2017-03-10 15:47:39 -05:00
Ryan Petrello d4cd9d355f add ui support for specifying extra vars for ad-hoc commands
see: #1744
2017-03-10 15:29:42 -05:00
Ryan Petrello 5777ae4b8b Merge pull request #5533 from ryanpetrello/fix-5526
prohibit `order_by=` for sensitive fields
2017-03-10 15:28:19 -05:00
John Mitchell b842c82e55 add org to user/team perm modal 2017-03-10 15:24:19 -05:00
Graham Mainwaring 5098d0e99c Fix case where Get-ChildItems does not return any results 2017-03-10 14:53:05 -05:00
Shane McDonald 8a8901afe4 Default image tag for unit test container image. 2017-03-10 11:53:37 -05:00
jlmitch5 68237b9718 Merge pull request #5655 from jlmitch5/makeHostConfigRequired
Make host config required
2017-03-10 11:20:54 -05:00
jlmitch5 cfd1564bbb Merge pull request #5648 from jlmitch5/removeScheduleButtonForManProjs
remove schedule button for manual projects
2017-03-10 11:20:17 -05:00
Ryan Petrello bad9670a0b Merge remote-tracking branch 'origin/release_3.1.2' into devel 2017-03-10 10:57:03 -05:00
Matthew Jones 5060ed4033 Merge pull request #5684 from samdoran/nginx-template-formatting
Enable lstrip_blocks in nginx.conf template
2017-03-10 10:25:21 -05:00