summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 #4189 from giuseppe/fix-atomic-hostOpenShift Bot2017-05-171-3/+8
|\ | | | | Merged by openshift-bot
| * openshift_version: skip rpm version==image version on AtomicGiuseppe Scrivano2017-05-151-3/+8
| | | | | | | | | | | | since there is no repoquery installed on Atomic Host. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | Merge pull request #4144 from VincentS/Calico_Remove_Hardcoded_URLsJan Chaloupka2017-05-172-3/+7
|\ \ | | | | | | Removed Hardcoded URLs in Calico Role
| * | Removed Hardcoded Calico URLsVincent Schwarzer2017-05-102-3/+7
| | |
* | | Merge pull request #4197 from abutcher/oc_adm_ca_server_cert-hostnames-omitOpenShift Bot2017-05-163-0/+16
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | Filter non-strings from the oc_adm_ca_server_cert hostnames parameter.Andrew Butcher2017-05-153-0/+16
| | | | | | | | | | | | | | | | | | | | This allows the omit filter to be used in the hostnames parameter list which simplifies conditionally added hostnames.
* | | | Merge pull request #4196 from dmsimard/paas_repoOpenShift Bot2017-05-161-2/+6
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | Don't set-up origin repositories if they've already been configuredDavid Moreau-Simard2017-05-151-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CentOS ships the 'centos-release-openshift-origin' package which is used to set up the repository and the key. If this package has been installed prior to running openshift-ansible (i.e, to install ansible or openshift-ansible from RPM), it leads to the repository being set up twice in different files. We're now matching the name of the files and since they are identical, it will stay idempotent while not configuring the repositories twice.
* | | | | Merge pull request #4185 from donnydavis/patch-1OpenShift Bot2017-05-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| * | | | | Fixed for python3 with Fedora 25 AtomicDonny Davis2017-05-141-1/+1
| | | | | | | | | | | | | | | | | | This is not the only required fix, but this does fix one of the many issues.
* | | | | | Merge pull request #4178 from mtnbikenc/fix-templatingOpenShift Bot2017-05-167-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | Fix templating of static service filesRussell Teague2017-05-127-2/+3
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #4187 from giuseppe/uninstall-container-engineOpenShift Bot2017-05-151-0/+7
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Merged by openshift-bot
| * | | | | uninstall: handle container-engineGiuseppe Scrivano2017-05-151-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try to restart the docker service only when there is not already a running container-engine service. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | Merge pull request #4193 from ashcrow/1448998Scott Dodson2017-05-152-8/+8
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | byo inventory versions 3.5 -> 3.6
| * | | | | byo inventory versions 1.5 -> 3.6Steve Milner2017-05-151-4/+4
| | | | | |
| * | | | | byo inventory versions 3.5 -> 3.6Steve Milner2017-05-151-4/+4
|/ / / / /
* | | | | Merge pull request #4184 from ashcrow/rslaveOpenShift Bot2017-05-142-12/+16
|\ \ \ \ \ | |_|_|/ / |/| | | | Merged by openshift-bot
| * | | | Add docker package for container-engine installSteve Milner2017-05-142-12/+16
|/ / / / | | | | | | | | | | | | | | | | The package is required so that openshift_facts is able to use the docker client to gain information on the versions.
* | | | Automatic commit of package [openshift-ansible] release [3.6.68-1].Jenkins CD Merge Bot2017-05-132-2/+50
| | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | Merge pull request #4113 from ↵OpenShift Bot2017-05-133-14/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | jcantrill/bz1448860_make_recovery_after_nodes_to_node_quorum Merged by openshift-bot
| * | | | bug 1448860. Change recovery_after_nodes to match node_quorumJeff Cantrill2017-05-113-14/+6
| | | | |
* | | | | Merge pull request #4155 from ewolinetz/registry_console_upgradeOpenShift Bot2017-05-131-0/+22
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| * | | | | Updating registry-console image version during a post_control_plane upgradeewolinetz2017-05-121-0/+22
| | | | | |
* | | | | | Merge pull request #4174 from ashcrow/remove-userland-proxyOpenShift Bot2017-05-121-2/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | Remove userland-proxy-path from daemon.jsonSteve Milner2017-05-121-2/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | This flag is currently being set within the system container via the init.sh
* | | | | | Merge pull request #4172 from ashcrow/1450307OpenShift Bot2017-05-123-12/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | Fix whistespace issues in custom templateSteve Milner2017-05-121-6/+6
| | | | | | |
| * | | | | | Always add proxy items to atomic.confSteve Milner2017-05-121-4/+1
| | | | | | |
| * | | | | | Move container-engine systemd environment to updated locationSteve Milner2017-05-122-2/+3
| |/ / / / /
* | | | | | Merge pull request #4030 from liggitt/reserved-namespacesOpenShift Bot2017-05-122-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | Reserve kubernetes and 'kubernetes-' prefixed namespacesJordan Liggitt2017-04-272-0/+4
| | | | | | |
* | | | | | | Merge pull request #4162 from jcantrill/bz1439451_kibana_crashOpenShift Bot2017-05-122-10/+33
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Merged by openshift-bot
| * | | | | | bug 1441369. Kibana memory limitsJeff Cantrill2017-05-112-10/+33
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | bug 1439451. Kibana crash (cherry picked from commit 66315ebbfcfda72d6f501c441359d92ec71af7d2)
* | | | | | Merge pull request #4126 from VincentS/SDN_Check_FixJan Chaloupka2017-05-121-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix for OpenShift SDN Check
| * | | | | | Fix for OpenShift SDN CheckVincent Schwarzer2017-05-091-1/+1
| | | | | | |
* | | | | | | Merge pull request #4065 from ingvagabund/introduce-get-rpm-version-roleJan Chaloupka2017-05-1213-67/+106
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Introduce excluder-free rpm version detection role
| * | | | | | | Extend repoquery command (of lib_utils role) to ignore excludersJan Chaloupka2017-05-1113-67/+106
| | | | | | | |
* | | | | | | | Merge pull request #3879 from ingvagabund/run-excluders-on-selected-hosts-onlyJan Chaloupka2017-05-1221-54/+100
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | run excluders over selected set of hosts during control_plane/node upgrade
| * | | | | | | run excluders over selected set of hosts during control_plane/node upgradeJan Chaloupka2017-05-0321-54/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable/reset excluders over requested hosts
* | | | | | | | Merge pull request #4164 from ashcrow/simplify-daemon-jsonOpenShift Bot2017-05-112-45/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | doc: Add link to daemon.json upstream docSteve Milner2017-05-111-0/+2
| | | | | | | | |
| * | | | | | | | Remove unused daemon.json keysSteve Milner2017-05-111-45/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of providing every possible key in the daemon.json configuration file, this update only provides keys which are actively set/used by the installer.
* | | | | | | | | Merge pull request #4115 from ewolinetz/metrics_limits_docsOpenShift Bot2017-05-111-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | Updating size suffix for metrics in roleewolinetz2017-05-081-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #4153 from ewolinetz/bz1449554OpenShift Bot2017-05-111-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | Merged by openshift-bot
| * | | | | | | | | Updating 3.6 enterprise registry-console template image versionewolinetz2017-05-101-2/+2
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #4158 from ganhuang/lower_boolScott Dodson2017-05-111-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | lower case in /etc/daemon.json and correct block-registry
| * | | | | | | | lower case in /etc/daemon.json and correct block-registryGan Huang2017-05-111-2/+2
| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 05:23:31 +0000