summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7135 from abutcher/node-accept-failOpenShift Merge Robot2018-02-143-0/+15
|\
| * oc_adm_csr: Add fail_on_timeout parameter which causes module to fail when ti...Andrew Butcher2018-02-133-0/+15
* | Merge pull request #7140 from kwoodson/yedit_json_filesOpenShift Merge Robot2018-02-1432-188/+560
|\ \
| * | Adding ability to yedit json files.Kenny Woodson2018-02-1332-188/+560
* | | Merge pull request #7143 from tomassedovic/openstack-shade-usageOpenShift Merge Robot2018-02-141-1/+1
|\ \ \ | |/ / |/| |
| * | Fix metadata access in OpenStack inventoryTomas Sedovic2018-02-141-1/+1
|/ /
* | Merge pull request #7133 from ewolinetz/logging_eventrouter_template_fixOpenShift Merge Robot2018-02-131-0/+109
|\ \
| * | Adding missing templateEric Wolinetz2018-02-131-0/+109
* | | Merge pull request #7130 from kwoodson/preinstall_rpmsOpenShift Merge Robot2018-02-133-8/+13
|\ \ \
| * | | Move installation of packages before container_runtime to ensure bind mounts ...Kenny Woodson2018-02-133-8/+13
* | | | Merge pull request #6918 from SaravanaStorageNetwork/uninstall_playbookOpenShift Merge Robot2018-02-138-101/+244
|\ \ \ \ | |_|/ / |/| | |
| * | | erase data only if variable is set.Saravanakumar Arumugam2018-02-072-8/+12
| * | | uninstall playbook for GlusterFSSaravanakumar Arumugam2018-02-078-101/+240
* | | | Merge pull request #7106 from jarrpa/pvc-gen-storageclassOpenShift Merge Robot2018-02-132-1/+10
|\ \ \ \
| * | | | Allow for blank StorageClass in PVC creationJose A. Rivera2018-02-122-1/+10
* | | | | 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