summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* allow to configure oreg_url specifically for node or master. refs #4233Tobias Brunner2017-05-199-22/+31
| | | | | | | | | This commit allows to specify imageConfig.format specifically for master or for nodes. One use case of this could be if you want to use customer builder images. In this case imageConfig.format only needs to be changed in the master-config.yml but not in the node-config.yml.
* Merge pull request #4073 from richm/logging-es-routeScott Dodson2017-05-195-0/+205
|\ | | | | add ability to expose Elasticsearch as an external route
| * add ability to expose Elasticsearch as an external routeRich Megginson2017-05-185-0/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the ability to expose Elastisearch as a route outside of the cluster. - `openshift_logging_es_allow_external`: True (default is False) - if this is True, Elasticsearch will be exposed as a Route - `openshift_logging_es_ops_hostname`: The external facing hostname to use for the route and the TLS server certificate (default is "es." + `openshift_master_default_subdomain`) There are other similar parameters for the TLS server cert, key, and CA cert. There are other similar parameters for when the OPS cluster is deployed e.g. `openshift_logging_es_ops_allow_external`, etc.
* | Merge pull request #4094 from ashcrow/status-doesnt-existJan Chaloupka2017-05-192-2/+2
|\ \ | | | | | | Ensure good return code for specific until loops
| * | Ensure good return code for specific until loopsSteve Milner2017-05-042-2/+2
| | |
* | | Merge pull request #4128 from VincentS/Container_Registry_FirewalldJan Chaloupka2017-05-192-0/+10
|\ \ \ | | | | | | | | Added Container Registry Port 5000 to Firewalld
| * | | Added Docker Registry Port 5000 to FirewalldVincent Schwarzer2017-05-182-0/+10
| | | |
* | | | Merge pull request #4145 from VincentS/Calico_ParameterizationJan Chaloupka2017-05-194-3/+32
|\ \ \ \ | | | | | | | | | | Parameterized Calico/Node Arguments
| * | | | Parameterized Calico/Node ArgumentsVincent Schwarzer2017-05-184-3/+32
| |/ / /
* | | | Merge pull request #4125 from VincentS/Calico_BGP_PortJan Chaloupka2017-05-192-0/+9
|\ \ \ \ | | | | | | | | | | Added Calico BGP Port 179 to Firewalld
| * | | | Added Calico BGP Port 179 to FirewalldVincent Schwarzer2017-05-152-0/+9
| | | | |
* | | | | Merge pull request #4224 from VincentS/LocalTMPDir_FixOpenShift Bot2017-05-191-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| * | | | | Localhost TMP Dir FixVincent Schwarzer2017-05-181-0/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #4218 from abutcher/uninstall-container-engine-dockerOpenShift Bot2017-05-191-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| * | | | | Uninstall: restart docker when container-engine restart hasn't changed.Andrew Butcher2017-05-171-1/+1
| | | | | |
* | | | | | Merge pull request #3660 from juanvallejo/jvallejo/add-etcd-clustersize-checkOpenShift Bot2017-05-183-0/+534
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Merged by openshift-bot
| * | | | | add etcd cluster size checkjuanvallejo2017-05-173-0/+534
| | | | | |
* | | | | | Merge pull request #4208 from abutcher/local-action-delegateOpenShift Bot2017-05-184-12/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | Remove use of local_action with delegate_to and switch 'delegate_to: ↵Andrew Butcher2017-05-164-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | localhost' temporary directory cleanup actions to local_actions.
* | | | | | | Merge pull request #4183 from jpeeler/masterOpenShift Bot2017-05-183-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | Fix python3 error in repoqueryJeff Peeler2017-05-133-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly convert from bytes to string so that splitting the string is successful. This change works with python 2 as well. Closes #4182
* | | | | | | | Merge pull request #3914 from rikkuness/yaml_newlineOpenShift Bot2017-05-181-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | Prevent line wrap in yaml dump of IDP, fixes #3912Darrian2017-04-121-0/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #4165 from sdodson/BZ1450167OpenShift Bot2017-05-181-0/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | Reset selinux context on /var/lib/origin/openshift.common.volumesScott Dodson2017-05-111-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1450167
* | | | | | | | | | Merge pull request #4190 from sdodson/BZ1428934OpenShift Bot2017-05-181-1/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | Include object validation in 3.6 upgradesScott Dodson2017-05-151-1/+3
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1428934
* | | | | | | | | | Merge pull request #4142 from VincentS/Adjustment_Naming_SchemaOpenShift Bot2017-05-184-19/+19
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | Adjusted Naming Schema of Calico RolesVincent Schwarzer2017-05-184-19/+19
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #4205 from stevekuznetsov/skuznets/logging-tmpdirScott Dodson2017-05-181-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Don't escalate privileges in local tmpdir creation
| * | | | | | | | | | Don't escalate privileges in local tmpdir creationSteve Kuznetsov2017-05-161-0/+1
| | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running `ansible-playbook` as a non-root user, if a local temporary directory is created without explicitly not escalating privileges, the directory will not be readable to the user running the playbook on the controller host, which will lead to tasks like `fetch` failing to place files into the directory. Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
* | | | | | | | | | Merge pull request #4176 from mtnbikenc/refactor-openshift_excludersOpenShift Bot2017-05-1819-253/+254
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | Rework openshift_excluders roleRussell Teague2017-05-1619-253/+254
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #4143 from VincentS/calicoctl_roleJan Chaloupka2017-05-182-0/+11
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | Added Calicoctl to deployment of Master Nodes when Calico is used
| * | | | | | | | | Added Calicoctl to deployment of Master NodesVincent Schwarzer2017-05-182-0/+11
|/ / / / / / / / /
* | | | | | | | | Merge pull request #4213 from giuseppe/change-requires-to-wants-openvswitchOpenShift Bot2017-05-182-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | node, systemd: change Requires to Wants for openvswitchGiuseppe Scrivano2017-05-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes the node container is not started on a container-engine restart. Use a weaker dependency on openvswitch that is causing this issue Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1451192 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | | | | | Merge pull request #4216 from ingvagabund/fix-etcd-upgrade-system-containerOpenShift Bot2017-05-171-39/+57
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | fix etcd_container_version detectionJan Chaloupka2017-05-171-39/+57
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #4214 from giuseppe/rename-ENIRONMENT-to-EnvironmentOpenShift Bot2017-05-171-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | | systemcontainercustom.conf.j2: use Environment instead of ENVIRONMENTGiuseppe Scrivano2017-05-171-3/+3
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1451187 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | | | | | | Merge pull request #4127 from VincentS/Calico_Additional_ChecksOpenShift Bot2017-05-171-1/+9
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | | Change based on feedbackVincent Schwarzer2017-05-101-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Added additional Calico Network Plugin ChecksVincent Schwarzer2017-05-091-1/+9
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #4221 from sdodson/fix-gpg-key-pathScott Dodson2017-05-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Centos PaaS SIG GPG path
| * | | | | | | | | | | | Fix gpg key path in our repoScott Dodson2017-05-171-1/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #4199 from smarterclayton/set_image_policyOpenShift Bot2017-05-172-1/+23
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | | Default image policy on new clusters to onClayton Coleman2017-05-152-1/+23
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Will allow for default image resolution to be used.
* | | | | | | | | | | Merge pull request #4173 from ashcrow/1450310OpenShift Bot2017-05-171-5/+22
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | Add regexp for container-engine lineinfileSteve Milner2017-05-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that if the line already exists it will be updated with the expected results from the installer.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 22:29:16 +0000