summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6202 from mgugino-upstream-stage/fix-any-sys-containersMichael Gugino2017-11-211-5/+6
|\ | | | | Fix logic for any sys containers
| * Fix logic for any sys containersMichael Gugino2017-11-211-5/+6
| | | | | | | | Remove set_fact in favor of the variables directly.
* | Merge pull request #6209 from jlebon/pr/use-env-varScott Dodson2017-11-211-19/+1
|\ \ | | | | | | papr: use new PAPR_PULL_TARGET_BRANCH
| * | papr: use new PAPR_PULL_TARGET_BRANCHJonathan Lebon2017-11-211-19/+1
| | | | | | | | | | | | | | | | | | PAPR now provides pull request tests with the branch that the test is targeting. Let's use that instead of querying the GitHub API and possibly running through the unauthenticated limit.
* | | Merge pull request #6145 from mtnbikenc/consolidate-openshift-etcdScott Dodson2017-11-2135-41/+38
|\ \ \ | | | | | | | | Playbook Consolidation - openshift-etcd
| * | | Playbook Consolidation - openshift-etcdRussell Teague2017-11-1635-41/+38
| | | |
* | | | Merge pull request #6175 from zgalor/tunable_prometheusScott Dodson2017-11-213-2/+13
|\ \ \ \ | | | | | | | | | | Allow modifying and adding prometheus application arguments
| * | | | Allow modifying and adding prometheus application argumentsZohar Galor2017-11-193-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | config.file and web.listen-address remain unconfigurable (Changing those will break deployment) Storage defaults moved to a list parameter `openshift_prometheus_args` that can be modified and extended.
* | | | | Merge pull request #6148 from mtnbikenc/consolidate-openshift-nfsScott Dodson2017-11-2110-8/+8
|\ \ \ \ \ | | | | | | | | | | | | Playbook Consolidation - openshift-nfs
| * | | | | Playbook Consolidation - openshift-nfsRussell Teague2017-11-1610-8/+8
| | |/ / / | |/| | |
* | | | | Merge pull request #6186 from jarrpa/glusterfs-files-3.8Scott Dodson2017-11-2113-0/+883
|\ \ \ \ \ | | | | | | | | | | | | GlusterFS: Files and templates for 3.8
| * | | | | GlusterFS: Files and templates for 3.8Jose A. Rivera2017-11-2013-0/+883
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | | | Merge pull request #6197 from mgugino-upstream-stage/etcd-imageScott Dodson2017-11-216-12/+10
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Refactor etcd image
| * | | | | Refactor etcd imageMichael Gugino2017-11-206-12/+10
| | |_|_|/ | |/| | | | | | | | | | | | | Simplify logic for etcd_image
* | | | | Merge pull request #6184 from sdodson/bz1469387Scott Dodson2017-11-211-1/+2
|\ \ \ \ \ | |/ / / / |/| | | | Only remove empty keys from env if env exists
| * | | | Only remove empty keys from env if env existsScott Dodson2017-11-201-1/+2
| |/ / /
* | | | Merge pull request #6183 from sdodson/etcd-32OpenShift Merge Robot2017-11-201-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Upgrade to etcd 3.2 It's got wonderful fixes that we'd enjoy having.
| * | | | Upgrade to etcd 3.2Scott Dodson2017-11-201-0/+8
| |/ / /
* | | | Automatic commit of package [openshift-ansible] release [3.8.0-0.8.0].Jenkins CD Merge Bot2017-11-202-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | Automatic commit of package [openshift-ansible] release [3.8.0-0.7.0].Jenkins CD Merge Bot2017-11-202-2/+5
|/ / / | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | Automatic commit of package [openshift-ansible] release [3.8.0-0.6.0].Jenkins CD Merge Bot2017-11-202-2/+5
| | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | Automatic commit of package [openshift-ansible] release [3.8.0-0.5.0].Jenkins CD Merge Bot2017-11-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.8.0-0.4.0].Jenkins CD Merge Bot2017-11-192-2/+5
| |/ |/| | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | Merge pull request #5652 from ruromero/bz1498398OpenShift Merge Robot2017-11-182-0/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Add enclosing <store> tags to sample secure-forward.conf files This fixes [BZ#1498398](https://bugzilla.redhat.com/show_bug.cgi?id=1498398) The examples provided in the documentation to configure the secure forward mention the configuration must be enclosed between the <store> tag. For that I think the examples should include it as well. See [3.6 Documentation](https://docs.openshift.com/container-platform/3.6/install_config/aggregate_logging.html#aggregated-fluentd) ~~~ <store> @type secure_forward self_hostname pod-${HOSTNAME} shared_key thisisasharedkey secure yes enable_strict_verification yes ca_cert_path /etc/fluent/keys/your_ca_cert ca_private_key_path /etc/fluent/keys/your_private_key ca_private_key_passphrase passphrase <server> host ose1.example.com port 24284 </server> <server> host ose2.example.com port 24284 standby </server> <server> host ose3.example.com port 24284 standby </server> </store> ~~~
| * | bug 1498398. Enclose content between store tagRuben Romero Montes2017-10-042-0/+4
| | |
* | | Automatic commit of package [openshift-ansible] release [3.8.0-0.3.0].Jenkins CD Merge Bot2017-11-172-2/+15
| | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | Merge pull request #6147 from mtnbikenc/consolidate-openshift-checksOpenShift Merge Robot2017-11-1729-53/+49
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Playbook Consolidation - openshift-checks - Create playbooks/openshift-checks directory - Move everything from playbooks/byo/openshift-checks to playbooks/openshift-checks - Move everything from playbooks/common/openshift-checks to playbooks/openshift-checks/private - Fix all include path references throughout playbooks/ Trello: https://trello.com/c/2Rx1uvjz/547-2-playbook-consolidation-openshift-checks
| * | | Playbook Consolidation - openshift-checksRussell Teague2017-11-1629-53/+49
| | |/ | |/|
* | | Merge pull request #6150 from jarrpa/glusterfs-block-fixLuke Meyer2017-11-178-12/+28
|\ \ \ | | | | | | | | GlusterFS: Add configuration for auto creating block-hosting volumes
| * | | GlusterFS: Add configuration for auto creating block-hosting volumesJose A. Rivera2017-11-168-12/+28
| | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | Merge pull request #6132 from jlebon/pr/bump-and-fixScott Dodson2017-11-172-29/+58
|\ \ \ \ | | | | | | | | | | papr: auto-detect image tag to use and bump to f27
| * | | | papr: auto-detect image tag to use and bump to f27Jonathan Lebon2017-11-172-29/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current PAPR tests are failing because we're using an outdated image tag. Switch to auto-magically determining which image tag to use based on the branch the PR we're running in is targeting, which lets us not have to worry about the tag version becoming stale again. This is similar to what the containerized tests from `aos-cd-jobs` are doing (i.e. use `git describe --abbrev=0` in the target branch to determine the image tag to use). Also bump to the brand new f27 release, which allows us to drop the temporary workaround for the glibc/libsolv bug.
* | | | | Merge pull request #6167 from kwoodson/mtu_int_valueOpenShift Merge Robot2017-11-172-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Updating mtu value to int
| * | | | | Updating mtu value to intKenny Woodson2017-11-172-2/+2
| | | | | |
* | | | | | Merge pull request #6153 from jcantrill/es_prom_service_selector_errorOpenShift Merge Robot2017-11-171-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. fix the logging-es-prometheus selector This PR fixes the the service selector for the prometheus service
| * | | | | | fix the logging-es-prometheus selectorJeff Cantrill2017-11-161-1/+1
| |/ / / / /
* | | | | | Merge pull request #6082 from mgugino-upstream-stage/combine-node-upgradeOpenShift Merge Robot2017-11-1628-483/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Combine openshift_node and openshift_node_upgrade Currently, having openshift_node and openshift_node_upgrade as two distinct roles has created a duplication across handlers, templates, and some tasks. This commit combines the roles to reduce duplication and bugs encountered by not putting code in both places.
| * | | | | | Combine openshift_node and openshift_node_upgradeMichael Gugino2017-11-1628-483/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, having openshift_node and openshift_node_upgrade as two distinct roles has created a duplication across handlers, templates, and some tasks. This commit combines the roles to reduce duplication and bugs encountered by not putting code in both places.
* | | | | | | Merge pull request #6114 from sosiouxme/20171114-registry-console-tech-debtOpenShift Merge Robot2017-11-1610-25/+49
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. registry-console tech debt Followup to https://github.com/openshift/openshift-ansible/pull/5829 Replaces https://github.com/openshift/openshift-ansible/pull/6093 Fixes the construction and checking of registry-console images to be as similar as it can get to those constructed from the traditional `oreg_url` without tacking on `ose-` or `origin-` to the base name. I did not see a reason for having `registry.access.redhat.com/` as a hardcoded enterprise default so I took it out. Someone say something if there was a good reason for this.
| * | | | | | registry-console: align image and checkLuke Meyer2017-11-154-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enable option to configure basename in image docker_image_availability check: follow registry-console image options
| * | | | | | registry-console template 3.8 consistencyLuke Meyer2017-11-152-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | don't hardcode the enterprise registry; construct the image like origin
| * | | | | | registry-console template 3.7 consistencyLuke Meyer2017-11-152-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | don't hardcode the enterprise registry; construct the image like origin
| * | | | | | registry-console template 3.6 consistencyLuke Meyer2017-11-152-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | don't hardcode the enterprise registry; construct the image like origin
* | | | | | | Automatic commit of package [openshift-ansible] release [3.8.0-0.2.0].Jenkins CD Merge Bot2017-11-162-2/+244
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | Merge pull request #6029 from boeboe/masterOpenShift Merge Robot2017-11-163-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. logging with static pvc: allow specifying the storage class name See https://github.com/openshift/openshift-ansible/issues/6028 for more info and motivation.
| * | | | | | | logging with static pvc: allow specifying the storage class nameBart Van Bos2017-11-063-0/+6
| | | | | | | |
* | | | | | | | Merge pull request #6021 from luis5tb/masterScott Dodson2017-11-162-0/+13
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | Initial Kuryr Ports Pool Support
| * | | | | | | Initial Kuryr Ports Pool SupportLuis Tomas Bolivar2017-11-072-0/+13
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commits enables the ports pool driver when deploying kuryr networking on top of OpenShift in containers. It also exposes some configuration options such as the maximum and minimum pool sizes, as well as the bulk subports creation size and the time between pools update actions.
* | | | | | | Merge pull request #6142 from mtnbikenc/fix-initRussell Teague2017-11-162-8/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Fix openstack init
| * | | | | | Fix openstack initRussell Teague2017-11-162-8/+3
|/ / / / / /