summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2183 from dgoodwin/mismatch-msgScott Dodson2016-07-201-1/+1
|\ | | | | Slight modification to error when using mismatched openshift_release.
| * Slight modification to error when using mismatched openshift_release.Devan Goodwin2016-07-201-1/+1
| |
* | Merge pull request #2177 from sdodson/image-stream-syncScott Dodson2016-07-209-13/+284
|\ \ | | | | | | Image stream sync, add jenkinstemplate
| * | Add jenkinstemplateScott Dodson2016-07-192-0/+256
| | |
| * | Sync latest image streams and templatesScott Dodson2016-07-197-13/+28
| | |
* | | Merge pull request #2181 from liangxia/fix-typoScott Dodson2016-07-201-1/+1
|\ \ \ | |_|/ |/| | fix "databcase" typo in example roles
| * | fix "databcase" typo in example rolesliangxia2016-07-201-1/+1
|/ /
* | Merge pull request #2179 from abutcher/router-cert-contentsScott Dodson2016-07-191-2/+2
|\ \ | | | | | | Check router certificate contents when securing router
| * | Secure router only when openshift.hosted.router.certificate.contents exists.Andrew Butcher2016-07-191-2/+2
| |/
* | Merge pull request #2175 from dgoodwin/origin-12-rpm-upgradeScott Dodson2016-07-192-2/+13
|\ \ | | | | | | Fix bugs with origin 1.2 rpm based upgrades.
| * | Fix bugs with origin 1.2 rpm based upgrades.Devan Goodwin2016-07-192-2/+13
| | |
* | | Merge pull request #2178 from abutcher/nfs-group-checkScott Dodson2016-07-191-1/+1
|\ \ \ | | | | | | | | Test for oo_nfs_to_config in groups when determining storage host
| * | | Ensure 'oo_nfs_to_config' in groups prior to checking group length when nfs ↵Andrew Butcher2016-07-191-1/+1
| | |/ | |/| | | | | | | host unset.
* | | Merge pull request #2176 from tbielawa/respeedyScott Dodson2016-07-191-3/+40
|\ \ \ | |/ / |/| | We have proper ansible support and requirements in place now, de-reve…
| * | We have proper ansible support and requirements in place now, de-revert this ↵Tim Bielawa2016-07-191-3/+40
|/ / | | | | | | | | | | | | | | | | commit Revert "Merge pull request #2098 from openshift/revert-2087-speedy_example_copy" This reverts commit a7c5f41157e61d9478c0f46671347bc84401f2c7, reversing changes made to df9b208c3eb993d0d1f7c0e715fa4ef49261aa47.
* | Merge pull request #2174 from dgoodwin/skip-docker-upgrade-atomicScott Dodson2016-07-191-2/+2
|\ \ | | | | | | Skip docker upgrades on Atomic.
| * | Skip docker upgrades on Atomic.Devan Goodwin2016-07-191-2/+2
| |/
* | Merge pull request #2173 from abutcher/warningsAndrew Butcher2016-07-197-9/+14
|\ \ | | | | | | Resolve some deprecation warnings.
| * | Resolve some deprecation warnings.Andrew Butcher2016-07-187-9/+14
| | |
* | | Merge pull request #1992 from abutcher/ansible-2Scott Dodson2016-07-184-7/+7
|\ \ \ | | | | | | | | Require ansible-2.1.0.0+
| * | | Require ansible-2.1Andrew Butcher2016-07-014-7/+7
| | | |
* | | | Merge pull request #2162 from abutcher/bz1355702Scott Dodson2016-07-183-3/+5
|\ \ \ \ | |_|_|/ |/| | | Bug 1355702 - ansible installaton failed when enable aws s3 backend storage.
| * | | Temporarily link registry config templates for ansible 1.9.x support.Andrew Butcher2016-07-182-0/+2
| | | |
| * | | Remove relative lookup for registry config and check for skipped update in ↵Andrew Butcher2016-07-181-3/+3
|/ / / | | | | | | | | | registry redeploy conditional.
* | | Merge pull request #2166 from abutcher/check-seboolScott Dodson2016-07-182-8/+38
|\ \ \ | | | | | | | | Check for existence of sebooleans prior to setting.
| * | | Check for existence of sebooleans prior to setting.Andrew Butcher2016-07-182-8/+38
| | |/ | |/|
* | | Merge pull request #1778 from smunilla/wrapper_configScott Dodson2016-07-186-460/+666
|\ \ \ | |/ / |/| | Arbitrary installer yaml
| * | Arbitrary Installer yamlSamuel Munilla2016-07-186-460/+666
|/ / | | | | | | Initial build of new, more flexible installer config file format.
* | Merge pull request #2165 from sdodson/masterScott Dodson2016-07-172-2/+160
|\ \ | | | | | | Automatic commit of package [openshift-ansible] release [3.3.2-1].
| * | Automatic commit of package [openshift-ansible] release [3.3.2-1].Scott Dodson2016-07-172-2/+160
|/ /
* | Merge pull request #2160 from sdodson/string-thingsScott Dodson2016-07-151-1/+5
|\ \ | | | | | | Convert openshift_release and openshift_version to strings for starts…
| * | Convert openshift_release and openshift_version to strings for startswithScott Dodson2016-07-151-1/+5
| | | | | | | | | | | | Fixes : startswith first arg must be str, unicode, or tuple, not float
* | | Merge pull request #2159 from sdodson/ansible-2x-lookupScott Dodson2016-07-151-0/+12
|\ \ \ | | | | | | | | Symlink ansible 2.x locations to ansible 1.9 locations
| * | | Symlink ansible 2.x locations to ansible 1.9 locationsScott Dodson2016-07-151-0/+12
| |/ /
* | | Merge pull request #2156 from dgoodwin/aoi-32-upgrade-pathScott Dodson2016-07-152-3/+3
|\ \ \ | |/ / |/| | Two small upgrade related fixes
| * | Clarify message when old docker pre-installed but 1.10+ requested.Devan Goodwin2016-07-151-1/+1
| | |
| * | Fix quick install 3.2 upgrade path.Devan Goodwin2016-07-151-2/+2
|/ /
* | Merge pull request #1945 from dgoodwin/upgrade33Scott Dodson2016-07-1483-1657/+718
|\ \ | | | | | | openshift_release / version / upgrade improvements
| * \ Merge remote-tracking branch 'upstream/master' into upgrade33Devan Goodwin2016-07-1477-558/+1078
| |\ \
| * | | Fix upgrade with docker_version set.Devan Goodwin2016-07-141-3/+3
| | | |
| * | | Remove too recent pylint option keys.Devan Goodwin2016-07-132-3/+2
| | | |
| * | | pylint fixesDevan Goodwin2016-07-132-37/+35
| | | |
| * | | Fix more docker role logic.Devan Goodwin2016-07-131-2/+2
| | | |
| * | | Add checks to docker role for 1.9.1+.Devan Goodwin2016-07-131-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If Docker 1.8.2 is pre-installed, and no docker_version was requested, role will now error out because 1.9.1 is required. If docker_version is set to <= 1.9.1, we also error out as this is not supported.
| * | | Remove 3.0 and 3.1 upgrade sub-dirs.Devan Goodwin2016-07-123-54/+0
| | | |
| * | | Rename upgrade to just v3_2 as it's now major and minor.Devan Goodwin2016-07-122-0/+0
| | | |
| * | | Fix upgrades with an openshift_image_tag set.Devan Goodwin2016-07-121-1/+1
| | | |
| * | | Move repoquery_cmd fact setting into a more logical place.Devan Goodwin2016-07-112-4/+5
| | | |
| * | | Add dependency on docker to openshift_docker role.Devan Goodwin2016-07-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I think this is intended anytime a role uses openshift_docker. Fixes issue where docker_version is ignored for rpm based installs. We made the dependency in openshift_version conditional to allow use of openshift_version without significantly impacting the system, however nothing ever actually ran the docker role after that, resulting in docker simply being installed via the rpm dependency on atomic-openshift.
| * | | Use proper startswith.Devan Goodwin2016-07-112-6/+1
| | | |