summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | |
* | | | | | | | Merge pull request #6215 from sdodson/bz1511870OpenShift Merge Robot2018-01-292-0/+5
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Make IP object a stringFabian von Feilitzsch2018-01-241-1/+2
| | | | | | | |
| * | | | | | | Add kube service ipaddress to no_proxy listScott Dodson2018-01-242-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Computed as the first ip address in the portal_net
* | | | | | | | Merge pull request #6909 from spadgett/detect-croOpenShift Merge Robot2018-01-291-1/+6
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Bug 1539182: Detect if ClusterResourceOverrides enabled during console installSamuel Padgett2018-01-271-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1539182
* | | | | | | | 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
| | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 00:57:54 +0000