summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add key check for facts_for_clusterrolebindingsKenjiro Nakayama2018-01-091-1/+1
|
* Add key existing check to collect facts for rolebidingsKenjiro Nakayama2018-01-091-1/+1
|
* Merge pull request #6359 from spadgett/web-console-serverScott Dodson2018-01-0624-0/+426
|\ | | | | Install web console server
| * Install web console serverSamuel Padgett2018-01-0524-0/+426
| |
* | Merge pull request #6595 from mgugino-upstream-stage/fix-checks-varsOpenShift Merge Robot2018-01-050-0/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix docker_image_availability checks This commit ensures that oreg_url is properly templated by ansible before being consumed in the logic. This commit also adds a method to the base health check class to detect if self._templar is none, and return the appropriate templated/untemplated version of the variable. This is mostly for unit tests.
| * | Fix docker_image_availability checksMichael Gugino2018-01-032-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit ensures that oreg_url is properly templated by ansible before being consumed in the logic. This commit also adds a method to the base health check class to detect if self._templar is none, and return the appropriate templated/untemplated version of the variable. This is mostly for unit tests.
* | | Merge pull request #6597 from mgugino-upstream-stage/etc-remove-become-noOpenShift Merge Robot2018-01-057-54/+43
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Remove become=no from etcd cert tasks etcd runs some actions locally to copy certs from the CA cert host. We shouldn't hard-code become behavior as it can be unexpected for the end user.
| * | | Remove become=no from various roles and tasksMichael Gugino2018-01-055-50/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | etcd runs some actions locally to copy certs from the CA cert host. This commit ensures that we respect the end user's intended behavior with become when using 'anisble_become' in the inventory. Other roles with similar tasks have been modified in the same manner. We shouldn't hard-code become behavior as it can be unexpected for the end user. This only currently works in the CI because the CI passes the '-b' argument on the command line, which will override the task behavior.
| * | | Fix docker_image_availability checksMichael Gugino2018-01-052-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit ensures that oreg_url is properly templated by ansible before being consumed in the logic. This commit also adds a method to the base health check class to detect if self._templar is none, and return the appropriate templated/untemplated version of the variable. This is mostly for unit tests.
* | | | Merge pull request #6511 from fabianvf/asb-origin-prefixScott Dodson2018-01-051-1/+1
|\ \ \ \ | | | | | | | | | | Add origin- prefix to ASB image
| * | | | Add origin- prefix to ASB imageFabian von Feilitzsch2017-12-181-1/+1
| | | | |
* | | | | Merge pull request #6627 from sdodson/import_roleScott Dodson2018-01-0576-152/+152
|\ \ \ \ \ | | | | | | | | | | | | Migrate to import_role for static role inclusion
| * | | | | Migrate to import_role for static role inclusionScott Dodson2018-01-0576-152/+152
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Ansible 2.2, the include_role directive came into existence as a Tech Preview. It is still a Tech Preview through Ansible 2.4 (and in current devel branch), but with a noteable change. The default behavior switched from static: true to static: false because that functionality moved to the newly introduced import_role directive (in order to stay consistent with include* being dynamic in nature and `import* being static in nature). The dynamic include is considerably more memory intensive as it will dynamically create a role import for every host in the inventory list to be used. (Also worth noting, there is at the time of this writing an object allocation inefficiency in the dynamic include that can in certain situations amplify this effect considerably) This change is meant to mitigate the pressure on memory for the Ansible control host. We need to evaluate where it makes sense to dynamically include roles and revert back to dynamic inclusion if and where it makes sense to do so.
* | | | | Merge pull request #6532 from jmencak/heat_stack-cnsOpenShift Merge Robot2018-01-055-1/+115
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. OpenStack provisioning -- support cns. Initial support for CNS nodes during OpenShift on OpenStack provisioning.
| * | | | | OpenStack provisioning -- support cns.Jiri Mencak2018-01-025-1/+115
| | | | | |
* | | | | | Merge pull request #6615 from giuseppe/cri-o-set-proxyOpenShift Merge Robot2018-01-052-0/+20
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. cri-o: set proxy variables Make CRI-O honor HTTP_PROXY/HTTPS_PROXY/NO_PROXY. This change https://github.com/kubernetes-incubator/cri-o/pull/1245 in the system container is required
| * | | | | crio: create /etc/sysconfig/crio-storageGiuseppe Scrivano2018-01-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | crio: configure proxy variablesGiuseppe Scrivano2018-01-052-0/+14
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1529478 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.16.0].Jenkins CD Merge Bot2018-01-032-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | Merge pull request #6596 from sdodson/masterScott Dodson2018-01-037-0/+152
|\ \ \ \ \ | |_|_|/ / |/| | | | Add gluster 3.9 templates
| * | | | Add gluster 3.9 templatesScott Dodson2018-01-037-0/+152
|/ / / /
* | | | Merge pull request #6539 from mgugino-upstream-stage/ci-in-treeScott Dodson2018-01-039-0/+160
|\ \ \ \ | | | | | | | | | | Add in-tree CI scripts
| * | | | Add in-tree CI scriptsMichael Gugino2018-01-039-0/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the scripts that contain testing inventory and actually execute the running of openshift-ansible plays are kept in the CI jobs themselves. This commit adds scripts into our tree so we can have better control over variables, differences between branches, and more transparency to end users for how we run our integration tests.
* | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.15.0].Jenkins CD Merge Bot2018-01-032-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.14.0].Jenkins CD Merge Bot2018-01-032-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | Merge pull request #6586 from ↵OpenShift Merge Robot2018-01-038-10/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mgugino-upstream-stage/cast-bool-openshift_docker_use_system_container Automatic merge from submit-queue. Cast openshift_docker_use_system_container to bool openshift_docker_use_system_container might be passed in via ini inventory as 'openshift_docker_use_system_container=false' This condition will be interpreted as a string type, instead of boolean. Casting openshift_docker_use_system_container as bool will achieve the users desired intent. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1528943
| * | | | | Cast openshift_docker_use_system_container to boolMichael Gugino2018-01-028-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | openshift_docker_use_system_container might be passed in via ini inventory as 'openshift_docker_use_system_container=false' This condition will be interpreted as a string type, instead of boolean. Casting openshift_docker_use_system_container as bool will achieve the users desired intent. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1528943
* | | | | | Merge pull request #6581 from mgugino-upstream-stage/fix-syscontainer-reg-authOpenShift Merge Robot2018-01-021-1/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Add docker auth credentials to system container install This commit adds docker auth credentials mount to system container systemd unit file. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1514324
| * | | | | | Add docker auth credentials to system container installMichael Gugino2018-01-021-1/+7
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds docker auth credentials mount to system container systemd unit file. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1514324
* | | | | | 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.