summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-30Revert "GlusterFS: Remove image option from heketi command"Michael Hanselmann
This reverts commit 3d3853836d71c37a9c81aea8e606c94052439789 which was supposedly a fix for an issue with topology initialization, but that turned out to be a separate issue fixed in commit b8879b5c6731bd51e590b470b1a51fce73db0ee1. By default "heketi-cli setup-openshift-heketi-storage" uses the "heketi/heketi:dev" image while, for OpenShift Container Platform installations, the default image for all other operations is "rhgs3/rhgs-volmanager-rhel7". In environments where only a limited set of Docker registries is available, i.e. only the Red Hat registry but not Docker Hub, using "heketi/heketi:dev" does not work or would require manual intervention. The discussion surrounding the removal of "--image" in PR#5769 involved statements that "--image" was removed from Heketi. As of January 30, 2018 the master branch contains the option, as does the upstream Docker image (Heketi version v5.0.0-225-gffb9fea) and the aforementioned "rhgs3/rhgs-volmanager-rhel7" image. Tested with OpenShift Container Platform 3.7.23.
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-30cri-o: export variables defined in crio-networkGiuseppe Scrivano
so that the cri-o process can use them. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1529478 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
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
2018-01-29Rework provisioners vars to support different prefix/version for Origin/OSEVadim Rutkovsky
2018-01-28Rebase Prometheus example for new scrape endpoints and expose alert managerMangirdas
2018-01-27Merge pull request #6913 from openshift/revert-6830-registry_addrOpenShift Merge Robot
Automatic merge from submit-queue. Revert "use non-deprecated REGISTRY_OPENSHIFT_SERVER_ADDR variable to set the registry hostname" Reverts openshift/openshift-ansible#6830 @dmage @legionus the registry does not appear to actually respect this value properly: ``` $ oc logs docker-registry-1-knwnf -n default | grep URL time="2018-01-28T03:00:12.310853118Z" level=info msg="Using \"172.30.183.222:5000\" as Docker Registry URL" go.version=go1.9.2 instance.id=a82b7ca8-0b55-4567-92ef-2c1744e6074a $ oc get pod docker-registry-1-knwnf -o yaml | grep -A 2 ADDR -- - name: REGISTRY_OPENSHIFT_SERVER_ADDR value: docker-registry.default.svc:5000 ```
2018-01-27Revert "use non-deprecated REGISTRY_OPENSHIFT_SERVER_ADDR variable to set ↵Ben Parees
the registry hostname"
2018-01-27Merge pull request #6886 from ↵OpenShift Merge Robot
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.
2018-01-27Bug 1539182: Detect if ClusterResourceOverrides enabled during console installSamuel Padgett
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1539182
2018-01-27Merge pull request #6905 from mgugino-upstream-stage/fix-crt-typoOpenShift Merge Robot
Automatic merge from submit-queue. Fix container_runtime variable typo 'Centos' should be 'CentOS' as it corresponds to the ansible variable that determines the linux distro.
2018-01-26Merge pull request #6896 from mgugino-upstream-stage/fix-upgrade-image-tagOpenShift Merge Robot
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
2018-01-27Automatic commit of package [openshift-ansible] release [3.9.0-0.31.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2018-01-27add cinder mountpoint to inventoryTzu-Mainn Chen
2018-01-26Merge pull request #6840 from yocum137/rm_origin-componentsOpenShift Merge Robot
Automatic merge from submit-queue. moving files to their correct <role>/files location The openshift_web_console and template_service_broker roles are putting 'files' outside the openshift-ansible roles they belong to.
2018-01-26Automatic commit of package [openshift-ansible] release [3.9.0-0.30.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2018-01-26Merge pull request #6888 from kwoodson/fix_overlay_nodriveOpenShift Merge Robot
Automatic merge from submit-queue. Removing dependency on the extra storage device. This pull request addresses the need to have configure docker storage to overlay without an extra drive.
2018-01-26Automatic commit of package [openshift-ansible] release [3.9.0-0.29.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2018-01-26bug 1537857. Fix retrieving prometheus metricsJeff Cantrill
2018-01-26allow setting of kibana env varsJeff Cantrill
2018-01-26Fix container_runtime variable typoMichael Gugino
'Centos' should be 'CentOS' as it corresponds to the ansible variable that determines the linux distro.
2018-01-26Merge branch 'master' of github.com:openshift/openshift-ansible into ↵Dan Yocum
rm_origin-components
2018-01-26Merge pull request #6893 from spadgett/console-requestsScott Dodson
Add resource requests and prometheus annotations to console template
2018-01-26Add prometheus annotations to console serviceSamuel Padgett