summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Cleanup items botched during rebaseScott Dodson2016-08-262-3/+2
* Merge pull request #2235 from smunilla/atomic-registryScott Dodson2016-08-2614-8/+337
|\
| * Remove atomic check and cockpit.socketSamuel Munilla2016-08-268-18/+8
| * Re-organize registry-console deployment.Andrew Butcher2016-08-263-10/+43
| * Add registry console templateAaron Weitekamp2016-08-262-0/+248
| * Add support for Atomic Registry InstallsSamuel Munilla2016-08-2611-7/+65
|/
* Merge pull request #2363 from tbielawa/pep8_fixes_for_quick_installerScott Dodson2016-08-266-120/+134
|\
| * Apply indentation changes to some other linesTim Bielawa2016-08-261-4/+4
| * Enable PEP8 tests by default in the 'make ci' target nowTim Bielawa2016-08-251-9/+1
| * Fix PEP8 errors in cli_installer.pyTim Bielawa2016-08-251-70/+90
| * Fix PEP8 in openshift_ansible.pyTim Bielawa2016-08-251-18/+20
| * 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 #2358 from abutcher/service-serving-certsAndrew Butcher2016-08-252-0/+10
|\ \ | |/ |/|
| * enable service-serving-cert-signer by defaultAndrew Butcher2016-08-242-0/+10
* | 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
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |