summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic commit of package [openshift-ansible] release [3.7.0-0.167.0].Jenkins CD Merge Bot2017-10-192-2/+5
| | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* Automatic commit of package [openshift-ansible] release [3.7.0-0.166.0].Jenkins CD Merge Bot2017-10-192-2/+5
| | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* Automatic commit of package [openshift-ansible] release [3.7.0-0.165.0].Jenkins CD Merge Bot2017-10-192-2/+5
| | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* Automatic commit of package [openshift-ansible] release [3.7.0-0.164.0].Jenkins CD Merge Bot2017-10-192-2/+15
| | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* Merge pull request #5746 from staebler/Bug_1496694_new_resource_namesScott Dodson2017-10-1910-73/+125
|\ | | | | Update service catalog playbook for service-catalog rc1
| * Change to service-signer.crt for template_service_broker CA_BUNDLEstaebler2017-10-182-3/+3
| |
| * Use service-signer.crt for ca_bundle passed to clusterservicebrokerstaebler2017-10-182-2/+6
| |
| * Rename ServiceBroker to ClusterServiceBroker for ansible_service_broker task.staebler2017-10-172-3/+3
| |
| * Add apiserver.crt to service-catalog controller-manager deployment.staebler2017-10-172-0/+21
| |
| * Remove redundant faulty role binding ifrom kubeservicecatalog_roles_bindings.ymlstaebler2017-10-174-16/+3
| |
| * Update service catalog playbook for service-catalog rc1staebler2017-10-147-64/+104
| |
* | Automatic commit of package [openshift-ansible] release [3.7.0-0.163.0].Jenkins CD Merge Bot2017-10-192-2/+5
| | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | Merge pull request #5809 from enoodle/set_use_manageiq_as_defaultScott Dodson2017-10-191-1/+1
|\ \ | | | | | | set use_manageiq true as default
| * | set use_manageiq as defaultErez Freiberger2017-10-191-1/+1
|/ /
* | Automatic commit of package [openshift-ansible] release [3.7.0-0.162.0].Jenkins CD Merge Bot2017-10-192-2/+6
| | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | Merge pull request #5763 from mgugino-upstream-stage/fix-master-config-upgradeScott Dodson2017-10-184-64/+0
|\ \ | | | | | | Remove unneeded master config updates during upgrades
| * | Remove unneeded master config updates during upgradesMichael Gugino2017-10-174-64/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, upgrade_control_plane.yml will add any missing sections to the openshift master's config. These additions are only needed once. Users who perform multiple upgrades to their clusters over time do not need to have these variables re-inserted. Currently, re-inserting these variables can cause unwanted local changes. This commit ensures that the variables are only inserted into openshift master's config once. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1486054
* | | Merge pull request #5804 from smarterclayton/increase_timeoutScott Dodson2017-10-181-1/+1
|\ \ \ | | | | | | | | Wait longer for GCP stability
| * | | Wait longer for stable GCP instancesClayton Coleman2017-10-181-1/+1
|/ / / | | | | | | | | | | | | We are seeing instances take longer than 5m to become available, possibly due to GCP infra issues.
* | | Automatic commit of package [openshift-ansible] release [3.7.0-0.161.0].Jenkins CD Merge Bot2017-10-182-2/+5
| | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | Automatic commit of package [openshift-ansible] release [3.7.0-0.160.0].Jenkins CD Merge Bot2017-10-182-2/+10
| | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | Merge pull request #5789 from zgalor/fix_limit_typoScott Dodson2017-10-181-1/+1
|\ \ \ | | | | | | | | Fix typo in setting prom-proxy memory limit
| * | | Fix typo in setting prom-proxy memory limitZohar Galor2017-10-181-1/+1
| | | | | | | | | | | | | | | | bz: https://bugzilla.redhat.com/show_bug.cgi?id=1493368
* | | | Merge pull request #5791 from zgalor/fix_selector_defaultScott Dodson2017-10-181-3/+3
|\ \ \ \ | |/ / / |/| | | Fix pvc selector default to be empty dict instead of string
| * | | Fix pvc selector default to be empty dict instead of stringZohar Galor2017-10-181-3/+3
|/ / /
* | | Merge pull request #5361 from kwoodson/fix_bootstrap_filesScott Dodson2017-10-1824-93/+429
|\ \ \ | | | | | | | | Provisioning updates.
| * | | Do not remove files for bootstrap if resolv or dns.Kenny Woodson2017-10-1724-93/+429
| | | |
* | | | Merge pull request #5459 from zgalor/nfs_fixScott Dodson2017-10-1816-353/+1201
|\ \ \ \ | | | | | | | | | | Fix prometheus role nfs
| * | | | Fix prometheus role nfsZohar Galor2017-10-1616-353/+1201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow for external or internal nfs. use facts as used for logging and metrics. Update prometheus-alertmanager image to v0.9.1
* | | | | Merge pull request #5774 from mgugino-upstream-stage/docker-option-fixScott Dodson2017-10-182-5/+7
|\ \ \ \ \ | | | | | | | | | | | | Fix missing docker option signature-verification
| * | | | | Fix missing docker option signature-verificationMichael Gugino2017-10-162-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, docker 1.12 can be configured to use the run-time parameter of 'signature-verification' By default, rpm installation of docker results in '--signature-verification=false' being added to OPTIONS in /etc/sysconfig/docker Currently, openshift-ansible does not preserve that value. This can cause docker to be unable to pull images from a previously working source due to a change in configuration. This commit adds the option with the default as provided by the rpm installation. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1502560
* | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.159.0].Jenkins CD Merge Bot2017-10-182-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | Merge pull request #5785 from sdodson/tsb-rpm-fixScott Dodson2017-10-171-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Updating openshift-ansible.spec file to include files dir
| * | | | | | Updating openshift-ansible.spec file to include files dirScott Dodson2017-10-171-0/+4
|/ / / / / /
* | | | | | Merge pull request #5730 from sdodson/restart-controllersScott Dodson2017-10-172-0/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | Restart all controllers to force reconfiguration during upgrade
| * | | | | | Restart all controllers to force reconfiguration during upgradeScott Dodson2017-10-112-0/+30
| | | | | | |
* | | | | | | Merge pull request #5754 from ewolinetz/bz1501831Scott Dodson2017-10-175-87/+103
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Updating ES proxy image prefix and version to match other components
| * | | | | | Reverting proxy image version to v1.0.0 to pass CIEric Wolinetz2017-10-161-1/+1
| | | | | | |
| * | | | | | Making travis happyEric Wolinetz2017-10-161-83/+83
| | | | | | |
| * | | | | | Updating pattern for elasticsearch_proxy imagesEric Wolinetz2017-10-134-3/+17
| | | | | | |
| * | | | | | Updating ES proxy image prefix and version to match other componentsEric Wolinetz2017-10-133-4/+6
| | | | | | |
* | | | | | | Merge pull request #5777 from wozniakjan/eventrouter_bug1501768Scott Dodson2017-10-171-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Bug 1501768: fix eventrouter nodeSelector padding
| * | | | | | | Bug 1501768: fix eventrouter nodeSelector paddingJan Wozniak2017-10-171-2/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #5765 from abutcher/service-serving-cert-typoOpenShift Merge Robot2017-10-175-2/+42
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Ensure controllerConfig.serviceServingCert is correctly set during upgrade. A typo was originally introduced in https://github.com/openshift/openshift-ansible/pull/2449 causing an incorrect key to be configured within the master config. This commit ensures that the correct key is set during upgrades. /cc @dlbewley https://bugzilla.redhat.com/show_bug.cgi?id=1500981
| * | | | | | | Ensure controllerConfig.serviceServingCert is correctly set during upgrade.Andrew Butcher2017-10-135-2/+42
| | | | | | | |
* | | | | | | | Merge pull request #5768 from giuseppe/crio-error-out-with-node-docker-containerOpenShift Merge Robot2017-10-171-0/+6
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. cri-o: error out when node is a Docker container Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1489555 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | | | cri-o: error out when node is a Docker containerGiuseppe Scrivano2017-10-161-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1489555 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | | | Merge pull request #5687 from jim-minter/tsb_configOpenShift Merge Robot2017-10-174-10/+23
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Rewire openshift_template_service_broker_namespaces configurable @ewolinetz @bparees
| * | | | | | | | Rewire openshift_template_service_broker_namespaces configurableJim Minter2017-10-134-10/+23
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #5744 from mgugino-upstream-stage/latest-image-configOpenShift Merge Robot2017-10-174-2/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Add ability to set node and master imageConfig to latest Currently, imageConfig.latest is hard-coded to false. This commit adds an appropriate boolean to enable setting to true. Fixes: https://github.com/openshift/openshift-ansible/issues/1422