summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-02-01Merge pull request #6989 from sdodson/vsphere-defaultsScott Dodson
Set a default for required vsphere variable
2018-02-01Set a default for required vsphere variableScott Dodson
Check for required variables in sanitize inventory
2018-02-01Merge pull request #6955 from vrutkovs/upgrade-regex-version-matchOpenShift Merge Robot
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>
2018-02-01Merge pull request #6876 from mgugino-upstream-stage/fix-restart-master-playScott Dodson
Remove master_ha bool checks
2018-02-01Merge pull request #6944 from mtnbikenc/fix-1540108Scott Dodson
[1540108] Ignore openshift_pkg_version during 3.8 upgrade
2018-01-31Merge pull request #6947 from abutcher/openshift_aws_elb_cert_arnOpenShift Merge Robot
Automatic merge from submit-queue. Re-add openshift_aws_elb_cert_arn. This got removed in https://github.com/openshift/openshift-ansible/pull/6889 which breaks functionality for us.
2018-01-31Merge pull request #6952 from sdodson/bz1540462OpenShift Merge Robot
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.
2018-01-31Merge pull request #6732 from dav1x/vsphere-stgOpenShift Merge Robot
Automatic merge from submit-queue. vsphere storage default add - redo on PR squashing commits vsphere storage default add - redo on PR squashing commits
2018-01-31Automatic commit of package [openshift-ansible] release [3.9.0-0.35.0].Justin Pierce
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2018-01-31Merge pull request #6906 from jcantrill/kibana_env_varsOpenShift Merge Robot
Automatic merge from submit-queue. allow setting of kibana env vars This PR allows setting kibana env vars via ansible in support of being able to adjust kibana config via env vars
2018-01-31Merge pull request #6922 from mjudeikis/glusterfs-block-storageOpenShift Merge Robot
Automatic merge from submit-queue. Glusterfs block storage ansible support GlusterBlock support in our ansible for glusterfs role TODO: - [ ] checking if only one SC is set default - [ ] validate if mpath on nodes is configured - [ ] add check for rhel vs atomic - [x] make sure rpcbind is running and enabled BEFORE we even start glusterfs pods - [x] enable mpath - [ ] validate kernel module availability @ckyriakidou @jarrpa
2018-01-31Merge pull request #6831 from jmencak/heatstack-infra-1936OpenShift Merge Robot
Automatic merge from submit-queue. Fix: e2e tests failing due to :1936/metrics unaccessible. This PR allows access to tcp/1936 ingress infra-secgrp policy, so that e2e test do not fail looking for router metrics (:1936/metrics).
2018-01-31Merge pull request #6895 from ewolinetz/logging_preserve_volume_typeOpenShift Merge Robot
Automatic merge from submit-queue. Preserving ES dc storage type unless overridden by inventory variable Addresses https://bugzilla.redhat.com/show_bug.cgi?id=1496758 where we weren't preserving hostPath for already deployed ES instances.
2018-01-31Only perform console configmap ops when >= 3.9Scott Dodson
2018-01-31Remove playbooks/adhoc/openshift_hosted_logging_efk.yamlScott Dodson
2018-01-31upgrades: use openshift_version as a regexp when checking ↵Vadim Rutkovsky
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>
2018-01-31Don't update master-config.yaml with logging/metrics urls >= 3.9Scott Dodson
2018-01-31Merge pull request #6908 from tzumainn/fix-cinder-mountOpenShift Merge Robot
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.
2018-01-31add glusterblock support for ansibleMangirdas
Co-authored-by: Christina Kyriakidou <Ckyriaki@Redhat.com>
2018-01-31Merge pull request #6868 from vrutkovs/prefix-provisioner-podOpenShift Merge Robot
Automatic merge from submit-queue. Rework provisioners vars to support different prefix/version for Origin/OSE Fixes bug https://bugzilla.redhat.com/show_bug.cgi?id=1523534 Obsoletes https://github.com/openshift/openshift-ansible/pull/6396
2018-01-30Merge pull request #5651 from vareti/NuageEtcdCertsFixOpenShift Merge Robot
Automatic merge from submit-queue. copy etcd client certificates for nuage openshift monitor Nuage OpenShift Monitor requires etcd client certificates to talk to etcd. This PR helps in copying the certificates to the node where monitor is running and configures the input parameters accordingly.
2018-01-30Merge pull request #6919 from mfojtik/symlink-kubectl-to-ocOpenShift Merge Robot
Automatic merge from submit-queue. Symlink kubectl to oc instead of openshift Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1538933 @sdodson @juanvallejo FYI
2018-01-30Merge pull request #6129 from sdodson/contribOpenShift Merge Robot
Automatic merge from submit-queue. Add a bare minimum localhost hosts file and docs Hopefully this makes things easier for folks new to ansible
2018-01-30Automatic commit of package [openshift-ansible] release [3.9.0-0.34.0].Justin Pierce
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2018-01-30Re-add openshift_aws_elb_cert_arn.Andrew Butcher
2018-01-30Merge pull request #6934 from vrutkovs/docker_creds-write-decodeOpenShift Merge Robot
Automatic merge from submit-queue. docker_creds: decode docker_config for py3 only if its a string Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1539552
2018-01-30Add a bare minimum localhost hosts fileScott Dodson
2018-01-30Merge pull request #6928 from ewolinetz/metrics_fix_pvcOpenShift Merge Robot
Automatic merge from submit-queue. Removing ability to change default cassandra_pvc_prefix based on metr… …ics volume name Addresses https://bugzilla.redhat.com/show_bug.cgi?id=1539382 There isn't a reason to change the pvc name to match the volume name.
2018-01-30Ignore openshift_pkg_version during 3.8 upgradeRussell Teague
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
2018-01-30copy etcd client certificates for nuage openshift monitorsareti
* Fix SCC permissions for Nuage daemon sets * Changes to support Node Port for Nuage with OSE * Fix for creating Nuage infra pod ds file * Add new variable to handle Nuage infra image version * Update Service CIDR for openshift in daemon set file * Add rolling update strategy for CNI daemon sets * Fix for atomic installation for Nuage * changing include to include_tasks as per upstream openshift-ansible
2018-01-30Merge pull request #6927 from sdodson/1538974OpenShift Merge Robot
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
2018-01-30Merge pull request #6925 from mtnbikenc/fix-1538960OpenShift Merge Robot
Automatic merge from submit-queue. [Bug 1538960] Correct ability to override openshift_management_app_template * Converted 'flavor' logic to be based on app template * Converted 'ext-db' logic to use var based on app template * Prepended role private vars with '__' for consistency Bug 1538960 https://bugzilla.redhat.com/show_bug.cgi?id=1538960
2018-01-30Automatic commit of package [openshift-ansible] release [3.9.0-0.33.0].Justin Pierce
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2018-01-30Automatic commit of package [openshift-ansible] release [3.9.0-0.32.0].Justin Pierce
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2018-01-30docker_creds: decode docker_config for py3 only if its a stringVadim Rutkovsky
2018-01-29Removing ability to change default cassandra_pvc_prefix based on metrics ↵Eric Wolinetz
volume name
2018-01-29Merge pull request #6923 from openshift/revert-6913-revert-6830-registry_addrOpenShift Merge Robot
Automatic merge from submit-queue. Revert "Revert "use non-deprecated REGISTRY_OPENSHIFT_SERVER_ADDR variable to set the registry hostname"" Reverts openshift/openshift-ansible#6913 image-registry has been fixed to properly respect this variable now. re-enabling this change.
2018-01-29Don't deploy the console if disabled or registry subtypeScott Dodson
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1538974
2018-01-29[1538960] Correct ability to overried openshift_management_app_templateRussell Teague
* Converted 'flavor' logic to be based on app template * Converted 'ext-db' logic to use var based on app template * Prepended role private vars with '__' for consistency Bug 1538960 https://bugzilla.redhat.com/show_bug.cgi?id=1538960
2018-01-29Merge pull request #6860 from jpeeler/aggregate-name-changeScott Dodson
Update catalog role patching to use new names
2018-01-29Merge pull request #6889 from mazzystr/fix-port-alignmentOpenShift Merge Robot
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
2018-01-29Merge pull request #6215 from sdodson/bz1511870OpenShift Merge Robot
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
2018-01-29Revert "Revert "use non-deprecated REGISTRY_OPENSHIFT_SERVER_ADDR variable ↵Ben Parees
to set the registry hostname""
2018-01-29Merge pull request #6909 from spadgett/detect-croOpenShift Merge Robot
Automatic merge from submit-queue. Bug 1539182: Detect if ClusterResourceOverrides enabled during console install Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1539182 /assign @sdodson /cc @jwforres @jupierce
2018-01-29fix hostvars parameter nameTzu-Mainn Chen
2018-01-29remove mountpoint parameterTzu-Mainn Chen
2018-01-29flake cleanupTzu-Mainn Chen
2018-01-29code simplification and lint cleanupTzu-Mainn Chen
2018-01-29Symlink kubectl to oc instead of openshiftMichal Fojtik
2018-01-29Merge pull request #6811 from mjudeikis/prometheus-new-templateOpenShift Merge Robot
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