summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6811 from mjudeikis/prometheus-new-templateOpenShift Merge Robot2018-01-299-142/+283
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-289-142/+283
| |
* | Merge pull request #6913 from openshift/revert-6830-registry_addrOpenShift Merge Robot2018-01-271-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ```
| * | Revert "use non-deprecated REGISTRY_OPENSHIFT_SERVER_ADDR variable to set ↵Ben Parees2018-01-271-1/+1
|/ / | | | | | | the registry hostname"
* | 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 #6905 from mgugino-upstream-stage/fix-crt-typoOpenShift Merge Robot2018-01-271-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Fix container_runtime variable typoMichael Gugino2018-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 'Centos' should be 'CentOS' as it corresponds to the ansible variable that determines the linux distro.
* | | | Merge pull request #6896 from mgugino-upstream-stage/fix-upgrade-image-tagOpenShift Merge Robot2018-01-263-5/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-263-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.31.0].Jenkins CD Merge Bot2018-01-272-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | Merge pull request #6840 from yocum137/rm_origin-componentsOpenShift Merge Robot2018-01-2613-11/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * \ \ \ \ Merge branch 'master' of github.com:openshift/openshift-ansible into ↵Dan Yocum2018-01-2674-398/+1389
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | rm_origin-components
| * | | | | | removed references to 'files' dir in spec fileDan Yocum2018-01-261-4/+0
| | | | | | |
| * | | | | | files in ansible roles do not need to have the path specified to themDan Yocum2018-01-245-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | when referenced by a builtin module, i.e., copy:
| * | | | | | Merge branch 'master' into rm_origin-componentsDan Yocum2018-01-24111-1158/+6509
| |\ \ \ \ \ \
| * | | | | | | moving files to their correct <role>/files dir for the openshift_web_console ↵Dan Yocum2018-01-239-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and template_service_broker roles
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.30.0].Jenkins CD Merge Bot2018-01-262-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | Merge pull request #6888 from kwoodson/fix_overlay_nodriveOpenShift Merge Robot2018-01-262-1/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | Removing dependency on the extra stroage device.Kenny Woodson2018-01-252-1/+5
| | | | | | | | |
* | | | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.29.0].Jenkins CD Merge Bot2018-01-262-2/+7
| |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | Merge pull request #6893 from spadgett/console-requestsScott Dodson2018-01-261-0/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add resource requests and prometheus annotations to console template
| * | | | | | | | Add prometheus annotations to console serviceSamuel Padgett2018-01-261-0/+2
| | | | | | | | |
| * | | | | | | | Add resource requests to console templateSamuel Padgett2018-01-261-0/+4
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #6871 from joelddiaz/oc_group_ignore_usersOpenShift Merge Robot2018-01-262-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | ignore 'users' field in oc_group moduleJoel Diaz2018-01-252-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.28.0].Jenkins CD Merge Bot2018-01-262-2/+6
| |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | Merge pull request #6862 from ewolinetz/deprecate_use_callbackOpenShift Merge Robot2018-01-263-12/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-254-12/+11
| | | | | | | | |
* | | | | | | | | Merge pull request #6882 from spadgett/console-node-selectorOpenShift Merge Robot2018-01-261-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | Run console pods on the masterSamuel Padgett2018-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the node selector for the console so that it runs on the masters.
* | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.26.0].Jenkins CD Merge Bot2018-01-262-2/+7
| |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | | Merge pull request #6821 from spadgett/remove-asset-configScott Dodson2018-01-268-43/+81
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove old assetConfig from master-config.yaml
| * | | | | | | | | Remove old assetConfig from master-config.yamlSamuel Padgett2018-01-257-43/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | Don't emit assetConfig on 3.9Scott Dodson2018-01-251-0/+3
| |/ / / / / / / /
* | | | | | | | | Merge pull request #6880 from sosiouxme/20180115-docker-image-locationsOpenShift Merge Robot2018-01-262-13/+47
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | docker_image_availability: containerized overridesLuke Meyer2018-01-252-13/+47
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Respect container image name override variables.
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.25.0].Jenkins CD Merge Bot2018-01-262-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | Merge pull request #6857 from mtnbikenc/fix-1537946OpenShift Merge Robot2018-01-251-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. [1537946] Correct conditional check for GlusterFS IPs Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1537946
| * | | | | | | | [1537946] Correct conditional check for GlusterFS IPsRussell Teague2018-01-241-1/+2
| | | | | | | | |
* | | | | | | | | Merge pull request #6875 from bparees/syncOpenShift Merge Robot2018-01-2521-127/+746
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. sync imagestreams+templates from origin master for v3.9 fixes https://github.com/openshift/openshift-ansible/issues/6872
| * | | | | | | | | sync imagestreams+templates from origin master for v3.9Ben Parees2018-01-2521-127/+746
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #6859 from abutcher/bz1536217OpenShift Merge Robot2018-01-253-0/+99
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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-243-0/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | etcd serving cert SAN.
* | | | | | | | | Merge pull request #6878 from mtnbikenc/fix-1502838OpenShift Merge Robot2018-01-251-3/+4
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | [1502838] Correct certificate alt name parsingRussell Teague2018-01-251-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Merge pull request #6865 from giuseppe/node-specify-bind-optionScott Dodson2018-01-251-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | node: specify bind option to /root/.docker
| * | | | | | | | node: specify bind option to /root/.dockerGiuseppe Scrivano2018-01-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without the option, runc fails with "no such device" when trying to create the mount point. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1534933 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | | | | 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