summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* logging: fix jinja filters to support py3Vadim Rutkovsky2018-01-102-4/+4
* Merge pull request #5853 from imcsk8/flannel-iptablesOpenShift Merge Robot2018-01-092-0/+14
|\
| * Add iptables save handlerIvan Chavero2018-01-081-0/+4
| * Fix wrong indentationIvan Chavero2017-10-271-2/+2
| * Fix yaml indentationIvan Chavero2017-10-271-2/+2
| * Add iptables rules for flannelIvan Chavero2017-10-231-0/+10
* | Merge pull request #6658 from mgugino-upstream-stage/containerized_boolsOpenShift Merge Robot2018-01-094-4/+4
|\ \
| * | ensure containerized bools are castMichael Gugino2018-01-084-4/+4
* | | Merge pull request #6646 from giuseppe/fix-container-engine-authOpenShift Merge Robot2018-01-091-0/+6
|\ \ \
| * | | container-engine: move registry_auth.yml before pullGiuseppe Scrivano2018-01-081-0/+6
* | | | Merge pull request #6618 from ture-karlsson/masterScott Dodson2018-01-091-0/+4
|\ \ \ \
| * | | | Provide example on how to use osm_etcd_image in a disconnected and containeri...Ture Karlsson2018-01-051-0/+4
* | | | | Merge pull request #6634 from vrutkovs/openshift_binary_for_upgradesScott Dodson2018-01-091-0/+2
|\ \ \ \ \
| * | | | | upgrades: set openshift_client_binary fact when running on oo_first_master hostVadim Rutkovsky2018-01-061-0/+2
* | | | | | Merge pull request #6650 from vrutkovs/containerized_upgrade_set_openshift_us...OpenShift Merge Robot2018-01-091-1/+1
|\ \ \ \ \ \
| * | | | | | Use openshift_node_use_openshift_sdn when doing a containerized node upgradeVadim Rutkovsky2018-01-091-1/+1
* | | | | | | Merge pull request #6659 from joelddiaz/ami_and_docker_storage_setupKenny Woodson2018-01-092-1/+6
|\ \ \ \ \ \ \
| * | | | | | | docker storage setup for ami buildingJoel Diaz2018-01-082-1/+6
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #6660 from mgugino-upstream-stage/fix-logging-staticMichael Gugino2018-01-081-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Fix: change import_role to include_roleMichael Gugino2018-01-081-1/+3
| |/ / / / / /
* | | | | | | Merge pull request #6651 from mgugino-upstream-stage/containerized-groupsMichael Gugino2018-01-084-7/+16
|\ \ \ \ \ \ \
| * | | | | | | Build containerized host group dynamicallyMichael Gugino2018-01-084-7/+16
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #6653 from mgugino-upstream-stage/fix-crio-boolMichael Gugino2018-01-0810-15/+15
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Properly cast crio boolean variables to boolMichael Gugino2018-01-0810-15/+15
* | | | | | | Merge pull request #6580 from tomassedovic/openstack-fixesOpenShift Merge Robot2018-01-083-2/+10
|\ \ \ \ \ \ \
| * | | | | | | Import prerequisites.yml for OpenStackTomas Sedovic2018-01-021-0/+3
| * | | | | | | Set the correct path to the openstack.conf fileTomas Sedovic2018-01-021-1/+1
| * | | | | | | Return a openshift_node_labels as a dictTomas Sedovic2018-01-021-0/+5
| * | | | | | | Fix yaml syntax error in the sample inventoryTomas Sedovic2018-01-021-2/+2
* | | | | | | | Merge pull request #6649 from mgugino-upstream-stage/fix-pre-packagesMichael Gugino2018-01-081-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | install base_packages on oo_all_hostsMichael Gugino2018-01-081-2/+2
* | | | | | | | | Merge pull request #6549 from mgugino-upstream-stage/node-meta-depends2OpenShift Merge Robot2018-01-085-8/+2
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Remove last of openshift_node role meta-dependsMichael Gugino2018-01-025-8/+2
* | | | | | | | | Merge pull request #6548 from kwoodson/configurable_ami_drive_sizeKenny Woodson2018-01-081-5/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adding ability to update ami drive size.Kenny Woodson2017-12-211-5/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #6624 from vrutkovs/containerized-avoid-replacing-node-unitOpenShift Merge Robot2018-01-081-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Don't overwrite node's systemd units for containerized installVadim Rutkovsky2018-01-051-1/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #6641 from sdodson/logging-loopsMichael Gugino2018-01-081-4/+4
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Switch back to dynamic include_role in logging loopsScott Dodson2018-01-071-4/+4
* | | | | | | | Merge pull request #6587 from vrutkovs/test-coverageOpenShift Merge Robot2018-01-081-7/+344
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | test_oc_scale: add more scale test casesVadim Rutkovsky2018-01-021-0/+337
| * | | | | | | test_oc_scale: fix test docstringsVadim Rutkovsky2018-01-021-7/+7
* | | | | | | | Merge pull request #6507 from nbartos/continerOpenShift Merge Robot2018-01-0753-574/+914
|\ \ \ \ \ \ \ \
| * | | | | | | | Use Contiv version 1.2.0Nick Bartos2018-01-086-8/+14
| * | | | | | | | Contiv multi-master and other fixesNick Bartos2018-01-0852-571/+905
* | | | | | | | | Merge pull request #6642 from mscherer/patch-1Scott Dodson2018-01-071-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Fix error in variable in commentMichael Scherer2018-01-081-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #6637 from sdodson/missing-openshift-factsMichael Gugino2018-01-071-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add missing dependency on openshift_factsScott Dodson2018-01-061-0/+1
* | | | | | | | Merge pull request #6359 from spadgett/web-console-serverScott Dodson2018-01-0624-0/+426
|\ \ \ \ \ \ \ \