summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-02-12Merge pull request #7073 from abutcher/aws-node-hostnameOpenShift Merge Robot
Automatic merge from submit-queue. Update user-data for FQDN instance hostnames * Remove node service start from bootstrap.yml. We start and enable the node service in user-data and we want the node service to start after NetworkManager so that the instance will have its final hostname. * Restart systemd-hostnamed before restarting NetworkManager. In testing this has ensured that instances receive an FQDN hostname which is required for kube.
2018-02-12Merge pull request #7099 from vrutkovs/etcd-containerized-upgradeOpenShift Merge Robot
Automatic merge from submit-queue. Use r_etcd_common_etcdctl_command instead of hardcoded binary name to support containerized upgrade etcdctlv2 is used to check cluster health pre- and post-upgrade
2018-02-12Merge pull request #7022 from vrutkovs/sanitize-labelsOpenShift Merge Robot
Automatic merge from submit-queue. Verify that requested services have schedulable nodes matching the selectors Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1538445 Not sure if I should keep one task per failure or should group them by service (e.g. all logging check in one tasks)
2018-02-12Remove node start from bootstrap.yml.Andrew Butcher
2018-02-12Restart systemd-hostnamed before restarting NetworkManager in node user-data.Andrew Butcher
2018-02-12Merge pull request #7105 from vrutkovs/additional-mounts-exampleScott Dodson
additional mounts: specify 'type' in container_runtime_crio_additional_mounts
2018-02-12additional mounts: specify 'type' in container_runtime_crio_additional_mountsVadim Rutkovsky
2018-02-12Merge pull request #7001 from mbruzek/cidr_pool_start_endOpenShift Merge Robot
Automatic merge from submit-queue. Removing prefix, replacing with cidr, pool_start and pool_end vars The heat template was hardcoded with a /24 cidr and that limited customers to 251 ip addresses in the OpenStack subnet. This allows the user to configure the cidr and the allocation pool start and end. Addresses issue #6829 that I created last week. @tomassedovic please take a look
2018-02-10Fix indentation to make yamllint happyVadim Rutkovsky
Signed-off-by: Vadim Rutkovsky <vrutkovs@redhat.com>
2018-02-10Use r_etcd_common_etcdctl_command instead of hardcoded binary name to ↵Vadim Rutkovsky
support containerized upgrade
2018-02-10Verify that requested services have schedulable nodes matching the selectorsVadim Rutkovsky
Signed-off-by: Vadim Rutkovsky <vrutkovs@redhat.com>
2018-02-09Merge pull request #7093 from sdodson/bz1534917OpenShift Merge Robot
Automatic merge from submit-queue. Normalize the time we wait for pods to 5s * 60 retries A few people have run into situations where it takes longer than 120seconds for the webconsole to start up so lets be a bit more foregiving and allow for up to 5 minutes in scenarios where we're waiting for pods.
2018-02-09Merge pull request #7078 from mgugino-upstream-stage/limit-hostsOpenShift Merge Robot
Automatic merge from submit-queue. Limit host scope during plays Many plays only target a select subset of hosts, especially oo_first_master for components such as logging and registry. This commit limits the scope of most plays to eliminate unnecessary task execution on node groups. This will result in great time savings for large deployments. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1516526
2018-02-09Merge pull request #7086 from spadgett/pause-for-console-deploymentOpenShift Merge Robot
Automatic merge from submit-queue. Pause for console rollout /assign @sdodson
2018-02-09Normalize the time we wait for pods to 5s * 60 retriesScott Dodson
2018-02-09Merge pull request #7088 from mgugino-upstream-stage/fix-upgrade-cpOpenShift Merge Robot
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
2018-02-09Pause for console rolloutSamuel Padgett
2018-02-09Automatic commit of package [openshift-ansible] release [3.9.0-0.42.0].Justin Pierce
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2018-02-09Limit host scope during playsMichael Gugino
Many plays only target a select subset of hosts, especially oo_first_master for components such as logging and registry. This commit limits the scope of most plays to eliminate unnecessary task execution on node groups. This will result in great time savings for large deployments. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1516526
2018-02-09Fix upgrade-control plane post_control_plane.ymlMichael Gugino
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
2018-02-09Merge pull request #7058 from kwoodson/crio_additional_mountsKenny Woodson
Adding ability to provide additional mounts to crio system container.
2018-02-09Merge pull request #6712 from vrutkovs/avoid-hardcoding-image-versionOpenShift Merge Robot
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
2018-02-08Merge pull request #7077 from ewolinetz/logging_facts_sane_yaml_parseOpenShift Merge Robot
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.
2018-02-08Merge pull request #7074 from kwoodson/redeploy_certs_insecureOpenShift Merge Robot
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.
2018-02-08Merge pull request #7072 from jarrpa/gluster-block-routeOpenShift Merge Robot
Automatic merge from submit-queue. GlusterFS: Fix block StorageClass heketi route Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1542861
2018-02-08Merge pull request #7014 from sdodson/xpaas-148Scott Dodson
Update xPaaS content to v1.4.8
2018-02-08xPaaS v1.4.8 for v3.7Scott Dodson
2018-02-08xPaaS v1.4.8-1 for v3.8Scott Dodson
2018-02-08xPaaS v1.4.8-1 for v3.9Scott Dodson
2018-02-08Bump xpaas versionScott Dodson
2018-02-08Merge pull request #6926 from abutcher/etcd-ca-hostScott Dodson
Determine which host is the etcd CA host
2018-02-08Merge pull request #7068 from datarace/logging-fixScott Dodson
changed oc to {{ openshift_client_binary }}
2018-02-08Merge pull request #7031 from mgugino-upstream-stage/fix-syscon-varsOpenShift Merge Robot
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
2018-02-08Merge pull request #7061 from gnewson/Change-etcd-checkOpenShift Merge Robot
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
2018-02-08Merge pull request #7079 from fabianvf/1524805-cloudforms-pull-policyScott Dodson
Bug 1524805- CFME example now works disconnected
2018-02-08Bug 1524805- CFME example now works disconnectedFabian von Feilitzsch
2018-02-08Merge pull request #7055 from fabianvf/bz1541625Scott Dodson
Bug 1541625- properly cast provided ip address to unicode
2018-02-08Only try to yaml.load a file if it ends in .yml or .yaml in logging factsEric Wolinetz
2018-02-08Merge pull request #7056 from sdodson/gcp-wait-for-connectionScott Dodson
Use wait_for_connection to validate ssh transport is alive
2018-02-08Set default image tag to openshift_image_tag for servicesVadim Rutkovsky
Signed-off-by: Vadim Rutkovsky <vrutkovs@redhat.com>
2018-02-08Merge pull request #7060 from mwoodson/masterOpenShift Merge Robot
Automatic merge from submit-queue. aws ami: make it so the tags from the orinal AMI are used with the newly created AMI
2018-02-08Redeploy router certificates during upgrade only when secure.Kenny Woodson
2018-02-08Merge pull request #7057 from ashcrow/remove-master-from-ami-node-bootstrapKenny Woodson
openshift_node: Remove master from aws node building
2018-02-08GlusterFS: Fix block StorageClass heketi routeJose A. Rivera
2018-02-08Merge pull request #7043 from vrutkovs/prerequisites-enable-docker-excluderOpenShift Merge Robot
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>
2018-02-08changed oc to {{ openshift_client_binary }}datarace
2018-02-07Merge pull request #7063 from sdodson/wc39Scott Dodson
Use v3.9 web-console image for now
2018-02-07Use v3.9 web-console image for nowScott Dodson
2018-02-07Merge pull request #6938 from vshn/revert-heketi-image-optionOpenShift Merge Robot
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.
2018-02-07Adding ability to provide additional mounts to crio system container.Kenny Woodson