summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6095 from kwoodson/add_instance_profile_supportOpenShift Merge Robot2017-11-149-0/+88
|\ | | | | | | | | | | | | Automatic merge from submit-queue. Instance profile support. Purpose of this PR is to remove the AWS cloud-provider credentials from the node and use instance profiles during provisioning time.
| * Adding instance profile support for node groups.Kenny Woodson2017-11-139-0/+88
| |
* | Merge pull request #6091 from sosiouxme/20171110-ini-parse-failureOpenShift Merge Robot2017-11-142-0/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. ansible.cfg: error when inventory does not parse As of Ansible 2.4 this option exists: https://github.com/ansible/ansible/issues/15035#issuecomment-329672168 The kind of error you get later when this is your real problem tends to be *very* confusing. Much better to just fail right away. I cannot think of any scenario in which it would be preferable to proceed when inventory parsing fails.
| * | ansible.cfg: error when inventory does not parseLuke Meyer2017-11-102-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | As of Ansible 2.4 this option exists: https://github.com/ansible/ansible/issues/15035#issuecomment-329672168 The kind of error you get later when this is your real problem tends to be *very* confusing. Much better to just fail right away.
* | | Merge pull request #6081 from kwoodson/remove_oc_edit_restrictionsOpenShift Merge Robot2017-11-142-28/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. removing kind restrictions from oc_edit Removing any kind restriction on oc_edit. This allows it to just call the API which in most cases works.
| * | | removing kind restrictions from oc_editKenny Woodson2017-11-092-28/+2
| | | |
* | | | Merge pull request #6068 from mtnbikenc/remove-old-upgradesOpenShift Merge Robot2017-11-1433-1389/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Remove upgrade playbooks for 3.3 through 3.5 Release branches should be used for older upgrades.
| * | | | Remove upgrade playbooks for 3.3 through 3.5Russell Teague2017-11-0833-1389/+8
| | | | |
* | | | | Merge pull request #6115 from sdodson/disable-auth-migrationScott Dodson2017-11-142-20/+24
|\ \ \ \ \ | | | | | | | | | | | | Allow disabling authorization migration check
| * | | | | Allow disabling authorization migration checkScott Dodson2017-11-142-20/+24
| | | | | |
* | | | | | Merge pull request #6054 from nak3/cleanup-lbOpenShift Merge Robot2017-11-141-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Remove remaining haproxy files with uninstallation Although OpenShift LB(HAProxy) distributes `/etc/systemd/system/haproxy.service.d/limits.conf` and `/etc/systemd/system/haproxy.service`, uninstall playbook does not remove them now. This patch changes to remove these files.
| * | | | | | Remove remaining haproxy files with uninstallationKenjiro Nakayama2017-11-081-0/+4
| | | | | | |
* | | | | | | Merge pull request #5948 from mtnbikenc/checkpoint-timesOpenShift Merge Robot2017-11-1417-175/+191
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Add execution times to checkpoint status This PR adds execution times to the checkpoint status report at the end of an installer playbook run. - Checkpoint plays now use `all` host group to avoid using an undefined host group during the Initialization phase as well as maintaining the need to collect inventory vars for host group conditionals - `run_once: true` is used to limit the execution to only one host - `installer_phase_*` data is now stored as a dict so multiple data points can be stored for that phase - Documentation updated ``` INSTALLER STATUS *************************************************************** Initialization : Complete (0:02:14) Health Check : Complete (0:01:10) etcd Install : Complete (0:02:01) Master Install : Complete (0:11:43) Master Additional Install : Complete (0:00:54) Node Install : Complete (0:14:11) Hosted Install : Complete (0:03:28) ```
| * | | | | | Add execution times to checkpoint statusRussell Teague2017-10-3117-175/+191
| | | | | | |
* | | | | | | Merge pull request #6110 from sdodson/dockershimScott Dodson2017-11-141-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Nuke /var/lib/dockershim/sandbox/* while nodes are drained
| * | | | | | | Nuke /var/lib/dockershim/sandbox/* while nodes are drainedScott Dodson2017-11-141-0/+6
| | | | | | | |
* | | | | | | | Merge pull request #5784 from jarrpa/glusterfs-new-featuresOpenShift Merge Robot2017-11-1416-61/+655
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. GlusterFS: Update for new features This is a small collection of updates to take advantage of new features available for containerized GlusterFS, currently available downstream in CNS 3.6.
| * | | | | | | | GlusterFS: Add gluster-s3 functionalityJose A. Rivera2017-11-088-45/+420
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
| * | | | | | | | GlusterFS: Add glusterblock functionalityJose A. Rivera2017-11-089-0/+210
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
| * | | | | | | | GlusterFS: Update heketi templates for latest versionJose A. Rivera2017-11-088-16/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
| * | | | | | | | GlusterFS: Specify resource requestsJose A. Rivera2017-11-081-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | | | | | | Merge pull request #5942 from giuseppe/crio-sync-configurationScott Dodson2017-11-141-0/+5
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | crio: sync crio.conf
| * | | | | | | | crio: sync crio.confGiuseppe Scrivano2017-11-141-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | | | | Merge pull request #5921 from lpsantil/make-nfs-clearMichael Gugino2017-11-141-6/+18
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Make clearer *_nfs_directory and *_volume_name
| * | | | | | | | Make clearer *_nfs_directory and *_volume_namelpsantil2017-10-281-6/+18
| | | | | | | | |
* | | | | | | | | Merge pull request #6101 from mgugino-upstream-stage/fix-tsb-jsonScott Dodson2017-11-135-17/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix extension script for catalog
| * | | | | | | | | Fix extension script for catalogMichael Gugino2017-11-135-17/+10
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, playbook wire_aggregator places an empty plugin script for openshift master called openshift-ansible-catalog-console.js This file should not be empty if using template_service_broker. I have updated this file to include a boolean and the proper string. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1506502
* | | | | | | | | Merge pull request #6104 from kwoodson/regex_cors_fixScott Dodson2017-11-131-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Regex anchors changed to match protocol start and ports.
| * | | | | | | | | Regex anchors changed to match protocol start and ports.Kenny Woodson2017-11-131-2/+2
| | | | | | | | | |
* | | | | | | | | | Merge pull request #6072 from tbielawa/obvious_docsOpenShift Merge Robot2017-11-131-15/+15
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Update Docs. Make Clearer where the actual docs are. This just makes it more obvious where the openshift docs are.
| * | | | | | | | | Update Docs. Make Clearer where the actual docs are.Tim Bielawa2017-11-091-15/+15
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #6100 from sdodson/v3_8-supportScott Dodson2017-11-13175-11/+88657
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | First pass at v3.8 support
| * | | | | | | | First pass at v3.8 supportScott Dodson2017-11-13175-11/+88657
|/ / / / / / / /
* | | | | | | / Bumping openshift-ansible to 3.8Jenkins CD Merge Bot2017-11-101-2/+2
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge pull request #5997 from mcanevet/patch-1OpenShift Merge Robot2017-11-091-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix contenerized documentation?
| * | | | | | | Fix contenerized documentation?Mickaël Canévet2017-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Are you really suggestion to deploy heterogeneous environments?
* | | | | | | | Merge pull request #5571 from vshn/registryip1OpenShift Merge Robot2017-11-093-0/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Allow cluster IP for docker-registry service to be set For historical reasons a small set of programs in our environments rely on the cluster-internal Docker registry having the IP address "172.30.1.1". So far we always had to patch in that address manually. Adding a variable on the "openshift_hosted" role allows the IP address to be set correctly when a cluster is installed.
| * | | | | | | Allow cluster IP for docker-registry service to be setMichael Hanselmann2017-10-193-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For historical reasons a small set of programs in our environments rely on the cluster-internal Docker registry having the IP address "172.30.1.1". So far we always had to patch in that address manually. Adding a variable on the "openshift_hosted" role allows the IP address to be set correctly when a cluster is installed.
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.5-1].Jenkins CD Merge Bot2017-11-092-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.4-1].Jenkins CD Merge Bot2017-11-082-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.3-1].Jenkins CD Merge Bot2017-11-082-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | Merge pull request #6067 from shawn-hurley/bug-specify-keep-namespaceScott Dodson2017-11-082-0/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | Bug 151186 - Adding configuration for keeping transient namespace on error.
| * | | | | | | Adding configuration for keeping transient namespace on error.Shawn Hurley2017-11-082-0/+4
| | | | | | | |
* | | | | | | | Merge pull request #6020 from sdodson/asb-tsbScott Dodson2017-11-086-11/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove duplicate defaulting for ASB and TSB
| * | | | | | | | Use openshift.common.client_binaryScott Dodson2017-11-082-5/+5
| | | | | | | | |
| * | | | | | | | Remove duplicate defaulting for ASB and TSBScott Dodson2017-11-084-6/+6
| |/ / / / / / /
* | | | | | | | Merge pull request #6016 from kwoodson/bootstrap_enhancements-v3Kenny Woodson2017-11-0826-353/+363
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Bootstrap enhancements.
| * | | | | | | | Bootstrap enhancements.Kenny Woodson2017-11-0826-353/+363
| | | | | | | | |
* | | | | | | | | Merge pull request #5829 from sosiouxme/20171020-registry-console-bz1497310Scott Dodson2017-11-086-25/+81
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | reconcile registry-console and docker_image_availability
| * | | | | | | | | reconcile registry-console and docker_image_availabilityLuke Meyer2017-11-066-25/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1497310 https://bugzilla.redhat.com/show_bug.cgi?id=1497310 The registry console is a special case in more than one way. This adds logic to incorporate the openshift_cockpit_deployer_* variables into determining what its image will be in docker_image_availability. Along the way I noticed the origin and enterprise templates for this were not consistent. Now they are, and the example hosts file is updated.