summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | | | use dest instead of path for lineinfileSteve Milner2017-05-151-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 commandSteve Milner2017-05-151-0/+4
| | | | | | | | | | | | | | | | | | | | Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1450310
| * | | | Add no_proxy to atomic.confSteve Milner2017-05-151-1/+9
| | | | | | | | | | | | | | | | | | | | Requires: https://github.com/projectatomic/atomic/pull/999
* | | | | 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
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 20:45:28 +0000