summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-10-05Merge pull request #5605 from mgugino-upstream-stage/build-provision-splitOpenShift Merge Robot
Automatic merge from submit-queue. Build provision split Make provisioning steps more reusable Reorganizing and making some of the plays more reusable. Depends-on: https://github.com/openshift/openshift-ansible/pull/5565
2017-10-05Merge pull request #5637 from wozniakjan/1496271_fixOpenShift Merge Robot
Automatic merge from submit-queue. Bug 1496271 - Perserve SCC for ES local persistent storage ES can be modified to use node local persistent storage. This requires changing SCC and is described in docs: https://docs.openshift.com/container-platform/3.6/install_config/aggregate_logging.html During an upgrade, SCC defined by the user is ignored. This fix fetches SCC user defined as a fact and adds it to the ES DC which is later used. Also includes cherrypicked fix for - Bug 1482661 - Preserve ES dc nodeSelector and supplementalGroups cc @jcantrill
2017-10-05Merge pull request #5658 from sosiouxme/20171004-groups-for-checksOpenShift Merge Robot
Automatic merge from submit-queue. nfs, lb, and groups for checks Checks have been using the byo group names for determining whether they need to be active or not. Now that everything is running through common initialization, stop assuming byo names and start referring to the common ones. As a follow-on [bugfix](https://bugzilla.redhat.com/show_bug.cgi?id=1496760), run docker checks only where docker will be: nodes, and containerized master/etcd. We specifically don't want to run against lb or nfs, but a whitelist approach is used.
2017-10-05Merge pull request #5564 from jcantrill/es_promOpenShift Merge Robot
Automatic merge from submit-queue. Add logging es prometheus endpoint This PR adds changes to add a prometheus endpoint to the logging elasticsearch pod
2017-10-04Merge pull request #5616 from ↵OpenShift Merge Robot
wozniakjan/logging/elasticsearch/honor_es_cpu_settings Automatic merge from submit-queue. logging: honor openshift_logging_es_cpu_limit PR https://github.com/openshift/openshift-ansible/pull/3509 has removed any usage of `openshift_logging_es_cpu_limit`. Currently, the `openshift_logging_elasticsearch_cpu_limit` is either default '1000m' or derived from `openshift_logging_es_ops_cpu_limit` but if user sets the `openshift_logging_es_cpu_limit` in the inventory as documented, its value is ignored. This PR fixes the issue by setting `openshift_logging_elasticsearch_cpu_limit=openshift_logging_es_cpu_limit` and when the role is included as -ops, it overrides this setting with `openshift_logging_es_ops_cpu_limit`.
2017-10-04Merge pull request #5636 from ↵OpenShift Merge Robot
mgugino-upstream-stage/limit-openshift-version-hosts Automatic merge from submit-queue. Limit hosts that run openshift_version role Currently, the openshift_version role is run against the oo_all_hosts group. This causes the dependencies, such as openshift_docker and docker, to be run against host groups that were not intended, such as nfs. This commit explicitly limits the openshift_version role to run only against masters, nodes, and etcd host groups. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1497144
2017-10-04Merge pull request #5647 from mgugino-upstream-stage/docker-reg-auth-after-startOpenShift Merge Robot
Automatic merge from submit-queue. Ensure docker service started prior to credentials Currently, authenticated registry credentials are requested before docker might be started in the docker role. This commit moves the relevant registry credential tasks to after docker is started. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1316341
2017-10-04Merge pull request #5543 from ewolinetz/bz1495150OpenShift Merge Robot
Automatic merge from submit-queue. Removing setting pvc size and dynamic to remove looped var setting If we don't set openshift_logging_es_pvc_size but have `openshift_logging_es_pvc_dynamic=True` we see the variable openshift_logging_elasticsearch_pvc_size is set recursively as itself. Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1495150 https://bugzilla.redhat.com/show_bug.cgi?id=1496202
2017-10-04Merge pull request #5643 from mtnbikenc/refactor-certificatesOpenShift Merge Robot
Automatic merge from submit-queue. Refactor certificate playbooks for checkpointing The recent breakout of the certificate playbooks resulted in the certificate portion of the install to be outside of the component checkpoint. This PR moves the certificate playbooks inside their respective config.yml playbook. Removes an unused tasks file from the openshift_named_certificates role.
2017-10-04Merge pull request #5566 from ewolinetz/bz1415297OpenShift Merge Robot
Automatic merge from submit-queue. Validate storage kinds aren't dynamic without dynamic provisioning enabled Checking if any openshift_*_storage_kind variables are set to dynamic without enabling dynamic provisioning nor setting a cloud provider. Addresses https://bugzilla.redhat.com/show_bug.cgi?id=1415297
2017-10-04Merge pull request #5314 from fabianvf/asb-config-updateOpenShift Merge Robot
Automatic merge from submit-queue. Update broker configuration to track current broker Broker configuration has been drifting from this installer, updated configuration and deployment methods a bit to make it work with the new upstream broker. Note: This will not work well when deploying openshift-enterprise, to deploy openshift-enterprise you will need to use an older checkout of openshift-ansible, or specify the upstream broker + catalog and use a registry other than the RHCC. This is because the configuration for the current upstream broker is incompatible with the downstream broker.
2017-10-04Merge pull request #5664 from jfchevrette/patch-4Scott Dodson
remove duplicate [OSEv3:children] group
2017-10-04remove duplicate [OSEv3:children] groupJean-Francois Chevrette
2017-10-04Merge pull request #5656 from ephillipe/patch-1Scott Dodson
Update hosts.origin.example
2017-10-04Update hosts.ose.exampleErick Almeida
2017-10-04openshift_checks: lb and nfs do not need dockerLuke Meyer
fixes bug 1496760 https://bugzilla.redhat.com/show_bug.cgi?id=1496760
2017-10-04openshift_checks: use oo group names everywhereLuke Meyer
2017-10-04Merge pull request #5648 from jcantrill/1497401_default_image_versionsScott Dodson
bug 1497401. Default logging and metrics images to 3.7
2017-10-04Update hosts.origin.exampleErick Almeida
Changing sample config from: #openshift_metrics_hawkular_hostname=https://hawkular-metrics.example.com/hawkular/metrics To: #openshift_metrics_hawkular_hostname=hawkular-metrics.example.com Reason: When i set my inventory with [openshift_metrics_hawkular_hostname=https://metrics.MYDOMAIN.com/hawkular/metrics/] the results is break of metrics url, like this: [https://https//metrics.cirrus.alterdata.com.br/hawkular/metrics/hawkular/metrics]
2017-10-03Merge pull request #5641 from mgugino-upstream-stage/fix-hosted-selectorsOpenShift Merge Robot
Automatic merge from submit-queue. Fix hosted selector variable migration Currently, if undefined, openshift_hosted_router_selector and openshift_hosted_registry_selector as set to the value of openshift_hosted_infra_selector. The set_fact logic overrides variable migration inside of oo_filters meant to utilize the deprecated variables openshift_router_selector and openshift_registiry_selector, respectively. This commit corrects the set_fact logic and removes the unused migration from oo_filters. Fixes: https://github.com/openshift/openshift-ansible/issues/5615
2017-10-04Automatic commit of package [openshift-ansible] release [3.7.0-0.143.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2017-10-03Merge pull request #5606 from ↵OpenShift Merge Robot
mgugino-upstream-stage/provision-scale-elb-fixes-master Automatic merge from submit-queue. Fix provisiong scale group and elb logic Some changes necessary to support provisioning and scale group logic Some of this work is duplicated from an existing PR. That PR is about to merge, so I'll rebase once that hits.
2017-10-03Merge pull request #5632 from ↵OpenShift Merge Robot
mgugino-upstream-stage/limit-version-upgrade-masters Automatic merge from submit-queue. Limit base-package install during master upgrades Currently, openshift_version installs RPM packages on all nodes and masters to aid in determining and setting the proper version across the cluster. This commit limits the host groups to only masters during upgrade_control_plane plays. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1495107
2017-10-03Automatic commit of package [openshift-ansible] release [3.7.0-0.142.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2017-10-03Add logging es prometheus endpointJeff Cantrill
2017-10-03bug 1497401. Default logging and metrics images to 3.7Jeff Cantrill
2017-10-03Ensure docker service started prior to credentialsMichael Gugino
Currently, authenticated registry credentials are requested before docker might be started in the docker role. This commit moves the relevant registry credential tasks to after docker is started. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1316341
2017-10-03Merge pull request #5633 from mgugino-upstream-stage/fix-node-cloudproviderOpenShift Merge Robot
Automatic merge from submit-queue. Move node aws credentials to config.yml Currently, the node service is started before aws credentials (if needed) are configured. This commit ensures the aws credentials are placed before the node service is started. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1497150
2017-10-03Merge pull request #5638 from sdodson/bz1488366Scott Dodson
Document that nfs_directory must conform to DNS-1123
2017-10-03Remove unused tasks file in openshift_named_certificatesRussell Teague
2017-10-03Move node cert playbook into node config pathRussell Teague
2017-10-03Move master cert playbooks into master config pathRussell Teague
2017-10-03Move etcd cert playbooks into etcd config pathRussell Teague
2017-10-03Merge pull request #5621 from abutcher/scaleup-portal-netOpenShift Merge Robot
Automatic merge from submit-queue. Ensure openshift.common.portal_net updated during scaleup. https://bugzilla.redhat.com/show_bug.cgi?id=1451023 This fact is set in `initialize_facts.yml` at the beginning of scaleup so make sure that we update this fact if we read a different value from the first master's config file.
2017-10-03Fix hosted selector variable migrationMichael Gugino
Currently, if undefined, openshift_hosted_router_selector and openshift_hosted_registry_selector as set to the value of openshift_hosted_infra_selector. The set_fact logic overrides variable migration inside of oo_filters meant to utilize the deprecated variables openshift_router_selector and openshift_registiry_selector, respectively. This commit corrects the set_fact logic and removes the unused migration from oo_filters. Fixes: https://github.com/openshift/openshift-ansible/issues/5615
2017-10-03Merge pull request #5490 from giuseppe/set-crio-docker-tag-for-oseOpenShift Merge Robot
Automatic merge from submit-queue. CRI-O, Docker: set the tag to the OpenShift release on RHEL Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1493376
2017-10-03Bug 1496271 - Perserve SCC for ES local persistent storageJeff Cantrill
ES can be modified to use node local persistent storage. This requires changing SCC and is described in docs: https://docs.openshift.com/container-platform/3.6/install_config/aggregate_logging.html During an upgrade, SCC defined by the user is ignored. This fix fetches SCC user defined as a fact and adds it to the ES DC which is later used.
2017-10-03Document that nfs_directory must conform to DNS-1123Scott Dodson
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1488366
2017-10-03Limit hosts that run openshift_version roleMichael Gugino
Currently, the openshift_version role is run against the oo_all_hosts group. This causes the dependencies, such as openshift_docker and docker, to be run against host groups that were not intended, such as nfs. This commit explicitly limits the openshift_version role to run only against masters, nodes, and etcd host groups. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1497144
2017-10-03Merge pull request #5630 from abutcher/etcd-scaleup-targetOpenShift Merge Robot
Automatic merge from submit-queue. Use etcd_ip when communicating with the cluster as a peer in etcd scaleup. We can't communicate with the hostname here since etcd will be [configured to listen to its IP address](https://github.com/openshift/openshift-ansible/blob/ead22bb1c3b6d6366502b14b97b7aae5605f8a58/roles/etcd/defaults/main.yaml#L69). Fixes https://github.com/openshift/openshift-ansible/issues/5620
2017-10-03Automatic commit of package [openshift-ansible] release [3.7.0-0.141.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2017-10-03Merge pull request #5629 from mgugino-upstream-stage/duplicate-docker-regsOpenShift Merge Robot
Automatic merge from submit-queue. Restore registires to /etc/sysconfig/docker Previously, a commit was added to migrate registires from /etc/sysconfig/docker to /etc/containers/registries.conf We are not currently enforcing a minimum version of docker to consume from this new file, thus some installations are not utilizing the correct repositories. This commit duplicates the registires in both locations to ensure additional/blocked/insecure registries are honored.
2017-10-03Merge pull request #5611 from smarterclayton/update_varsOpenShift Merge Robot
Automatic merge from submit-queue. Update to the openshift_aws style scheme for variables Corresponding changes will be made to the other repositories after merge. @kwoodson Manually tested this with openshift/origin-gce#51
2017-10-03Merge pull request #5614 from mtnbikenc/fix-prometheusOpenShift Merge Robot
Automatic merge from submit-queue. Fix Prometheus byo entry point Adds the std_include.yml playbook to the byo entrypoint and moves the conditional install to the openshift_hosted.yml portion of an install.
2017-10-03Automatic commit of package [openshift-ansible] release [3.7.0-0.140.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2017-10-02Merge pull request #5619 from ashcrow/1497274OpenShift Merge Robot
Automatic merge from submit-queue. openshift_checks: Fix incorrect list cast ``docker_image_availability`` casted ``openshift_docker_additional_registries`` to a list using the ``list()`` function. If a string was returned (IE: only a single registry added) the result would be the string split up by component characters. This change forces a string result from ``get_var`` to be placed inside a list. If the result is anything BUT a string the original ``list()`` function is called on the result. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1497274 Resolves #5610
2017-10-02Merge pull request #5608 from jarrpa/empty-optionOpenShift Merge Robot
Automatic merge from submit-queue. lib/base: Allow for empty option value Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1483923 Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
2017-10-02Automatic commit of package [openshift-ansible] release [3.7.0-0.139.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2017-10-02Move node aws credentials to config.ymlMichael Gugino
Currently, the node service is started before aws credentials (if needed) are configured. This commit ensures the aws credentials are placed before the node service is started. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1497150
2017-10-02Merge pull request #5600 from ewolinetz/bz1496352OpenShift Merge Robot
Automatic merge from submit-queue. Reverting using uninstall variables for logging and metrics Reverting using `uninstall` variables for logging and metrics. Addresses bug and comments in https://bugzilla.redhat.com/show_bug.cgi?id=1496352
generated by cgit v1.2.3 (git 2.39.1) at 2025-11-30 23:22:44 +0000