summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* dynamic inventory bug when group exists but its emptyMangirdas2018-02-022-2/+2
|
* Merge pull request #6947 from abutcher/openshift_aws_elb_cert_arnOpenShift Merge Robot2018-01-311-1/+3
|\ | | | | | | | | | | | | 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.
| * Re-add openshift_aws_elb_cert_arn.Andrew Butcher2018-01-301-1/+3
| |
* | Merge pull request #6952 from sdodson/bz1540462OpenShift Merge Robot2018-01-317-20/+14
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | Only perform console configmap ops when >= 3.9Scott Dodson2018-01-314-4/+12
| | |
| * | 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-312-1/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-152-1/+9
| | | |
* | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.35.0].Justin Pierce2018-01-312-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | Merge pull request #6906 from jcantrill/kibana_env_varsOpenShift Merge Robot2018-01-314-0/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | allow setting of kibana env varsJeff Cantrill2018-01-264-0/+9
| | | | |
* | | | | Merge pull request #6922 from mjudeikis/glusterfs-block-storageOpenShift Merge Robot2018-01-3112-53/+199
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | add glusterblock support for ansibleMangirdas2018-01-3112-53/+199
| | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: Christina Kyriakidou <Ckyriaki@Redhat.com>
* | | | | | Merge pull request #6831 from jmencak/heatstack-infra-1936OpenShift Merge Robot2018-01-311-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
| * | | | | | Fix: e2e tests failing due to :1936/metrics unaccessible.Jiri Mencak2018-01-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR allows access to tcp/1936 ingress infra-secgrp policy, so that e2e test do not fail looking for router metrics port :1936/metrics
* | | | | | | Merge pull request #6895 from ewolinetz/logging_preserve_volume_typeOpenShift Merge Robot2018-01-311-7/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | No longer compare with legacy hosted varEric Wolinetz2018-01-261-2/+2
| | | | | | | |
| * | | | | | | Preserving ES dc storage type unless overridden by inventory variableEric Wolinetz2018-01-261-7/+16
| | | | | | | |
* | | | | | | | Merge pull request #6908 from tzumainn/fix-cinder-mountOpenShift Merge Robot2018-01-314-11/+48
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | fix hostvars parameter nameTzu-Mainn Chen2018-01-292-4/+4
| | | | | | | | |
| * | | | | | | | remove mountpoint parameterTzu-Mainn Chen2018-01-291-1/+0
| | | | | | | | |
| * | | | | | | | 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-274-1/+25
| |/ / / / / / /
* | | | | | | | Merge pull request #6868 from vrutkovs/prefix-provisioner-podOpenShift Merge Robot2018-01-312-2/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Rework provisioners vars to support different prefix/version for Origin/OSEVadim Rutkovsky2018-01-292-2/+13
| | | | | | | | |
* | | | | | | | | Merge pull request #5651 from vareti/NuageEtcdCertsFixOpenShift Merge Robot2018-01-306-9/+95
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | copy etcd client certificates for nuage openshift monitorsareti2018-01-306-9/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | | | | | | | Merge pull request #6919 from mfojtik/symlink-kubectl-to-ocOpenShift Merge Robot2018-01-301-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | Symlink kubectl to oc instead of openshiftMichal Fojtik2018-01-291-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #6129 from sdodson/contribOpenShift Merge Robot2018-01-303-1/+58
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Add a bare minimum localhost hosts file and docs Hopefully this makes things easier for folks new to ansible
| * | | | | | | | | | | Add a bare minimum localhost hosts fileScott Dodson2018-01-303-1/+58
| | | | | | | | | | | |
* | | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.34.0].Justin Pierce2018-01-302-2/+11
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | | | | Merge pull request #6934 from vrutkovs/docker_creds-write-decodeOpenShift Merge Robot2018-01-301-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | docker_creds: decode docker_config for py3 only if its a stringVadim Rutkovsky2018-01-301-1/+3
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #6928 from ewolinetz/metrics_fix_pvcOpenShift Merge Robot2018-01-301-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | Removing ability to change default cassandra_pvc_prefix based on metrics ↵Eric Wolinetz2018-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | volume name
* | | | | | | | | | 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 #6925 from mtnbikenc/fix-1538960OpenShift Merge Robot2018-01-308-48/+54
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | [1538960] Correct ability to overried openshift_management_app_templateRussell Teague2018-01-298-48/+54
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.33.0].Justin Pierce2018-01-302-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.32.0].Justin Pierce2018-01-302-2/+19
| |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | | | Merge pull request #6923 from openshift/revert-6913-revert-6830-registry_addrOpenShift Merge Robot2018-01-291-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | Revert "Revert "use non-deprecated REGISTRY_OPENSHIFT_SERVER_ADDR variable ↵Ben Parees2018-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to set the registry hostname""
* | | | | | | | | | | Merge pull request #6860 from jpeeler/aggregate-name-changeScott Dodson2018-01-294-106/+97
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update catalog role patching to use new names
| * | | | | | | | | | | Change catalog roles install to use aggregationJeff Peeler2018-01-244-106/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recently it was changed for openshift cluster roles to be reconciled via the aggregate-to* label, so this is now updated. Rather than generating portions of the file, simply use the auth reconciler and let it handle any necessary role updates. Also, since it is theoretically possible for conflicts to occur, retry reconciliation several times.
* | | | | | | | | | | | Merge pull request #6889 from mazzystr/fix-port-alignmentOpenShift Merge Robot2018-01-295-63/+82
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-255-63/+82
| | | | | | | | | | | |