summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6522 from mgugino-upstream-stage/oauth_templateOpenShift Merge Robot2018-01-025-25/+14
|\ | | | | | | | | | | | | | | Automatic merge from submit-queue. Remove oauth_template bits from openshift_facts This commit moves some deprecated variable logic outside of openshift_facts and into role defaults.
| * Remove oauth_template bits from openshift_factsMichael Gugino2017-12-215-25/+14
| | | | | | | | | | This commit moves some deprecated variable logic outside of openshift_facts and into role defaults.
* | Merge pull request #6583 from mgugino-upstream-stage/aws-creds-locationOpenShift Merge Robot2018-01-021-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Correct kublet_args cloud-provider directories This commit updates kublet_args to correct cloudprovider configuration file locaitons. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1527203
| * | Correct kublet_args cloud-provider directoriesMichael Gugino2018-01-021-3/+3
| | | | | | | | | | | | | | | | | | | | | This commit updates kublet_args to correct cloudprovider configuration file locaitons. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1527203
* | | Merge pull request #6557 from mgugino-upstream-stage/delay-hosted-waitOpenShift Merge Robot2018-01-027-32/+52
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Move wait_for_pods to it's own play openshift_hosted Currently, both registry and router pods need to be polled for successful deployment. Somtimes this can take up to a minute. This commit attempts to deploy both pods before polling either. This should reduce the average wait time for polling pods by 50% as time spent polling the first will also allow the second pod to continue it's own deployment.
| * | | Move wait_for_pods to it's own play openshift_hostedMichael Gugino2017-12-217-32/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, both registry and router pods need to be polled for successful deployment. Somtimes this can take up to a minute. This commit attempts to deploy both pods before polling either. This should reduce the average wait time for polling pods by 50% as time spent polling the first will also allow the second pod to continue it's own deployment.
* | | | Merge pull request #5894 from ewolinetz/logging_defaults_from_existingOpenShift Merge Robot2018-01-0213-67/+312
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Update logging to use existing cluster deployment for defaults This will allow us to use logging facts to set defaults of specific configurations such as ES index replicas and shard count. The update to logging facts yields us output like: ```json "elasticsearch": { "clusterrolebindings": {}, "configmaps": { "logging-elasticsearch": { "elasticsearch.yml": { "cloud": { "kubernetes": { "namespace": "${NAMESPACE}", "pod_label": "${POD_LABEL}", "pod_port": 9300 } }, "cluster": { "name": "${CLUSTER_NAME}" }, "discovery": { "type": "kubernetes", "zen.minimum_master_nodes": "${NODE_QUORUM}", "zen.ping.multicast.enabled": false }, "gateway": { "expected_nodes": "${RECOVER_EXPECTED_NODES}", "recover_after_nodes": "${NODE_QUORUM}", "recover_after_time": "${RECOVER_AFTER_TIME}" }, "index": { "number_of_replicas": 0, "number_of_shards": 1, "translog": { "flush_threshold_period": "5m", "flush_threshold_size": "256mb" }, "unassigned.node_left.delayed_timeout": "2m" }, "io.fabric8.elasticsearch.authentication.users": [ "system.logging.kibana", "system.logging.fluentd", "system.logging.curator", "system.admin" ], ``` TODO: - [x] Update logging facts to pull out settings from config maps - [x] Move `openshift_sanitize_inventory/library/conditional_set_fact.py` up to repo level - [x] Generate diffs against currently deployed configs and correctly patch in custom changes from customers - [x] Use `conditional_set_fact` to easily set defaults for logging based on logging facts, or falling back to role defaults when not specified in the inventory - [x] Update all components to follow patching configmaps
| * | | | Updating logging_facts to be able to pull values from config maps yaml ↵Eric Wolinetz2018-01-0213-67/+312
| | |/ / | |/| | | | | | | | | | files, use diffs to keep custom changes, white list certain settings when creating diffs
* | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.13.0].Jenkins CD Merge Bot2018-01-022-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | Merge pull request #6523 from nhosoi/allowed_versionsOpenShift Merge Robot2018-01-025-10/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Bug 1527178 - installation of logging stack failed: Invalid version s… …pecified for Elasticsearch openshift_logging_{curator,elasicsearch,fluentd,kibana,mux}/vars/main.yml: - adding "3_8" to __allowed_.*_versions - replacing the value of __latest_.*_version "3_6" with "3_8". Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1527178
| * | | | Bug 1527178 - installation of logging stack failed: Invalid version ↵Noriko Hosoi2017-12-275-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | specified for Elasticsearch openshift_logging_{curator,elasicsearch,fluentd,kibana,mux}/vars/main.yml: - adding "3_8" to __allowed_.*_versions - replacing the value of __latest_.*_version "3_6" with "3_8".
* | | | | Merge pull request #6554 from mgugino-upstream-stage/bootstrap-to-include-roleMichael Gugino2018-01-022-4/+7
|\ \ \ \ \ | |_|/ / / |/| | | | Remove bootstrap.yml from main.yml in openshift_node role
| * | | | Remove bootstrap.yml from main.yml in openshift_node roleMichael Gugino2017-12-212-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit utilizes include_role for bootstrapping the node instead of conditional include of tasks now that the node role has no meta includes that have tasks.
* | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.12.0].Jenkins CD Merge Bot2018-01-022-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.11.0].Jenkins CD Merge Bot2018-01-012-2/+41
| |/ / / |/| | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | Merge pull request #6497 from kwoodson/remove_docker_credsOpenShift Merge Robot2017-12-231-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Adding no_log to registry_auth. We were seeing credentials show up in our jenkins logs. We'd prefer if they were not logged. I'm not sure the repercussions but these are sensitive and probably should be `no_log`.
| * | | | Adding no_log to registry_auth.Kenny Woodson2017-12-151-0/+2
| | | | |
* | | | | Merge pull request #6462 from kwoodson/daemonset_configOpenShift Merge Robot2017-12-234-0/+222
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Laying config files down in a daemonset pod. Work to have daemonset config laydown files for nodes used with golden images. Based on the original work from @smarterclayton https://github.com/openshift/origin/pull/17351
| * | | | daemonset config role.Kenny Woodson2017-12-214-0/+222
| | | | |
* | | | | Merge pull request #6542 from smarterclayton/fix_dockerfileOpenShift Merge Robot2017-12-212-8/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Must directly specify google-cloud-sdk version The upstream forces versions on packages, and rpm -V fails when it does not match. Also add which, used by gcloud. Fixes break https://ci.openshift.redhat.com/jenkins/job/build-and-release-latest-openshift-ansible-images/210/console
| * | | | | Must directly specify google-cloud-sdk versionClayton Coleman2017-12-212-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The upstream forces versions on packages, and rpm -V fails when it does not match. Also add which, used by gcloud.
* | | | | | Merge pull request #6550 from mbarnes/aws_provisioning_vars_exampleOpenShift Merge Robot2017-12-211-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. aws: Fix misnamed variable in provisioning_vars.yml.example This typo (?) in `provisioning_vars.yml.example` tripped me up while trying to run `provision_install.yml` using a configuration based on the example file.
| * | | | | aws: Fix misnamed variable in provisioning_vars.yml.exampleMatthew Barnes2017-12-211-1/+1
| |/ / / /
* | | | | Merge pull request #6530 from mgugino-upstream-stage/init-task-trimMichael Gugino2017-12-2144-190/+233
|\ \ \ \ \ | | | | | | | | | | | | Move sanity_checks into custom action plugin
| * | | | | Remove references to deployment_typeMichael Gugino2017-12-2140-113/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move openshift_deployment_type check into sanity_check action plugin. Remove compatibility for deployment_type. deployment_type has been deprecated for some time now.
| * | | | | Move validate_hosts to prerequisites.ymlMichael Gugino2017-12-207-34/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move more checks outside of init/main.yml for speeding up upgrades and other operational plays that need to run.
| * | | | | Move sanity_checks into custom action pluginMichael Gugino2017-12-202-48/+108
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit moves sanity_checks tasks into a custom action plugin that is only run against a single host. This will result in a large reduction of tasks during initialization
* | | | | Merge pull request #6546 from mgugino-upstream-stage/fix-crt-groupsMichael Gugino2017-12-216-16/+114
|\ \ \ \ \ | |_|/ / / |/| | | | Fix container_runtime openshift_containerized_host_groups
| * | | | Fix container_runtime openshift_containerized_host_groupsMichael Gugino2017-12-216-16/+114
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | openshift_containerized_host_groups needs to be referenced via hostvars. This commit also updates tox ansible syntax checks to account for unavailability of hostsvars during syntax checks. Fixes: https://github.com/openshift/openshift-ansible/issues/6540
* | | | Merge pull request #6529 from smarterclayton/add_gcloud_to_imageOpenShift Merge Robot2017-12-202-2/+9
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Add gcloud to the installer image The installer image will become our default cloud operations image for tasks that overlap with ansible, and will also be the image for provioning. We will eventually add others like awscli for support roles. Prereq for moving origin-gce into this repo @sdodson as discussed earlier (bypasses the need to get this in our tree for now)
| * | | Add gcloud to the installer imageClayton Coleman2017-12-192-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | The installer image will become our default cloud operations image for tasks that overlap with ansible, and will also be the image for provioning. We will eventually add others like awscli for support roles.
* | | | Merge pull request #6516 from mgugino-upstream-stage/defact-is-containerizedOpenShift Merge Robot2017-12-20134-372/+310
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Remove openshift.common.{is_atomic|is_containerized} We set these variables using facts in init, no need to duplicate the logic all around the codebase.
| * | | | Remove openshift.common.{is_atomic|is_containerized}Michael Gugino2017-12-20134-372/+310
|/ / / / | | | | | | | | | | | | | | | | We set these variables using facts in init, no need to duplicate the logic all around the codebase.
* | | | Merge pull request #6524 from kwoodson/docker_storage_setup_overlayScott Dodson2017-12-206-0/+60
|\ \ \ \ | | | | | | | | | | Adding support for docker-storage-setup on overlay
| * | | | Adding support for docker-storage-setup on overlayKenny Woodson2017-12-196-0/+60
| | |/ / | |/| |
* | | | Merge pull request #6509 from abutcher/asg-tagsOpenShift Merge Robot2017-12-193-14/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Move node group tags to openshift_aws_{master,node}_group. Move node groups tags to `openshift_aws_{master,node}_group` variables as discussed below.
| * | | | Move node group tags to openshift_aws_{master,node}_group.Andrew Butcher2017-12-183-14/+15
| | |/ / | |/| |
* | | | Merge pull request #6062 from luis5tb/readinessMichael Gugino2017-12-191-0/+7
|\ \ \ \ | | | | | | | | | | Add readiness probe to kuryr controller pod
| * | | | Add readiness probe to kuryr controller podLuis Tomas Bolivar2017-11-081-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commits adds a readiness probe to the kuryr controller when the kuryr ports pool functionality is enabled. This way the controller will not be set as ready until all the pre-created ports have been loaded into their respective pools and are ready to be used by the pods.
* | | | | Merge pull request #6510 from abutcher/centos37Scott Dodson2017-12-191-0/+27
|\ \ \ \ \ | | | | | | | | | | | | Add CentOS-OpenShift-Origin37 repo template.
| * | | | | Add CentOS-OpenShift-Origin37 repo template.Andrew Butcher2017-12-181-0/+27
| | |/ / / | |/| | |
* | | | | Merge pull request #6469 from mgugino-upstream-stage/plugin-consolidateScott Dodson2017-12-19160-896/+332
|\ \ \ \ \ | |_|_|/ / |/| | | | Plugin consolidate
| * | | | Relocate filter plugins to lib_utilsMichael Gugino2017-12-18160-896/+332
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit relocates filter_plugings to lib_utils, changes the namespacing to prevent unintended use of older versions that may be present in filter_plugins/ directory on existing installs. Add lib_utils to meta depends for roles Also consolidate some plugins into lib_utils from various other areas. Update rpm spec, obsolete plugin rpms.
* | | | | Merge pull request #6515 from mgugino-upstream-stage/defactingOpenShift Merge Robot2017-12-1910-34/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Remove some small items from openshift_facts Remove some small items from openshift_facts that don't need to be there.
| * | | | | Remove some small items from openshift_factsMichael Gugino2017-12-1810-34/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove some small items from openshift_facts that don't need to be there.
* | | | | | Merge pull request #6517 from mgugino-upstream-stage/router-selectorOpenShift Merge Robot2017-12-191-5/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix hosted_reg_router selectors This commit removes duplicate (and incorrect) assignment of openshift_hosted_registry_selector and openshift_hosted_router_selector Fixes https://github.com/openshift/origin/issues/17682
| * | | | | Fix hosted_reg_router selectorsMichael Gugino2017-12-181-5/+0
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | This commit removes duplicate (and incorrect) assignment of openshift_hosted_registry_selector and openshift_hosted_router_selector
* | | | | Merge pull request #6514 from markllama/osp-add-reposMichael Gugino2017-12-181-3/+11
|\ \ \ \ \ | |_|/ / / |/| | | | set repos after registration
| * | | | set repos after registration: convert to match task -> import_role model.Mark Lamourine2017-12-181-3/+11
| |/ / /
* | | | Merge pull request #6513 from mgugino-upstream-stage/remove-node-facts-pt2Scott Dodson2017-12-1814-111/+39
|\ \ \ \ | |/ / / |/| | | Remove openshift_node_facts role