summaryrefslogtreecommitdiffstats
path: root/playbooks
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6855 from sdodson/bz1537726-masterScott Dodson2018-02-012-0/+3
|\ | | | | Don't restart docker when re-deploying node certificates
| * Don't restart docker when re-deploying node certificatesScott Dodson2018-01-242-0/+3
| | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1537726
* | Merge pull request #6955 from vrutkovs/upgrade-regex-version-matchOpenShift Merge Robot2018-02-011-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. upgrades: use openshift_version as a regexp when checking openshift.common.version This would fix errors like 'Master running 3.9.0 must be upgraded to 3.9* before node upgrade can be run' during the upgrade Signed-off-by: Vadim Rutkovsky <vrutkovs@redhat.com>
| * | upgrades: use openshift_version as a regexp when checking ↵Vadim Rutkovsky2018-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | openshift.common.version This would fix errors like 'Master running 3.9.0 must be upgraded to 3.9* before node upgrade can be run' during the upgrade Signed-off-by: Vadim Rutkovsky <vrutkovs@redhat.com>
* | | Merge pull request #6876 from mgugino-upstream-stage/fix-restart-master-playScott Dodson2018-02-016-16/+4
|\ \ \ | | | | | | | | Remove master_ha bool checks
| * | | Remove master_ha bool checksMichael Gugino2018-01-256-16/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of these checks are no longer applicable to the tasks on which they are applied. This commit removes incorrect ha checks to ensure services are restarted at appropriate times. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1500897
* | | | Merge pull request #6944 from mtnbikenc/fix-1540108Scott Dodson2018-02-011-0/+1
|\ \ \ \ | | | | | | | | | | [1540108] Ignore openshift_pkg_version during 3.8 upgrade
| * | | | Ignore openshift_pkg_version during 3.8 upgradeRussell Teague2018-01-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 3.8 is an intermediate step when upgrading to 3.9 and openshift_pkg_version may be set in the inventory for 3.9. This will ensure there is not a conflict between the intermediate step and the final version requested. Bug 1540108 https://bugzilla.redhat.com/show_bug.cgi?id=1540108
* | | | | Merge pull request #6952 from sdodson/bz1540462OpenShift Merge Robot2018-01-313-16/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Don't update master-config.yaml with logging/metrics urls >= 3.9 Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1540462 I thought about refactoring things just to move the assetConfig vs ConfigMap update into update_master_config but the tasks get called on different hosts via plays.
| * | | | | Remove playbooks/adhoc/openshift_hosted_logging_efk.yamlScott Dodson2018-01-311-18/+0
| | | | | |
| * | | | | Don't update master-config.yaml with logging/metrics urls >= 3.9Scott Dodson2018-01-313-1/+5
| | |_|/ / | |/| | |
* | | | | Merge pull request #6732 from dav1x/vsphere-stgOpenShift Merge Robot2018-01-311-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. vsphere storage default add - redo on PR squashing commits vsphere storage default add - redo on PR squashing commits
| * | | | | vsphere storage default addDavis Phillips2018-01-151-1/+3
| | | | | |
* | | | | | Merge pull request #6908 from tzumainn/fix-cinder-mountOpenShift Merge Robot2018-01-311-10/+38
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. add cinder mountpoint to inventory Although the heat templates specify /dev/sdb as a mountpoint for cinder volumes, openstack does not always respect that setting. This PR updates inventory.py to figure out the correct mountpoint from the openstack API; and passes that information into the docker-storage-setup.
| * | | | | flake cleanupTzu-Mainn Chen2018-01-291-0/+3
| | | | | |
| * | | | | code simplification and lint cleanupTzu-Mainn Chen2018-01-291-20/+31
| | | | | |
| * | | | | add cinder mountpoint to inventoryTzu-Mainn Chen2018-01-271-1/+15
| | | | | |
* | | | | | Merge pull request #6927 from sdodson/1538974OpenShift Merge Robot2018-01-301-0/+8
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Don't deploy the console if disabled or registry subtype Whenever openshift_deployment_subtype == registry or the console is explicitly listed as a disabled feature don't deploy. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1538974
| * | | | | Don't deploy the console if disabled or registry subtypeScott Dodson2018-01-291-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1538974
* | | | | | Merge pull request #6889 from mazzystr/fix-port-alignmentOpenShift Merge Robot2018-01-291-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix misaligned ports for sg,elb,api Fix to issue [6867](https://github.com/openshift/openshift-ansible/issues/6867) The scope of this patch widened slightly to consolidate some AWS ELB vars/dicts into the single dictionary due to Health check being sourced by all ELBs. By default health check needs to ping 8443 for master ELBS and 443 for infra ELBs. Consolidating allows for changes to the behavior of one ELB without affecting the others. @sdodson @kwoodson
| * | | | | | Fix misaligned ports for sg,elb,apiChris Callegari2018-01-251-0/+6
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #6215 from sdodson/bz1511870OpenShift Merge Robot2018-01-291-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Add kube service ipaddress to no_proxy list Computed as the first ip address in the portal_net Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1511870
| * | | | | Add kube service ipaddress to no_proxy listScott Dodson2018-01-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Computed as the first ip address in the portal_net
* | | | | | Merge pull request #6811 from mjudeikis/prometheus-new-templateOpenShift Merge Robot2018-01-292-0/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Prometheus new template rebase Updating Prometheus for new templates/example. 1. New scraping rules, fixes 2. exposed alert manager 3. clean ansible 4. add a custom annotation for routes (in the example when AVI router in use we need to be able to add custom annotations) 5. Externalise some of the configs Still work in progress... FIY: @zgalor
| * | | | | | Rebase Prometheus example for new scrape endpoints and expose alert managerMangirdas2018-01-282-0/+10
| | | | | | |
* | | | | | | Merge pull request #6886 from ↵OpenShift Merge Robot2018-01-271-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | smarterclayton/playbooks/gcp/openshift-cluster/build_base_image.yml Automatic merge from submit-queue. Add GPG keys in the base image and don't install docker Base image fails to accept the keys.
| * | | | | | | Add GPG keys in the base image and don't install dockerClayton Coleman2018-01-251-1/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #6896 from mgugino-upstream-stage/fix-upgrade-image-tagOpenShift Merge Robot2018-01-261-3/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Correct 3.7 to 3.9 upgrade openshift_image_tag Due to complexities upgrading two versions at the same time, openshift_image_tag was being set incorrectly during control_plane upgrades. This commit ensures that openshift_image_tag is set correctly during this process. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1536839
| * | | | | | | Correct 3.7 to 3.9 upgrade openshift_image_tagMichael Gugino2018-01-261-3/+24
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to complexities upgrading two versions at the same time, openshift_image_tag was being set incorrectly during control_plane upgrades. This commit ensures that openshift_image_tag is set correctly during this process. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1536839
* | | | | | | Merge pull request #6862 from ewolinetz/deprecate_use_callbackOpenShift Merge Robot2018-01-261-8/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Updating deprecations to use callback plugin Instead of just pausing during the run and relying on users to see it, instead format and print the deprecated variables at the end of play instead like this: ``` Initialization : Complete (0:00:23) [DEPRECATION WARNING]: The following are deprecated variables and will be no longer be used in the next minor release. Please update your inventory accordingly. openshift_hosted_logging_deploy openshift_hosted_metrics_deployer_prefix ``` The plugin changes are the same as the changes made in https://github.com/openshift/openshift-ansible/pull/6734
| * | | | | | Updating deprecations to use callback pluginEric Wolinetz2018-01-251-8/+0
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #6821 from spadgett/remove-asset-configScott Dodson2018-01-264-41/+57
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Remove old assetConfig from master-config.yaml
| * | | | | Remove old assetConfig from master-config.yamlSamuel Padgett2018-01-254-41/+57
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `assetConfig` is no longer used now that the console is split into its own pod. - Remove `assetConfig` on upgrades to 3.9 - Stop writing logging and metrics URLs to assetConfig for 3.9
* | | | | Merge pull request #6859 from abutcher/bz1536217OpenShift Merge Robot2018-01-252-0/+46
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Automatic merge from submit-queue. Bug 1536217: Need to validate etcd serving certs before 3.9 upgrade
| * | | | Redeploy etcd certificates during upgrade when etcd hostname not present in ↵Andrew Butcher2018-01-242-0/+46
| | | | | | | | | | | | | | | | | | | | etcd serving cert SAN.
* | | | | Merge pull request #6858 from mtnbikenc/fix-1530403Scott Dodson2018-01-251-1/+5
|\ \ \ \ \ | | | | | | | | | | | | [1530403] Improve etcd group error message
| * | | | | [1530403] Improve etcd group error messageRussell Teague2018-01-241-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1530403
* | | | | | Merge pull request #6849 from vrutkovs/label-masters-with-upstream-standardOpenShift Merge Robot2018-01-252-20/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Label masters with node-role.kubernetes.io/master This is controlled by `openshift_master_node_label` var in openshift_manage_node Related to https://bugzilla.redhat.com/show_bug.cgi?id=1535673
| * | | | | Label masters with node-role.kubernetes.io/master. This PR also sets these ↵Vadim Rutkovsky2018-01-242-20/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | labels and scheduling status during upgrades Signed-off-by: Vadim Rutkovsky <vrutkovs@redhat.com>
* | | | | | Merge pull request #6842 from ↵Scott Dodson2018-01-249-1/+10
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | mgugino-upstream-stage/protect-upgrade-master-version Protect master installed version during node upgrades
| * | | | | Protect master installed version during node upgradesMichael Gugino2018-01-239-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Master version is unprotected during all upgrades. During node-only upgrades, master version should remain protected to ensure correct image tag is set for node upgrades. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1536839
* | | | | | Merge pull request #6603 from joelddiaz/fetch_subnet_azOpenShift Merge Robot2018-01-241-1/+17
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. un-hardcode default subnet az allow defining 'default_az' for one of the subnets in the vpc structure, and pull that default_az and set it to openshift_aws_subnet_az. this should allow one less variable to be defined/overridded when using non-default (us-east-1) regions
| * | | | | un-hardcode default subnet azJoel Diaz2018-01-221-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allow defining 'default_az' for one of the subnets in the vpc structure, and pull that default_az and set it to openshift_aws_subnet_az. this should allow one less variable to have to be defined/overridded (openshift_aws_subnet_az) when using non-default (us-east-1) regions update provisioning_vars.yml.example to show an example VPC structure
* | | | | | Merge pull request #6749 from sdodson/allow-5-etcd-masterScott Dodson2018-01-241-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow 5 etcd hosts
| * | | | | | Allow 5 etcd hostsScott Dodson2018-01-161-1/+1
| | | | | | |
* | | | | | | Merge pull request #6541 from smarterclayton/move_gcp_inScott Dodson2018-01-2416-91/+447
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Allow openshift-ansible image to deploy to GCP
| * | | | | | Split control plane and component install in deploy_clusterClayton Coleman2018-01-237-88/+90
| | | | | | |
| * | | | | | PyYAML is required by openshift_facts on nodesClayton Coleman2018-01-231-0/+2
| | | | | | |
| * | | | | | Move origin-gce roles and playbooks into openshift-ansibleClayton Coleman2018-01-2310-5/+357
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves all core functionality into the openshift-ansible repo, adds the necessary equivalent entrypoint to the openshift-ansible installer image, and ensures the dynamic inventory mechanisms in openshift-ansible continue to work. Notable changes from origin-gce: * playbook extensions changed to .yml * dynamic inventory subdirectory created to prevent accidental use * use the custom entrypoint entrypoint-gcp for this image * move tasks into openshift_gcp role
* | | | | | | Merge pull request #6802 from mgugino-upstream-stage/fix-etcd-scaleupOpenShift Merge Robot2018-01-234-3/+56
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix etcd scaleup playbook Currently, etcd scaleup playbook has no way to account for newly added prerequisites.yml play. This commit allows adding new etcd hosts via scaleup play and accounts for etcd hosts that are standalone or part of nodes or masters group.