summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6193 from mgugino-upstream-stage/etc-runtimeMichael Gugino2017-11-2217-104/+92
|\ | | | | Cleanup etcd runtime variable.
| * Cleanup etcd runtime variable.Michael Gugino2017-11-2117-104/+92
| | | | | | | | Cleaning out reference to etcd_runtime in openshift facts.
* | Merge pull request #6152 from mtnbikenc/consolidate-openshift-metricsRussell Teague2017-11-228-7/+9
|\ \ | | | | | | Playbook Consolidation - openshift-metrics
| * | Playbook Consolidation - openshift-metricsRussell Teague2017-11-168-7/+9
| | |
* | | Merge pull request #6146 from mtnbikenc/consolidate-openshift-loadbalancerRussell Teague2017-11-2211-9/+9
|\ \ \ | | | | | | | | Playbook Consolidation - openshift-loadbalancer
| * | | Playbook Consolidation - openshift-loadbalancerRussell Teague2017-11-1611-9/+9
| |/ /
* | | Automatic commit of package [openshift-ansible] release [3.8.0-0.9.0].Jenkins CD Merge Bot2017-11-222-2/+20
| | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | Merge pull request #6200 from mgugino-upstream-stage/node-sys-containerMichael Gugino2017-11-214-5/+5
|\ \ \ | | | | | | | | Fix node system container var
| * | | Fix node system container varMichael Gugino2017-11-214-5/+5
| | |/ | |/| | | | | | | Fix logic, make it simpler.
* | | Merge pull request #6204 from richm/mux-int-portLuke Meyer2017-11-212-2/+2
|\ \ \ | | | | | | | | mux containerPort must be an int not a string
| * | | containerPort must be an int; correctly quote/brace replicas valueRich Megginson2017-11-212-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mux containerPort must be an int The eventrouter REPLICAS must use the double quote/double brace syntax documented here: https://docs.openshift.org/latest/dev_guide/templates.html#writing-parameters And must be escaped because it uses double braces, as explained here: http://jinja.pocoo.org/docs/dev/templates/#escaping
* | | | Merge pull request #6144 from mtnbikenc/init-include-deprecationRussell Teague2017-11-2110-22/+21
|\ \ \ \ | | | | | | | | | | Include Deprecation - Init Playbook Paths
| * | | | Include Deprecation - Init Playbook PathsRussell Teague2017-11-1610-22/+21
| | |_|/ | |/| |
* | | | Merge pull request #6158 from mtnbikenc/consolidate-openshift-nodeRussell Teague2017-11-2137-33/+33
|\ \ \ \ | |_|_|/ |/| | | Playbook Consolidation - openshift-node
| * | | Add temporary playbook for CI test functionalityRussell Teague2017-11-211-0/+3
| | | |
| * | | Playbook Consolidation - openshift-nodeRussell Teague2017-11-2137-34/+31
| | | |
* | | | 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
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 09:10:45 +0000