summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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-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-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-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-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-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
2018-01-26Merge pull request #6871 from joelddiaz/oc_group_ignore_usersOpenShift Merge Robot
Automatic merge from submit-queue. ignore 'users' field in oc_group module oc_group doesn't manage the list of users assigned to a group (oc_user does). so when doing an oc_group: state: present name: groupA on a pre-existing group 'groupA' with already defined users, oc_group would detect a difference and blow away the existing users fix this by adding 'users' to the list of fields to ignore when determining whether there are object differences
2018-01-26removed references to 'files' dir in spec fileDan Yocum
2018-01-26Automatic commit of package [openshift-ansible] release [3.9.0-0.28.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2018-01-26Merge pull request #6862 from ewolinetz/deprecate_use_callbackOpenShift Merge Robot
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
2018-01-26Correct 3.7 to 3.9 upgrade openshift_image_tagMichael Gugino
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-26Merge pull request #6882 from spadgett/console-node-selectorOpenShift Merge Robot
Automatic merge from submit-queue. Run console pods on the master Update the node selector for the console so that it runs on the masters. /assign @sdodson
2018-01-26Automatic commit of package [openshift-ansible] release [3.9.0-0.26.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2018-01-26Add resource requests to console templateSamuel Padgett
2018-01-26Merge pull request #6821 from spadgett/remove-asset-configScott Dodson
Remove old assetConfig from master-config.yaml
2018-01-26Merge pull request #6880 from sosiouxme/20180115-docker-image-locationsOpenShift Merge Robot
Automatic merge from submit-queue. docker_image_availability: containerized image overrides Fix https://bugzilla.redhat.com/show_bug.cgi?id=1538806 and related issues by handling the various containerized image variables.
2018-01-26Automatic commit of package [openshift-ansible] release [3.9.0-0.25.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2018-01-25Merge pull request #6857 from mtnbikenc/fix-1537946OpenShift Merge Robot
Automatic merge from submit-queue. [1537946] Correct conditional check for GlusterFS IPs Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1537946
2018-01-25Merge pull request #6875 from bparees/syncOpenShift Merge Robot
Automatic merge from submit-queue. sync imagestreams+templates from origin master for v3.9 fixes https://github.com/openshift/openshift-ansible/issues/6872
2018-01-25Fix misaligned ports for sg,elb,apiChris Callegari
2018-01-25Removing dependency on the extra stroage device.Kenny Woodson
2018-01-25docker_image_availability: containerized overridesLuke Meyer
Respect container image name override variables.
2018-01-25Merge pull request #6859 from abutcher/bz1536217OpenShift Merge Robot
Automatic merge from submit-queue. Bug 1536217: Need to validate etcd serving certs before 3.9 upgrade
2018-01-25Merge pull request #6878 from mtnbikenc/fix-1502838OpenShift Merge Robot
Automatic merge from submit-queue. [1502838] Correct certificate alt name parsing Certificates may have alternate names specified, which may contain different name types. Only 'DNS' alternate types should be parsed. X509v3 Subject Alternative Name: email:hostmaster@example.com, DNS:host.example.com Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1502838
2018-01-25Add GPG keys in the base image and don't install dockerClayton Coleman
2018-01-25Updating deprecations to use callback pluginEric Wolinetz
2018-01-25Remove old assetConfig from master-config.yamlSamuel Padgett
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
2018-01-25Don't emit assetConfig on 3.9Scott Dodson
2018-01-25[1502838] Correct certificate alt name parsingRussell Teague
Certificates may have alternate names specified, which may contain different name types. Only 'DNS' alternate types should be parsed. X509v3 Subject Alternative Name: email:hostmaster@example.com, DNS:host.example.com Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1502838
2018-01-25Run console pods on the masterSamuel Padgett
Update the node selector for the console so that it runs on the masters.
2018-01-25sync imagestreams+templates from origin master for v3.9Ben Parees
2018-01-25ignore 'users' field in oc_group moduleJoel Diaz
oc_group doesn't manage the list of users assigned to a group (oc_user does). so when doing an oc_group: state: present name: groupA on a pre-existing group 'groupA' with already defined users, oc_group would detect a difference an blow away the existing users fix this by adding 'users' to the list of fields to ignore when determining whether there are object differences