summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Initial Kuryr supportMichał Dulko2017-10-2015-3/+723
| | | | | | | | This commit enables deploying Kuryr networking on top of OpenShift in containers. kuryr-controller is a Deployment and kuryr-cni is deployed as DaemonSet (container will drop all CNI configuration files). Co-Authored-By: Antoni Segura Puimedon <celebdor@gmail.com>
* 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
| * | | | | | | Add ability to set node and master imageConfig to latestMichael Gugino2017-10-124-2/+8
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.158.0].Jenkins CD Merge Bot2017-10-172-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | Merge pull request #5704 from josefkarasek/docker-auditOpenShift Merge Robot2017-10-164-1/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Add switch to enable/disable container engine's audit log being stored in elasticsearch If enabled, tho logs are stored in ES' operations index, accessible only by cluster admins.
| * | | | | | | Add switch to enable/disable container engine's audit log being stored in ES.Josef Karasek2017-10-114-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If enabled, tho logs are stored in ES' operations index, accesible only by cluster admins.
* | | | | | | | Merge pull request #5734 from mtnbikenc/refactor-mgmt-entryOpenShift Merge Robot2017-10-166-31/+22
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Refactor openshift-management entry point Moves checkpointing steps into path for both full cluster install and individual entry point playbook.
| * | | | | | | Refactor openshift-management entry pointRussell Teague2017-10-126-31/+22
| | | | | | | |
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.157.0].Jenkins CD Merge Bot2017-10-162-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | Merge pull request #5733 from ↵OpenShift Merge Robot2017-10-161-6/+18
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ingvagabund/data-migrate-of-embedded-etcd-not-allowed Automatic merge from submit-queue. data migration of embedded etcd not allowed The v2->v3 migration of an embedded etcd is depricated. Instead, one needs to run: 1. `playbooks/byo/openshift-etcd/embedded2external.yml` to migrate the embedded etcd to an external one (see https://github.com/openshift/openshift-ansible/pull/5672) 2. then `playbooks/byo/openshift-etcd/migrate.yml` to migrate the v2 data to v3 data
| * | | | | | | data migration of embedded etcd not allowedJan Chaloupka2017-10-121-6/+18
| |/ / / / / /
* | | | | | | Merge pull request #5667 from jarrpa/deploy-heketi-fix-3.7Scott Dodson2017-10-161-8/+0
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | GlusterFS: remove topology reference from deploy-heketi
| * | | | | | GlusterFS: remove topology reference from deploy-heketiJose A. Rivera2017-10-041-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.156.0].Jenkins CD Merge Bot2017-10-162-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | Merge pull request #5747 from ↵OpenShift Merge Robot2017-10-153-3/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ingvagabund/set-initial-etcd-cluster-properly-system-container-scale-up Automatic merge from submit-queue. Set initial etcd cluster properly during system container scale up When a cluster is scaled up, the ETCD_INITIAL_CLUSTER must not contain etcd members that are not about to start or are not part of the etcd cluster. Consolidating `initial_etcd_cluster` and `etcd_initial_cluster` as they do exactly the same. Bug: 1500667
| * | | | | | | set initial etcd cluster properly during system container scale upJan Chaloupka2017-10-133-3/+4
| | | | | | | |
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.155.0].Jenkins CD Merge Bot2017-10-152-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.154.0].Jenkins CD Merge Bot2017-10-142-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.153.0].Jenkins CD Merge Bot2017-10-132-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | Merge pull request #5735 from ↵Jan Chaloupka2017-10-131-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | ingvagabund/default-oo_new_etcd_to_config-to-empty-list Default groups.oo_new_etcd_to_config to an empty list
| * | | | | | default groups.oo_new_etcd_to_config to an empty listJan Chaloupka2017-10-121-1/+1
| | |/ / / / | |/| | | |
* | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.152.0].Jenkins CD Merge Bot2017-10-132-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.151.0].Jenkins CD Merge Bot2017-10-132-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | Merge pull request #5414 from ekuric/pvc_dynamic_metricsOpenShift Merge Robot2017-10-131-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. updated dynamic storage section for openshift metrics updated dynamic storage section for openshift metrics to support storage class name Signed-off-by: Elvir Kuric <elvirkuric@gmail.com>