summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #7088 from mgugino-upstream-stage/fix-upgrade-cpOpenShift Merge Robot2018-02-091-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix upgrade-control plane post_control_plane.yml An entry-point playbook was imported by mistake. This caused common init code to run again, which is undesireable. This commit changes the import to use the corresponding 'private' play which does not call the init code. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1542855
| * Fix upgrade-control plane post_control_plane.ymlMichael Gugino2018-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | An entry-point playbook was imported by mistake. This caused common init code to run again, which is undesireable. This commit changes the import to use the corresponding 'private' play which does not call the init code. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1542855
* | Automatic commit of package [openshift-ansible] release [3.9.0-0.42.0].Justin Pierce2018-02-092-2/+53
|/ | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* 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-0918-23/+26
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0818-23/+26
| | | | | | | | | | | | 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 #7074 from kwoodson/redeploy_certs_insecureOpenShift Merge Robot2018-02-081-16/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Redeploy router certificates during upgrade only when secure. Wrap the upgrade logic for redeploying certificates into another block so that insecure registries do not perform any certificate tasks.
| * | | Redeploy router certificates during upgrade only when secure.Kenny Woodson2018-02-081-16/+20
| | | |
* | | | 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-0814-37/+50
|\ \ \ \ \ \ | | | | | | | | | | | | | | 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-0111-13/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | first host in the etcd host group.
| * | | | | | Attempt to back up generated certificates on every etcd host.Andrew Butcher2018-02-011-1/+1
| | | | | | |
| * | | | | | Remove pre upgrade verification step re: etcd ca host.Andrew Butcher2018-02-011-22/+0
| | | | | | |
* | | | | | | 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
* | | | | | | | | Merge pull request #7061 from gnewson/Change-etcd-checkOpenShift Merge Robot2018-02-081-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Changing the check for the number of etcd nodes This playbook is called (via std_include.yml) when the scale up playbook for either master or etcd is called. In the scenario where you are scaling up the number of masters/etcd nodes it is feasible, if not likely, that the number of etcd nodes is not 1, 3 or 5 and this check therefore causes a scale up to fail. The two example scenarios that are driving this change are: You have a cluster with 3 master nodes (each running etcd) and one of those masters fail. The master node is removed from both the OpenShift cluster and the etcd cluster and the inventory updated to reflect the state of the cluster minus the failed master node. You would then run the scale up playbook to add a new master / etcd master into the cluster using an inventory containing and etcd group of just 2 nodes. As above but the cluster has 5 master nodes. If you lose a master node and update the inventory to reflect that then the inventory will contain an etcd group with 4 nodes. @sdodson Previously submitted as https://github.com/openshift/openshift-ansible/pull/6979
| * | | | | | | | | Remove spaces introduced at the start of the lineGeoff Newson2018-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In making the initial change I introduce some spaces at the beginning of the line. Removing them.
| * | | | | | | | | Changing the check for the number of etcd nodesGeoff Newson2018-02-071-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #7079 from fabianvf/1524805-cloudforms-pull-policyScott Dodson2018-02-081-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Bug 1524805- CFME example now works disconnected
| * | | | | | | | | | 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 #7056 from sdodson/gcp-wait-for-connectionScott Dodson2018-02-081-0/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | Use wait_for_connection to validate ssh transport is alive
| * | | | | | | | | Use wait_for_connection to validate ssh transport is aliveScott Dodson2018-02-071-0/+6
| | | | | | | | | |
* | | | | | | | | | 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 #7043 from vrutkovs/prerequisites-enable-docker-excluderOpenShift Merge Robot2018-02-081-0/+6
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Setup docker excluder if requested before container_runtime is installed That would prevent possible container runtime upgrades during cluster config Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1540800 Signed-off-by: Vadim Rutkovsky <vrutkovs@redhat.com>
| * | | | | | | Setup docker excluder if requested before container_runtime is installedVadim Rutkovsky2018-02-071-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That would prevent possible container runtime upgrades during cluster config Signed-off-by: Vadim Rutkovsky <vrutkovs@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 #7017 from mtnbikenc/fix-1540537OpenShift Merge Robot2018-02-076-2/+8
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. [1540537] Add base package installation to upgrade playbooks Hosts will need python ipaddress module installed if it was not installed during initial installation. Bug 1540537 https://bugzilla.redhat.com/show_bug.cgi?id=1540537
| * | | | | | | | Add base package installation to upgrade playbooksRussell Teague2018-02-076-2/+8
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hosts will need python ipaddress module installed if it was not installed during initial installation. Bug 1540537 https://bugzilla.redhat.com/show_bug.cgi?id=1540537
* | | | | | | | 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 02:08:03 +0000