Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added Calicoctl to deployment of Master Nodes | Vincent Schwarzer | 2017-05-18 | 2 | -0/+11 |
| | |||||
* | Merge pull request #4213 from giuseppe/change-requires-to-wants-openvswitch | OpenShift Bot | 2017-05-18 | 2 | -2/+2 |
|\ | | | | | Merged by openshift-bot | ||||
| * | node, systemd: change Requires to Wants for openvswitch | Giuseppe Scrivano | 2017-05-17 | 2 | -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-container | OpenShift Bot | 2017-05-17 | 1 | -39/+57 |
|\ \ | | | | | | | Merged by openshift-bot | ||||
| * | | fix etcd_container_version detection | Jan Chaloupka | 2017-05-17 | 1 | -39/+57 |
| | | | |||||
* | | | Merge pull request #4214 from giuseppe/rename-ENIRONMENT-to-Environment | OpenShift Bot | 2017-05-17 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | Merged by openshift-bot | ||||
| * | | | systemcontainercustom.conf.j2: use Environment instead of ENVIRONMENT | Giuseppe Scrivano | 2017-05-17 | 1 | -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_Checks | OpenShift Bot | 2017-05-17 | 1 | -1/+9 |
|\ \ \ | | | | | | | | | Merged by openshift-bot | ||||
| * | | | Change based on feedback | Vincent Schwarzer | 2017-05-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | Added additional Calico Network Plugin Checks | Vincent Schwarzer | 2017-05-09 | 1 | -1/+9 |
| | | | | |||||
* | | | | Merge pull request #4221 from sdodson/fix-gpg-key-path | Scott Dodson | 2017-05-17 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fix Centos PaaS SIG GPG path | ||||
| * | | | | Fix gpg key path in our repo | Scott Dodson | 2017-05-17 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #4199 from smarterclayton/set_image_policy | OpenShift Bot | 2017-05-17 | 2 | -1/+23 |
|\ \ \ \ | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | Default image policy on new clusters to on | Clayton Coleman | 2017-05-15 | 2 | -1/+23 |
| | | | | | | | | | | | | | | | | | | | | Will allow for default image resolution to be used. | ||||
* | | | | | Merge pull request #4173 from ashcrow/1450310 | OpenShift Bot | 2017-05-17 | 1 | -5/+22 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Merged by openshift-bot | ||||
| * | | | | Add regexp for container-engine lineinfile | Steve Milner | 2017-05-16 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that if the line already exists it will be updated with the expected results from the installer. | ||||
| * | | | | use dest instead of path for lineinfile | Steve Milner | 2017-05-15 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switching to dest instead of path for lineinfile. path is the name for ansible 2.3+ though dest will work for 2.2 and 2.3. Ref: http://docs.ansible.com/ansible/lineinfile_module.html | ||||
| * | | | | Add NO_PROXY workaround for container-engine atomic command | Steve Milner | 2017-05-15 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1450310 | ||||
| * | | | | Add no_proxy to atomic.conf | Steve Milner | 2017-05-15 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | Requires: https://github.com/projectatomic/atomic/pull/999 | ||||
* | | | | | Merge pull request #4189 from giuseppe/fix-atomic-host | OpenShift Bot | 2017-05-17 | 1 | -3/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | openshift_version: skip rpm version==image version on Atomic | Giuseppe Scrivano | 2017-05-15 | 1 | -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_URLs | Jan Chaloupka | 2017-05-17 | 2 | -3/+7 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Removed Hardcoded URLs in Calico Role | ||||
| * | | | | Removed Hardcoded Calico URLs | Vincent Schwarzer | 2017-05-10 | 2 | -3/+7 |
| | | | | | |||||
* | | | | | Merge pull request #4197 from abutcher/oc_adm_ca_server_cert-hostnames-omit | OpenShift Bot | 2017-05-16 | 3 | -0/+16 |
|\ \ \ \ \ | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | Filter non-strings from the oc_adm_ca_server_cert hostnames parameter. | Andrew Butcher | 2017-05-15 | 3 | -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_repo | OpenShift Bot | 2017-05-16 | 1 | -2/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | Don't set-up origin repositories if they've already been configured | David Moreau-Simard | 2017-05-15 | 1 | -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-1 | OpenShift Bot | 2017-05-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | | Fixed for python3 with Fedora 25 Atomic | Donny Davis | 2017-05-14 | 1 | -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-templating | OpenShift Bot | 2017-05-16 | 7 | -2/+3 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | | Fix templating of static service files | Russell Teague | 2017-05-12 | 7 | -2/+3 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #4187 from giuseppe/uninstall-container-engine | OpenShift Bot | 2017-05-15 | 1 | -0/+7 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Merged by openshift-bot | ||||
| * | | | | | | uninstall: handle container-engine | Giuseppe Scrivano | 2017-05-15 | 1 | -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/1448998 | Scott Dodson | 2017-05-15 | 2 | -8/+8 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | byo inventory versions 3.5 -> 3.6 | ||||
| * | | | | | | byo inventory versions 1.5 -> 3.6 | Steve Milner | 2017-05-15 | 1 | -4/+4 |
| | | | | | | | |||||
| * | | | | | | byo inventory versions 3.5 -> 3.6 | Steve Milner | 2017-05-15 | 1 | -4/+4 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #4184 from ashcrow/rslave | OpenShift Bot | 2017-05-14 | 2 | -12/+16 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Merged by openshift-bot | ||||
| * | | | | | Add docker package for container-engine install | Steve Milner | 2017-05-14 | 2 | -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 Bot | 2017-05-13 | 2 | -2/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog | ||||
* | | | | | Merge pull request #4113 from ↵ | OpenShift Bot | 2017-05-13 | 3 | -14/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | jcantrill/bz1448860_make_recovery_after_nodes_to_node_quorum Merged by openshift-bot | ||||
| * | | | | | bug 1448860. Change recovery_after_nodes to match node_quorum | Jeff Cantrill | 2017-05-11 | 3 | -14/+6 |
| | | | | | | |||||
* | | | | | | Merge pull request #4155 from ewolinetz/registry_console_upgrade | OpenShift Bot | 2017-05-13 | 1 | -0/+22 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | Updating registry-console image version during a post_control_plane upgrade | ewolinetz | 2017-05-12 | 1 | -0/+22 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #4174 from ashcrow/remove-userland-proxy | OpenShift Bot | 2017-05-12 | 1 | -2/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | | Remove userland-proxy-path from daemon.json | Steve Milner | 2017-05-12 | 1 | -2/+1 |
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | This flag is currently being set within the system container via the init.sh | ||||
* | | | | | | | Merge pull request #4172 from ashcrow/1450307 | OpenShift Bot | 2017-05-12 | 3 | -12/+10 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | | Fix whistespace issues in custom template | Steve Milner | 2017-05-12 | 1 | -6/+6 |
| | | | | | | | | |||||
| * | | | | | | | Always add proxy items to atomic.conf | Steve Milner | 2017-05-12 | 1 | -4/+1 |
| | | | | | | | | |||||
| * | | | | | | | Move container-engine systemd environment to updated location | Steve Milner | 2017-05-12 | 2 | -2/+3 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #4030 from liggitt/reserved-namespaces | OpenShift Bot | 2017-05-12 | 2 | -0/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Merged by openshift-bot |