summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge kube_admission_plugin_config with admission_plugin_configSamuel Munilla2016-11-227-26/+66
* Merge pull request #2827 from abutcher/BZ1377619Jason DeTiberus2016-11-213-41/+51
|\
| * Delegate openshift_manage_node tasks to master host.Andrew Butcher2016-11-212-41/+46
| * Allow ansible to continue when a node is unaccessible or fails.Andrew Butcher2016-11-182-1/+6
* | Merge pull request #2820 from dgoodwin/yum-check-skip-atomicScott Dodson2016-11-181-1/+2
|\ \
| * | Fix yum/subman version check on Atomic.Devan Goodwin2016-11-171-1/+2
* | | Merge pull request #2822 from sdodson/onlydnsmasqScott Dodson2016-11-181-5/+10
|\ \ \
| * | | Create the file in two passes, atomicly copy it overScott Dodson2016-11-181-6/+8
| * | | node_dnsmasq -- Set dnsmasq as our only nameserverScott Dodson2016-11-171-1/+4
* | | | Merge pull request #2825 from jsuchenia/gce-escape-lognameJason DeTiberus2016-11-181-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Escape LOGNAME variable according to GCE rulesJacek Suchenia2016-11-181-1/+1
|/ / /
* | | Merge pull request #379 from cgwalters/storage-nfs-lvmScott Dodson2016-11-171-1/+1
|\ \ \
| * | | storage/nfs_lvm: Also export as ReadWriteOnceColin Walters2015-07-211-1/+1
* | | | Merge pull request #2821 from sdodson/disable-origin-repoScott Dodson2016-11-172-0/+6
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | Allow users to disable the origin repo creationScott Dodson2016-11-172-0/+6
|/ /
* | Merge pull request #2819 from vishpat/ip-forwardingScott Dodson2016-11-164-5/+31
|\ \
| * | Added ip forwarding for nuageVishal Patil2016-11-154-5/+31
* | | Merge pull request #2702 from jkhelil/fix_master_config_templateAndrew Butcher2016-11-162-16/+18
|\ \ \
| * | | Prevent useless master by reworking template for master service enf fileJawed khelil2016-11-022-16/+18
* | | | Merge pull request #2734 from dougbtv/openstack_timeout_optionJason DeTiberus2016-11-163-1/+4
|\ \ \ \
| * | | | [openstack] allows timeout option for heat create stackdougbtv2016-11-053-1/+4
* | | | | Merge pull request #2606 from abutcher/nuage-haproxy-portTim Bielawa2016-11-161-0/+5
|\ \ \ \ \
| * | | | | Add nuage rest server port to haproxy firewall rules.Andrew Butcher2016-10-141-0/+5
* | | | | | Merge pull request #2636 from enlinxu/masterAndrew Butcher2016-11-163-0/+7
|\ \ \ \ \ \
| * | | | | | support 3rd party schedulerenlinxu2016-10-203-0/+7
* | | | | | | Merge pull request #2803 from tbielawa/BZ1390849Scott Dodson2016-11-162-5/+28
|\ \ \ \ \ \ \
| * | | | | | | Add view permissions to hawkular saScott Dodson2016-11-151-0/+18
| * | | | | | | Use multiple '-v's when creating the metrics deployer commandTim Bielawa2016-11-152-5/+10
* | | | | | | | Merge pull request #2815 from dgoodwin/yumCheckScott Dodson2016-11-161-0/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Check for bad versions of yum and subscription-manager.Devan Goodwin2016-11-161-0/+16
* | | | | | | | | Merge pull request #2816 from mtnbikenc/docs-fixScott Dodson2016-11-161-6/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Corrected syntax and typosRussell Teague2016-11-161-6/+6
* | | | | | | | | | Merge pull request #2763 from yfauser/byo_cni_plugin_fixesAndrew Butcher2016-11-163-2/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Change to allow cni deployments without openshift SDNyfauser2016-11-083-2/+4
* | | | | | | | | | Merge pull request #2813 from lhuard1A/optimize_listJason DeTiberus2016-11-165-44/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Optimize the cloud-specific list.yml playbooksLénaïc Huard2016-11-165-44/+11
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #2814 from lhuard1A/fix_gce_subnetJason DeTiberus2016-11-162-543/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Fix GCE cluster creationLénaïc Huard2016-11-162-543/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #2810 from sdodson/BZ1390913Scott Dodson2016-11-151-5/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix typoScott Dodson2016-11-151-1/+1
| * | | | | | | | | Fix a few places where we're not specifying the admin kubeconfigScott Dodson2016-11-151-6/+12
| * | | | | | | | | Add rolebinding-readerScott Dodson2016-11-151-0/+7
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #2677 from EricMountain-1A/fix_docker_fatal_selinux_4upstr...Scott Dodson2016-11-141-11/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Docker daemon is started prematurely.Eric Mountain2016-11-141-11/+11
* | | | | | | | | Merge pull request #2802 from sdodson/image-stream-syncScott Dodson2016-11-144-3/+40
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Sync logging deployer changes from origin to enterpriseScott Dodson2016-11-141-0/+20
| * | | | | | | | Sync latest enterprise/metrics-deployer.yamlScott Dodson2016-11-142-0/+12
| * | | | | | | | Sync latest s2i contentScott Dodson2016-11-141-3/+8
|/ / / / / / / /
* | | | | | | | Merge pull request #2562 from sdodson/etcd3Scott Dodson2016-11-1418-81/+366
|\ \ \ \ \ \ \ \
| * | | | | | | | Actually upgrade host etcdctl no matter whatScott Dodson2016-11-141-2/+2