summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6084 from mgugino-upstream-stage/combine-master-upgradeOpenShift Merge Robot2017-11-158-3/+298
|\ | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Combine master upgrade play with role Currently, there are plays importing tasks directly from openshift_master role. This has caused numerous bugs and code duplicaiton in the past. This commit combines the upgrade into openshift_master role utilizing include_role syntax.
| * Combine master upgrade play with roleMichael Gugino2017-11-098-3/+298
| | | | | | | | | | | | | | | | | | Currently, there are plays importing tasks directly from openshift_master role. This has caused numerous bugs and code duplicaiton in the past. This commit combines the upgrade into openshift_master role utilizing include_role syntax.
* | Merge pull request #6105 from kwoodson/docker_crio_fixScott Dodson2017-11-151-1/+1
|\ \ | | | | | | Fixing docker crio installation.
| * | Fixing islnk.Kenny Woodson2017-11-131-1/+1
| | |
* | | Merge pull request #6079 from mgugino-upstream-stage/fix-log-local-factsOpenShift Merge Robot2017-11-151-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix stale data in openshift_facts for logging Currently, some stale facts may be present in '/etc/ansible/facts.d/openshift.fact' which causes openshift_facts to fail. This commit ensures that the data for the 'logging' key in that file is a dictionary; otherwise we re-initialize a new dictionary. Fixes: https://github.com/openshift/openshift-ansible/issues/6057
| * | | Fix stale data in openshift_facts for loggingMichael Gugino2017-11-091-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, some stale facts may be present in '/etc/ansible/facts.d/openshift.fact' which causes openshift_facts to fail. This commit ensures that the data for the 'logging' key in that file is a dictionary; otherwise we re-initialize a new dictionary. Fixes: https://github.com/openshift/openshift-ansible/issues/6057
* | | Merge pull request #5968 from mgugino-upstream-stage/version-scrubScott Dodson2017-11-1518-160/+13
|\ \ \ | | | | | | | | Removed old version code
| * | | Removed old version codeMichael Gugino2017-11-1418-160/+13
| | | | | | | | | | | | | | | | | | | | | | | | This commit removes any references to versions < 1.5/3.5 We assume the version is always greater than or equal to 1.5/3.5.
* | | | Merge pull request #6094 from ↵OpenShift Merge Robot2017-11-1512-2/+299
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mgugino-upstream-stage/syscontainers-docker-login-module Automatic merge from submit-queue. Alternative method to create docker registry auth creds Currently, the command 'docker login' is run when using oreg with authentication. On some hosts, such as hosts configured to use system containers, the docker service is not running. 'docker login' will fail without the docker service running. This commit adds a module to idempotently add credentials to the registry credentials file without the use of 'docker login' Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1511374
| * | | | Alternative method to create docker registry auth credsMichael Gugino2017-11-1412-2/+299
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the command 'docker login' is run when using oreg with authentication. On some hosts, such as hosts configured to use system containers, the docker service is not running. 'docker login' will fail without the docker service running. This commit adds a module to idempotently add credentials to the registry credentials file without the use of 'docker login' Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1511374
* | | | | Merge pull request #6102 from mgugino-upstream-stage/fix-docker-reg-auth-proxyOpenShift Merge Robot2017-11-141-2/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Run registry auth after docker restart Currently, docker login may fail if a proxy is added to the config but docker is already running. This is due to the fact that 'docker login' must have a functioning docker.service running (with valid network connection) to complete. Currently, handlers restart the docker service at the end of the role. This doesn't allow for updating proxy settings before running docker login. This commit moves 'docker login' command after flushing handlers. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1511869
| * | | | | Run registry auth after docker restartMichael Gugino2017-11-131-2/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, docker login may fail if a proxy is added to the config but docker is already running. This is due to the fact that 'docker login' must have a functioning docker.service running (with valid network connection) to complete. Currently, handlers restart the docker service at the end of the role. This doesn't allow for updating proxy settings before running docker login. This commit moves 'docker login' command after flushing handlers. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1511869
* | | | | 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 #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 #5948 from mtnbikenc/checkpoint-timesOpenShift Merge Robot2017-11-142-85/+41
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-312-85/+41
| | | | |
* | | | | 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>
* | | | | | | crio: sync crio.confGiuseppe Scrivano2017-11-141-0/+5
| |/ / / / / |/| | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | Merge pull request #6101 from mgugino-upstream-stage/fix-tsb-jsonScott Dodson2017-11-132-6/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix extension script for catalog
| * | | | | | Fix extension script for catalogMichael Gugino2017-11-132-6/+0
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Regex anchors changed to match protocol start and ports.Kenny Woodson2017-11-131-2/+2
| |_|_|_|/ |/| | | |
* | | | | First pass at v3.8 supportScott Dodson2017-11-13164-11/+88175
|/ / / /
* | | | 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.
* | | | 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-0823-350/+356
|\ \ \ \ \ | | | | | | | | | | | | Bootstrap enhancements.
| * | | | | Bootstrap enhancements.Kenny Woodson2017-11-0823-350/+356
| | | | | |
* | | | | | Merge pull request #5829 from sosiouxme/20171020-registry-console-bz1497310Scott Dodson2017-11-085-22/+77
|\ \ \ \ \ \ | | | | | | | | | | | | | | reconcile registry-console and docker_image_availability
| * | | | | | reconcile registry-console and docker_image_availabilityLuke Meyer2017-11-065-22/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Fix examples image streamsMichael Gugino2017-11-082-0/+208
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Image streams older than 3.7 do not have a separate config for centos for dotnet_imagestreams.json This commit copies the new image stream to older supported verisons.
* | | | | | Merge pull request #5966 from sdodson/iss-masterScott Dodson2017-11-08143-25707/+2564
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update to xpaas v1.4.6 content
| * | | | | | General template updates for v3.7Scott Dodson2017-11-0811-65/+35
| | | | | | |
| * | | | | | Update to xPaaS v1.4.6Scott Dodson2017-11-08132-25642/+2529
| | | | | | |
* | | | | | | Merge pull request #6060 from zgalor/change_default_namespaceScott Dodson2017-11-081-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Change prometheus default namespace to 'openshift-metrics'
| * | | | | | | Change prometheus default namespace to 'openshift-metrics'Zohar Galor2017-11-081-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #6059 from fabianvf/1511044-fix-asb-cert-lookupScott Dodson2017-11-081-3/+12
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Bug 1511044- Slurp the etcd certs instead of using the lookup
| * | | | | | Bug 1511044- Slurp the etcd certs instead of using the lookupFabian von Feilitzsch2017-11-081-3/+12
| |/ / / / /
* | | | | | Merge pull request #6035 from ↵Scott Dodson2017-11-081-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | staebler/1499413-service_catalog_class_and_plan_status_updates Give service-catalog controller-manager permissions to update status of ClusterServiceClasses and ClusterServicePlans