summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update aws dynamic inventoryLénaïc Huard2017-01-102-59/+280
| | | | Fetch from https://raw.githubusercontent.com/ansible/ansible/devel/contrib/inventory/ec2.py
* Merge pull request #3056 from rhcarvalho/cleanup-cluster-upgradeRodolfo Carvalho2017-01-103-206/+1
|\ | | | | Cleanup cluster upgrade
| * Remove unused fileRodolfo Carvalho2017-01-091-12/+0
| | | | | | | | | | All references to it were removed in b89c835e3235f2628b37de15713c311d1b5a4bad
| * Remove unused fileRodolfo Carvalho2017-01-091-193/+0
| | | | | | | | | | All references to it were removed in 739ad9de2a11bb8c67d77641a86cfd39e4594542
| * Remove spurious argumentRodolfo Carvalho2017-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The script nuke_images.sh was introduced in 0c31d72be3bf32f848eedad9859a81ba858f8c8f and seems that the shell argument $1 was never used (the only $1 in the script back then refers to a field in a awk script). There was a reference to $2 that was always undefined/empty. The script was then simplified in b89c835e3235f2628b37de15713c311d1b5a4bad, removing any reference to $1 and $2. This commit cleans up the only call site to the shell script.
* | Merge pull request #3061 from tbielawa/scaleup-bz1390135Scott Dodson2017-01-091-0/+14
|\ \ | | | | | | The scaleup subcommand does not support the unattended option
| * | The scaleup subcommand does not support the unattended optionTim Bielawa2017-01-091-0/+14
| | | | | | | | | | | | | | | | | | * 'atomic-openshift-installer' will exit now if -u is given with the 'scaleup' subcommand * https://bugzilla.redhat.com/show_bug.cgi?id=1390135
* | | Automatic commit of package [openshift-ansible] release [3.5.0-1].Scott Dodson2017-01-093-2/+235
| | |
* | | Merge pull request #3055 from abutcher/openshift_image_tag=latestScott Dodson2017-01-093-6/+7
|\ \ \ | | | | | | | | Fix openshift_image_tag=latest.
| * | | Fix openshift_image_tag=latest.Andrew Butcher2017-01-093-6/+7
| |/ /
* | | Merge pull request #3021 from tbielawa/fix_aoi_manTim Bielawa2017-01-093-6/+7
|\ \ \ | | | | | | | | Update aoi manpage with correct operation count
| * | | Update manpage version.Tim Bielawa2017-01-092-3/+4
| | | |
| * | | Update aoi manpage with correct operation countTim Bielawa2016-12-282-4/+4
| | | |
* | | | Merge pull request #2909 from mtnbikenc/firewalldScott Dodson2017-01-095-18/+26
|\ \ \ \ | |_|/ / |/| | | Enable firewalld by default
| * | | Enable firewalld by defaultRussell Teague2016-12-145-18/+26
| | | |
* | | | Merge pull request #3058 from openshift/etcd-imageScott Dodson2017-01-091-2/+1
|\ \ \ \ | |_|_|/ |/| | | etcd 3.x image is 'etcd' not 'etcd3'
| * | | Use registry.access.redhat.com/rhel7/etcd instead of etcd3Scott Dodson2017-01-091-2/+1
| | | |
* | | | Merge pull request #3015 from smarterclayton/future_versions_masterScott Dodson2017-01-084-5/+17
|\ \ \ \ | | | | | | | | | | Add future versions to openshift_facts
| * | | | Add future versions to openshift_factsClayton Coleman2017-01-044-5/+17
| | |_|/ | |/| |
* | | | Merge pull request #3054 from sdodson/fix-repo-boolsScott Dodson2017-01-061-2/+2
|\ \ \ \ | | |/ / | |/| | Fix repo defaults
| * | | Fix repo defaultsScott Dodson2017-01-061-2/+2
| | | |
* | | | Merge pull request #3032 from abutcher/wait_for_api_hostnameScott Dodson2017-01-062-14/+10
|\ \ \ \ | | | | | | | | | | Use openshift.common.hostname when verifying API port available.
| * | | | Use openshift.common.hostname when verifying API port available.Andrew Butcher2017-01-062-14/+10
|/ / / /
* | | | Merge pull request #3039 from tbielawa/gh3020Scott Dodson2017-01-062-4/+9
|\ \ \ \ | | | | | | | | | | Add required python-six package to installation
| * | | | Add required python-six package to installationTim Bielawa2017-01-042-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | * Moves package list into a defaults/main.yml file * Closes #3020
* | | | | Merge pull request #3047 from tbielawa/installer-count-bz1388739Scott Dodson2017-01-061-3/+4
|\ \ \ \ \ | |_|/ / / |/| | | | Change wording in the quick installer callback plugin
| * | | | Change wording in the quick installer callback pluginTim Bielawa2017-01-051-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Old wording only considered skipped plays (reducing the play count) * New wording accounts for dynamically included plays (increasing the play count)
* | | | | Merge pull request #3052 from soltysh/docker_registry_volumeScott Dodson2017-01-051-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Re-add when condition which was removed mistakenly in #3036
| * | | | | Re-add when condition which was removed mistakenly in #3036Maciej Szulik2017-01-051-0/+1
|/ / / / /
* | | | | Merge pull request #3036 from soltysh/docker_registry_volumeScott Dodson2017-01-051-6/+5
|\ \ \ \ \ | | | | | | | | | | | | Fix jsonpath expected output when checking registry volume secrets
| * | | | | Fix jsonpath expected output when checking registry volume secretsMaciej Szulik2017-01-051-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In k8s 1.5 (see rebase PR: origin 12143) jsonpath output is slightly different than previously. Causing this line to fail. We need to pick secret or secretName when checking this task failure condition.
* | | | | | Merge pull request #3049 from sdodson/fix-logging-deployerScott Dodson2017-01-052-5/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | logging-deployer fixes from origin-aggregated-logging/#317
| * | | | | | logging-deployer pull fixes from origin-aggregated-logging/#317Scott Dodson2017-01-052-5/+0
|/ / / / / /
* | | | | | Merge pull request #3046 from sdodson/bz1408668Scott Dodson2017-01-051-8/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | Don't upgrade etcd on atomic host, ever.
| * | | | | | Don't upgrade etcd on atomic host, ever.Scott Dodson2017-01-051-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Bug 1408668 Fixes BZ1408668
* | | | | | | Merge pull request #3033 from abutcher/openshift-enable-origin-repoScott Dodson2017-01-051-2/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Cast openshift_enable_origin_repo to bool.
| * | | | | | Cast openshift_enable_origin_repo to bool.Andrew Butcher2017-01-041-2/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #3008 from bigbank-as/feature/nfs-reclaim-optionScott Dodson2017-01-053-1/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add osnl_volume_reclaim_policy variable to nfs_lvm role
| * | | | | | Add osnl_volume_reclaim_policy variable to nfs_lvm roleAndo Roots2016-12-223-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows to choose which volume reclamation policy to use when provisioning storage with `openshift_storage_nfs_lvm`.
* | | | | | | Merge pull request #3040 from sdodson/issue3025Scott Dodson2017-01-041-2/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Enable repos defined in openshift_additional_repos by default
| * | | | | | Enable repos defined in openshift_additional_repos by defaultScott Dodson2017-01-041-2/+2
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Fixes #3025
* | | | | | Merge pull request #3037 from tbielawa/hush_sudo_checkScott Dodson2017-01-041-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Hush the sudo privs check in oo-installer
| * | | | | | Hush the sudo privs check in oo-installerTim Bielawa2017-01-041-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Don't print words when checking for sudo access * Just 'echo' an empty string with no new-line Closes #3003
* | | | | | Merge pull request #3035 from simaishi/update_to_ga_templateScott Dodson2017-01-041-5/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Update CFME template to point to GA build
| * | | | | Update CFME template to point to GA buildSatoe Imaishi2017-01-041-5/+5
|/ / / / /
* | | | | Merge pull request #3010 from simaishi/add_cfme_beta_templatesScott Dodson2017-01-043-0/+505
|\ \ \ \ \ | |_|/ / / |/| | | | Add templates for CFME Beta pod images
| * | | | Add templates for CFME Beta pod imagesSatoe Imaishi2016-12-223-0/+505
|/ / / /
* | | | Merge pull request #3006 from detiber/cleanup_crudScott Dodson2016-12-2210-397/+0
|\ \ \ \ | |/ / / |/| | | Cleanup crud
| * | | remove duplicate filter name and oo_pdbJason DeTiberus2016-12-211-11/+0
| | | |
| * | | remove old Ops toolingJason DeTiberus2016-12-219-386/+0
|/ / /