summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7116 from mgugino-upstream-stage/fix-docker-upgradeOpenShift Merge Robot2018-02-134-9/+16
|\
| * Fix docker_upgrade variableMichael Gugino2018-02-124-9/+16
* | Merge pull request #7121 from sdodson/fix-registry-cert-redeployKenny Woodson2018-02-131-1/+1
|\ \
| * | Invert logic to decide when to re-deploy certsScott Dodson2018-02-121-1/+1
* | | Merge pull request #6951 from tomassedovic/fix-openstack-masterOpenShift Merge Robot2018-02-133-12/+16
|\ \ \
| * | | Remove cluster_facts.yml from the install.ymlTomas Sedovic2018-02-121-1/+0
| * | | Fix OpenStack playbooksTomas Sedovic2018-02-123-12/+17
* | | | Merge pull request #5251 from celebdor/configurable_node_startOpenShift Merge Robot2018-02-132-5/+12
|\ \ \ \
| * | | | Make node start options configurableAntoni Segura Puimedon2017-12-212-5/+12
* | | | | Merge pull request #7122 from mgugino-upstream-stage/add-gcp-multizone-varOpenShift Merge Robot2018-02-134-2/+5
|\ \ \ \ \
| * | | | | Add openshift_gcp_multizone boolMichael Gugino2018-02-124-2/+5
| | |_|_|/ | |/| | |
* | | | | Merge pull request #7117 from mgugino-upstream-stage/fix-gcp-varsOpenShift Merge Robot2018-02-121-4/+6
|\ \ \ \ \
| * | | | | Fix gcp variable warningsMichael Gugino2018-02-121-4/+6
| |/ / / /
* | | | | Merge pull request #7095 from jpeeler/upgrade-catOpenShift Merge Robot2018-02-121-0/+7
|\ \ \ \ \
| * | | | | Add service catalog to be upgradedJeff Peeler2018-02-121-0/+7
* | | | | | Merge pull request #7119 from vrutkovs/etcd-scaleup-ansible-nameOpenShift Merge Robot2018-02-121-2/+2
|\ \ \ \ \ \
| * | | | | | etcd_scaleup: use inventory_hostname when etcd ca host is being pickedVadim Rutkovsky2018-02-121-2/+2
* | | | | | | Merge pull request #7113 from mgugino-upstream-stage/fix-etcd-scaleup-sanityMichael Gugino2018-02-122-1/+19
|\ \ \ \ \ \ \
| * | | | | | | Fix etcd scaleup playsMichael Gugino2018-02-122-1/+19
* | | | | | | | Merge pull request #7108 from spadgett/check-version-for-console-installOpenShift Merge Robot2018-02-121-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Disable console install when not 3.9 or newerSamuel Padgett2018-02-121-1/+3
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #7103 from vrutkovs/origin-dns-prepend-cluster-localOpenShift Merge Robot2018-02-121-2/+3
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | origin-dns: make sure cluster.local DNS server is listed firstVadim Rutkovsky2018-02-121-2/+3
| |/ / / / / /
* | | | | | | Merge pull request #7107 from csrwng/cluster_operator_componentsOpenShift Merge Robot2018-02-121-0/+24
|\ \ \ \ \ \ \
| * | | | | | | Add playbook to install components for cluster operatorCesar Wong2018-02-121-0/+24
* | | | | | | | Merge pull request #7083 from SaravanaStorageNetwork/fix_templatesOpenShift Merge Robot2018-02-129-20/+370
|\ \ \ \ \ \ \ \
| * | | | | | | | Backport changes for glusterfs, heketi, s3 and block templatesSaravanakumar Arumugam2018-02-129-20/+370
* | | | | | | | | Merge pull request #6476 from jihoon5/jihoon5Michael Gugino2018-02-121-0/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Support master node high availabilityjihoon.o2017-12-141-0/+4
* | | | | | | | | Merge pull request #6699 from bogdando/heat_user_dataOpenShift Merge Robot2018-02-123-0/+50
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix openshift_openstack_provision_user_commandsBogdan Dobrelya2018-02-122-5/+5
| * | | | | | | | | Fix wordingBogdan Dobrelya2018-02-091-1/+1
| * | | | | | | | | Fix cloud init runcmd templatingBogdan Dobrelya2018-02-092-8/+17
| * | | | | | | | | Note ignored Heat user data changes for openstackBogdan Dobrelya2018-02-091-0/+4
| * | | | | | | | | Clarify the ansible playbook vs cloud-initBogdan Dobrelya2018-02-092-5/+29
| * | | | | | | | | Fix openstack cloud-init runcmd templatingBogdan Dobrelya2018-02-091-1/+1
| * | | | | | | | | [openstack] custom user commands for cloud-initBogdan Dobrelya2018-02-093-0/+13
* | | | | | | | | | Merge pull request #7073 from abutcher/aws-node-hostnameOpenShift Merge Robot2018-02-122-8/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove node start from bootstrap.yml.Andrew Butcher2018-02-121-8/+0
| * | | | | | | | | | Restart systemd-hostnamed before restarting NetworkManager in node user-data.Andrew Butcher2018-02-121-0/+3
* | | | | | | | | | | Merge pull request #7099 from vrutkovs/etcd-containerized-upgradeOpenShift Merge Robot2018-02-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Use r_etcd_common_etcdctl_command instead of hardcoded binary name to support...Vadim Rutkovsky2018-02-101-1/+1
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #7022 from vrutkovs/sanitize-labelsOpenShift Merge Robot2018-02-1216-330/+462
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Fix indentation to make yamllint happyVadim Rutkovsky2018-02-1011-330/+330
| * | | | | | | | | Verify that requested services have schedulable nodes matching the selectorsVadim Rutkovsky2018-02-1015-2/+134
| |/ / / / / / / /
* | | | | | | | | Merge pull request #7105 from vrutkovs/additional-mounts-exampleScott Dodson2018-02-121-0/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | additional mounts: specify 'type' in container_runtime_crio_additional_mountsVadim Rutkovsky2018-02-121-0/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #7001 from mbruzek/cidr_pool_start_endOpenShift Merge Robot2018-02-123-19/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Removing prefix and replacing with cidr, pool_start and pool_end variables.Matt Bruzek2018-02-023-19/+14
* | | | | | | | Merge pull request #7093 from sdodson/bz1534917OpenShift Merge Robot2018-02-093-6/+6
|\ \ \ \ \ \ \ \