summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6385 from mjudeikis/hosted-template-varScott Dodson2017-12-074-0/+44
|\
| * add 3.8 templates for gluster ep and svcLuke Meyer2017-12-072-0/+22
| * add 3.8 templates for gluster ep and svcMangirdas2017-12-072-0/+22
* | Merge pull request #6371 from mtnbikenc/include-to-import_playbookOpenShift Merge Robot2017-12-0753-280/+280
|\ \
| * | Include Deprecation: Convert to import_playbookRussell Teague2017-12-0754-281/+281
* | | Merge pull request #6387 from mgugino-upstream-stage/fix-auth-statScott Dodson2017-12-071-1/+1
|\ \ \
| * | | Fix incorrect register name master registry authMichael Gugino2017-12-071-1/+1
* | | | Merge pull request #6380 from sdodson/oc-admScott Dodson2017-12-0711-15/+17
|\ \ \ \
| * | | | Remove all uses of openshift.common.admin_binaryScott Dodson2017-12-0711-15/+17
* | | | | Merge pull request #6346 from mgugino-upstream-stage/remove-protected_facts_t...Michael Gugino2017-12-071-56/+16
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove unused protected_facts_to_overwriteMichael Gugino2017-12-041-56/+16
* | | | | Merge pull request #6362 from mgugino-upstream-stage/crt-playsScott Dodson2017-12-0724-343/+259
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Implement container_runtime playbooks and changesMichael Gugino2017-12-0724-343/+259
| | |/ / | |/| |
* | | | Merge pull request #6365 from mtnbikenc/consolidate-etcd-upgradeRussell Teague2017-12-0721-67/+64
|\ \ \ \
| * | | | Playbook Consolidation - etcd UpgradeRussell Teague2017-12-0521-67/+64
* | | | | Merge pull request #6361 from mtnbikenc/consolidate-deploy-clusterScott Dodson2017-12-076-59/+52
|\ \ \ \ \
| * | | | | Playbook Consolidation - byo/config.ymlRussell Teague2017-12-066-59/+52
* | | | | | Merge pull request #6372 from mtnbikenc/include-to-include_tasksOpenShift Merge Robot2017-12-0736-88/+82
|\ \ \ \ \ \
| * | | | | | Include Deprecation: Convert to include_tasksRussell Teague2017-12-0636-88/+82
| |/ / / / /
* | | | | | Merge pull request #6310 from tomassedovic/openstack-rhel-subscriptionMichael Gugino2017-12-072-21/+14
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Remove shell environment lookupTomas Sedovic2017-12-011-2/+2
| * | | | | Revert "Fix syntax error caused by an extra paren"Tomas Sedovic2017-12-011-1/+1
| * | | | | Revert "Fix the env lookup fallback in rhel_subscribe"Tomas Sedovic2017-12-011-4/+4
| * | | | | Optionally subscribe OpenStack RHEL nodesTomas Sedovic2017-11-292-21/+14
| * | | | | Fix the env lookup fallback in rhel_subscribeTomas Sedovic2017-11-291-4/+4
| * | | | | Fix syntax error caused by an extra parenTomas Sedovic2017-11-291-1/+1
* | | | | | Merge pull request #6254 from jihoon5/jihoon5Michael Gugino2017-12-071-0/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add external_svc_subnet for k8s loadbalancer type servicejihoon.o2017-11-291-0/+1
* | | | | | Merge pull request #6373 from kwoodson/ami_build_container_runtimeKenny Woodson2017-12-062-7/+7
|\ \ \ \ \ \
| * | | | | | Fix ami building.Kenny Woodson2017-12-062-7/+7
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #6034 from cwilkers/containerized-lb-portfixScott Dodson2017-12-061-1/+1
|\ \ \ \ \ \
| * | | | | | Mod startup script to publish all frontend bindsChandler Wilkerson2017-11-061-1/+1
* | | | | | | Merge pull request #6376 from sosiouxme/20171206-logging-vars-typoLuke Meyer2017-12-061-1/+1
|\ \ \ \ \ \ \
| * | | | | | | openshift_logging_kibana: fix mixing parenLuke Meyer2017-12-061-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #6366 from mgugino-upstream-stage/fix-pv-pluginMichael Gugino2017-12-061-5/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix generate_pv_pvcs_list plugin undefMichael Gugino2017-12-051-5/+3
* | | | | | | Merge pull request #6340 from bogdando/openstack_cleanup_dnsScott Dodson2017-12-068-209/+14
|\ \ \ \ \ \ \
| * | | | | | | Fix and cleanup not required dns bitsBogdan Dobrelya2017-12-058-209/+14
* | | | | | | | Merge pull request #6370 from mtnbikenc/fix-openshift-loggingScott Dodson2017-12-062-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Add missing symlinks in openshift-loggingRussell Teague2017-12-062-0/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #6360 from mtnbikenc/remove-legacy-ci-entryRussell Teague2017-12-062-6/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove entry point files no longer needed by CIRussell Teague2017-12-052-6/+0
| |/ / / / / / /
* | | | | | | | Merge pull request #6350 from mtnbikenc/fix-dup-importRussell Teague2017-12-061-2/+0
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Remove duplicate init import in network_manager.ymlRussell Teague2017-12-051-2/+0
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #6155 from abutcher/remove-pacemakerScott Dodson2017-12-0521-243/+8
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Remove all references to pacemaker (pcs, pcsd) and openshift.master.cluster_m...Andrew Butcher2017-12-0521-243/+8
|/ / / / / /
* | | | | | Merge pull request #6154 from mtnbikenc/consolidate-openshift-loggingScott Dodson2017-12-058-11/+16
|\ \ \ \ \ \
| * | | | | | Playbook Consolidation - openshift-loggingRussell Teague2017-11-308-11/+16
* | | | | | | Merge pull request #6306 from mgugino-upstream-stage/fix-hosted-varsScott Dodson2017-12-0551-1035/+414
|\ \ \ \ \ \ \
| * | | | | | | Fix hosted varsMichael Gugino2017-12-0551-1035/+414