summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Collapse)AuthorAgeFilesLines
* Fix cloud init runcmd templatingBogdan Dobrelya2018-02-091-2/+11
| | | | Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
* Clarify the ansible playbook vs cloud-initBogdan Dobrelya2018-02-091-2/+2
| | | | | | | | Document use cases for custom post-provision ansible hooks vs cloud-init runcmd shell commands. Rename to openshift_openstack_cloud_init_runcmd. Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
* Fix openstack cloud-init runcmd templatingBogdan Dobrelya2018-02-091-1/+1
| | | | Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
* [openstack] custom user commands for cloud-initBogdan Dobrelya2018-02-092-0/+9
| | | | | | | | | | | | Allow to specify additional user commands executed on all Nova servers provisioned via Heat. An example use case is installing and starting os-collect-config agents to put Nova servers under the configuration management driven via the host openstack cloud Heat services. This allows to integrate with another deployment tools like TripleO. Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
* Merge pull request #7058 from kwoodson/crio_additional_mountsKenny Woodson2018-02-092-0/+12
|\ | | | | Adding ability to provide additional mounts to crio system container.
| * Adding ability to provide additional mounts to crio system container.Kenny Woodson2018-02-072-0/+12
| |
* | Merge pull request #6712 from vrutkovs/avoid-hardcoding-image-versionOpenShift Merge Robot2018-02-0917-23/+23
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Set default image to openshift_release Previously `v3.7` was hardcoded as a default value, instead `openshift_release` should be used. A new var is introduced - `openshift_template_service_broker_image_tag`, similar to vars for other services. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1530183 TODO: * [x] Make sure all images have a variable for image prefix * [x] Figure out if `latest` is a good default for origin images * [ ] Set correct `openshift_image_tag` in CI inventory for tests to pass
| * | Set default image tag to openshift_image_tag for servicesVadim Rutkovsky2018-02-0817-23/+23
| | | | | | | | | | | | Signed-off-by: Vadim Rutkovsky <vrutkovs@redhat.com>
* | | Merge pull request #7077 from ewolinetz/logging_facts_sane_yaml_parseOpenShift Merge Robot2018-02-081-3/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Only try to yaml.load a file if it ends in .yml or .yaml in logging facts Addresses error seen in https://bugzilla.redhat.com/show_bug.cgi?id=1543625 Also prevents us from seeing this when rerunning a deployment for es5.x branch. When we are trying to load a configmap file to parse it for facts based on the values, we should only parse if it is a yaml or yml file. Note: if someone created a configmap entry with key that matched that, but wasn't a yaml file, it would still fail... not sure if that can be helped.
| * | | Only try to yaml.load a file if it ends in .yml or .yaml in logging factsEric Wolinetz2018-02-081-3/+4
| |/ /
* | | Merge pull request #7072 from jarrpa/gluster-block-routeOpenShift Merge Robot2018-02-081-0/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. GlusterFS: Fix block StorageClass heketi route Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1542861
| * | | GlusterFS: Fix block StorageClass heketi routeJose A. Rivera2018-02-081-0/+19
| | | |
* | | | Merge pull request #7014 from sdodson/xpaas-148Scott Dodson2018-02-08337-4441/+18610
|\ \ \ \ | | | | | | | | | | Update xPaaS content to v1.4.8
| * | | | xPaaS v1.4.8 for v3.7Scott Dodson2018-02-08112-1480/+6203
| | | | |
| * | | | xPaaS v1.4.8-1 for v3.8Scott Dodson2018-02-08112-1480/+6203
| | | | |
| * | | | xPaaS v1.4.8-1 for v3.9Scott Dodson2018-02-08112-1480/+6203
| | | | |
| * | | | Bump xpaas versionScott Dodson2018-02-081-1/+1
| | |/ / | |/| |
* | | | Merge pull request #6926 from abutcher/etcd-ca-hostScott Dodson2018-02-084-1/+48
|\ \ \ \ | | | | | | | | | | Determine which host is the etcd CA host
| * | | | lib_utils_oo_collect: Allow filtering on dot separated keys.Andrew Butcher2018-02-011-1/+1
| | | | |
| * | | | Determine which etcd host is the etcd_ca_host rather than assume it is the ↵Andrew Butcher2018-02-013-0/+47
| | | | | | | | | | | | | | | | | | | | first host in the etcd host group.
* | | | | Merge pull request #7068 from datarace/logging-fixScott Dodson2018-02-084-15/+15
|\ \ \ \ \ | | | | | | | | | | | | changed oc to {{ openshift_client_binary }}
| * | | | | changed oc to {{ openshift_client_binary }}datarace2018-02-084-15/+15
| | |_|/ / | |/| | |
* | | | | Merge pull request #7031 from mgugino-upstream-stage/fix-syscon-varsOpenShift Merge Robot2018-02-082-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix master and node system container variables This commit corrects service names and adds DOCKER_SERVICE variable to openshift_master system container creation. This will ensure services will restart correctly and in the proper order. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1542324
| * | | | | Fix master and node system container variablesMichael Gugino2018-02-062-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit corrects service names and adds DOCKER_SERVICE variable to openshift_master system container creation. This will ensure services will restart correctly and in the proper order. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1542324
* | | | | | Bug 1524805- CFME example now works disconnectedFabian von Feilitzsch2018-02-081-1/+1
| | | | | |
* | | | | | Merge pull request #7055 from fabianvf/bz1541625Scott Dodson2018-02-081-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Bug 1541625- properly cast provided ip address to unicode
| * | | | | Bug 1541625- properly cast provided ip address to unicodeFabian von Feilitzsch2018-02-071-2/+2
| | | | | |
* | | | | | Merge pull request #7060 from mwoodson/masterOpenShift Merge Robot2018-02-081-1/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. aws ami: make it so the tags from the orinal AMI are used with the newly created AMI
| * | | | | | aws ami: make it so the tags from the orinal AMI are used with the newly ↵Matt Woodson2018-02-071-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | created AMI
* | | | | | | Merge pull request #7057 from ashcrow/remove-master-from-ami-node-bootstrapKenny Woodson2018-02-082-3/+3
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | openshift_node: Remove master from aws node building
| * | | | | | openshift_node: Remove master from aws node buildingSteve Milner2018-02-072-3/+3
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since it is expected to be re-added at some point in the future the lines have been commented out rather than deleted. Signed-off-by: Steve Milner <smilner@redhat.com>
* | | | | | Merge pull request #7063 from sdodson/wc39Scott Dodson2018-02-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use v3.9 web-console image for now
| * | | | | | Use v3.9 web-console image for nowScott Dodson2018-02-071-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #6938 from vshn/revert-heketi-image-optionOpenShift Merge Robot2018-02-071-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Revert "GlusterFS: Remove image option from heketi command" This reverts commit 3d3853836d71c37a9c81aea8e606c94052439789 which was supposedly a fix for an issue with topology initialization, but that turned out to be a separate issue fixed in commit b8879b5c6731bd51e590b470b1a51fce73db0ee1. By default "heketi-cli setup-openshift-heketi-storage" uses the "heketi/heketi:dev" image while, for OpenShift Container Platform installations, the default image for all other operations is "rhgs3/rhgs-volmanager-rhel7". In environments where only a limited set of Docker registries is available, i.e. only the Red Hat registry but not Docker Hub, using "heketi/heketi:dev" does not work or would require manual intervention. The discussion surrounding the removal of "--image" in PR#5769 involved statements that "--image" was removed from Heketi. As of January 30, 2018 the master branch contains the option, as does the upstream Docker image (Heketi version v5.0.0-225-gffb9fea) and the aforementioned "rhgs3/rhgs-volmanager-rhel7" image. Tested with OpenShift Container Platform 3.7.23.
| * | | | | Revert "GlusterFS: Remove image option from heketi command"Michael Hanselmann2018-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3d3853836d71c37a9c81aea8e606c94052439789 which was supposedly a fix for an issue with topology initialization, but that turned out to be a separate issue fixed in commit b8879b5c6731bd51e590b470b1a51fce73db0ee1. By default "heketi-cli setup-openshift-heketi-storage" uses the "heketi/heketi:dev" image while, for OpenShift Container Platform installations, the default image for all other operations is "rhgs3/rhgs-volmanager-rhel7". In environments where only a limited set of Docker registries is available, i.e. only the Red Hat registry but not Docker Hub, using "heketi/heketi:dev" does not work or would require manual intervention. The discussion surrounding the removal of "--image" in PR#5769 involved statements that "--image" was removed from Heketi. As of January 30, 2018 the master branch contains the option, as does the upstream Docker image (Heketi version v5.0.0-225-gffb9fea) and the aforementioned "rhgs3/rhgs-volmanager-rhel7" image. Tested with OpenShift Container Platform 3.7.23.
* | | | | | Merge pull request #7032 from spadgett/console-livenessScott Dodson2018-02-072-11/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | Detect config changes in console liveness probe
| * | | | | | Detect config changes in console liveness probeSamuel Padgett2018-02-062-11/+11
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Use an md5sum to check if the console config has changed and automatically restart the container.
* | | | | | Merge pull request #7044 from zgalor/fix_uninstall_bugOpenShift Merge Robot2018-02-071-0/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix uninstall using openshift_prometheus_state=absent This was broken in https://github.com/openshift/openshift-ansible/pull/6811 bz: https://bugzilla.redhat.com/show_bug.cgi?id=1540806
| * | | | | Fix uninstall using openshift_prometheus_state=absentZohar Galor2018-02-071-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was broken in https://github.com/openshift/openshift-ansible/pull/6811 bz: https://bugzilla.redhat.com/show_bug.cgi?id=1540806
* | | | | | Merge pull request #7007 from abutcher/master-cert-idempotenceScott Dodson2018-02-071-17/+8
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Correct master certificates list checked by openshift_master_certificates
| * | | | | Correct the list of certificates checked in openshift_master_certificates ↵Andrew Butcher2018-02-051-17/+8
| | | | | | | | | | | | | | | | | | | | | | | | s.t. masters do not incorrectly report that master certs are missing.
* | | | | | Merge pull request #7004 from cooktheryan/master-tag-fixOpenShift Merge Robot2018-02-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. tag fix without ose- incorrect tag when trying to deploy efs
| * | | | | | tag fix without ose-Ryan Cook2018-02-021-1/+1
| |/ / / / /
* | | | | | Merge pull request #7050 from jarrpa/gluster-doc-updateOpenShift Merge Robot2018-02-071-11/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. GlusterFS: Minor documentation update
| * | | | | | GlusterFS: Minor documentation updateJose A. Rivera2018-02-071-11/+11
| | | | | | |
* | | | | | | Allow OVS 2.7 in OCP 3.10Scott Dodson2018-02-072-2/+2
|/ / / / / /
* | | | | | Merge pull request #6993 from joelddiaz/deprovision_elbsKenny Woodson2018-02-076-29/+82
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | add deprovisioning for ELB (and IAM certs)
| * | | | | add deprovisioning for ELB (and IAM certs)Joel Diaz2018-02-026-29/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add playbooks to handle deleting ELBs and any IAM certs that may have been created during provisioning. redo ELB creation to remove arbitrary wait and just retry until ELB creation succeeds
* | | | | | Merge pull request #6688 from jsanda/termination-grace-periodOpenShift Merge Robot2018-02-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. [6632] fix indentation of terminationGracePeriodSeconds var This is a PR to fix [6632](https://github.com/openshift/openshift-ansible/issues/6632).
| * | | | | | [6632] fix indentation of terminationGracePeriodSeconds varJohn Sanda2018-01-101-1/+1
| | | | | | |