summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix PEP8 in oo_config.pyTim Bielawa2016-08-251-6/+3
* Fix PEP8 in variants.pyTim Bielawa2016-08-251-11/+13
* Fix PEP8 in facts_callback.pyTim Bielawa2016-08-251-4/+5
* Merge pull request #2052 from sdodson/metricsScott Dodson2016-08-2516-74/+381
|\
| * Refactor volume directory creationScott Dodson2016-08-241-2/+3
| * Rely on IMAGE_PREFIX and IMAGE_VERSION defaults from the templates themselvesScott Dodson2016-08-243-3/+3
| * Add metrics exports to nfs role, move exports to /etc/exports.d/openshift-ans...Scott Dodson2016-08-242-1/+17
| * Add ability to disable pvc creationScott Dodson2016-08-242-3/+6
| * Fix registry volumeScott Dodson2016-08-241-1/+2
| * add selectors for metrics and loggingScott Dodson2016-08-241-0/+8
| * Add logic to detect existing installsScott Dodson2016-08-244-84/+175
| * Deploy metrics after our routerScott Dodson2016-08-241-1/+1
| * Add Enterprise 3.3 templateScott Dodson2016-08-242-6/+36
| * Pull in keynote demo changesScott Dodson2016-08-245-54/+163
| * [tags] add some support for running a subset of config via tagsJason DeTiberus2016-08-243-0/+30
| * [metrics] add filter to clean up hostname for use in metrics deploymentJason DeTiberus2016-08-241-1/+19
* | Merge pull request #2337 from mkumatag/rm_dup_flannel_regAndrew Butcher2016-08-251-10/+0
|\ \
| * | Fix review commentsManjunath A Kumatagi2016-08-221-8/+2
| * | Remove duplicate flannel registrationManjunath A Kumatagi2016-08-211-4/+0
* | | Merge pull request #2361 from detiber/repo_reworkJason DeTiberus2016-08-241-1/+0
|\ \ \
| * | | fix duplicate src fieldJason DeTiberus2016-08-241-1/+0
* | | | Automatic commit of package [openshift-ansible] release [3.3.15-1].Scott Dodson2016-08-242-2/+24
* | | | Merge pull request #2360 from detiber/repo_reworkJason DeTiberus2016-08-2415-92/+21
|\| | |
| * | | simplify repo configurationJason DeTiberus2016-08-2411-78/+9
| * | | remove fedora origin copr (it's in mainline fedora now), some dnf/yum clean upAdam Miller2016-08-244-14/+12
* | | | Merge pull request #2359 from abutcher/flannel-certsScott Dodson2016-08-242-13/+12
|\ \ \ \
| * | | | Correct flannel cert variables.Andrew Butcher2016-08-242-13/+12
* | | | | Merge pull request #2341 from tbielawa/BZ1368296Scott Dodson2016-08-2410-48/+232
|\ \ \ \ \
| * | | | | Make note about ansible/install logs messing up ci testsTim Bielawa2016-08-241-0/+4
| * | | | | Move nested print_read_config_error function into it's own functionTim Bielawa2016-08-243-7/+4
| * | | | | Makefile includes ci-pyflakes target nowTim Bielawa2016-08-241-1/+7
| * | | | | Fix BZ1368296 by quietly recollecting facts if the cache is removedTim Bielawa2016-08-249-43/+220
* | | | | | Merge pull request #2356 from maxamillion/fedoraJason DeTiberus2016-08-241-4/+4
|\ \ \ \ \ \
| * | | | | | don't set virt_sandbox_use_nfs on Fedora, it was replaced by virt_use_nfsAdam Miller2016-08-241-4/+4
* | | | | | | Merge pull request #2350 from smunilla/BZ1358951Scott Dodson2016-08-241-0/+6
|\ \ \ \ \ \ \
| * | | | | | | a-o-i: Add variant and variant_version to migrationSamuel Munilla2016-08-241-0/+6
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #2100 from smunilla/BZ1337553Scott Dodson2016-08-243-0/+20
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Add externalIPNetworkCIDRs to configSamuel Munilla2016-08-233-0/+20
* | | | | | | Merge pull request #2353 from maxamillion/fedoraJason DeTiberus2016-08-241-0/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | don't gather facts when bootstrapping ansible for Fedora hostsAdam Miller2016-08-241-0/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #2354 from abutcher/ca-rtScott Dodson2016-08-241-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Correct masterCA config typo.Andrew Butcher2016-08-241-2/+2
* | | | | | Merge pull request #2351 from dgoodwin/plugin-order-override-2Scott Dodson2016-08-241-0/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix upgrade failure when master-config does not have pluginOrderOverride.Devan Goodwin2016-08-241-0/+1
|/ / / / /
* | | / / Automatic commit of package [openshift-ansible] release [3.3.14-1].Scott Dodson2016-08-232-2/+25
| |_|/ / |/| | |
* | | | Merge pull request #2334 from smunilla/BZ1358951Scott Dodson2016-08-235-76/+88
|\ \ \ \
| * | | | a-o-i: Remove Legacy Config UpgradeSamuel Munilla2016-08-194-74/+52
| * | | | Bug 1358951 - Error loading config, no such key: 'deployment' when using prev...Samuel Munilla2016-08-193-3/+37
| | |/ / | |/| |
* | | | Merge pull request #2333 from smunilla/fix_ssh_questionScott Dodson2016-08-231-5/+4
|\ \ \ \
| * | | | a-o-i: Fix ansible_ssh_user questionSamuel Munilla2016-08-231-5/+4
| |/ / /