summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6786 from simaishi/cf_46_betaOpenShift Merge Robot2018-01-2424-931/+4727
|\ | | | | | | | | | | | | Automatic merge from submit-queue. CF 4.6 Beta templates for OpenShift v3.7 and v3.9 cc @sdodson @Loicavenel
| * Update CF 4.6 Beta templates in openshift_management directorySatoe Imaishi2018-01-244-29/+415
| |
| * Add templates to v3.9Satoe Imaishi2018-01-1910-451/+2156
| |
| * Use Beta repo pathSatoe Imaishi2018-01-184-13/+13
| |
| * CF 4.6 templatesSatoe Imaishi2018-01-1810-451/+2156
| |
* | Merge pull request #6839 from mtnbikenc/fix-1506866OpenShift Merge Robot2018-01-241-1/+2
|\ \ | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. [1506866] Update haproxy.cfg.j2 Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1506866
| * | [1506866] Update haproxy.cfg.j2Russell Teague2018-01-231-1/+2
| | |
* | | Merge pull request #6767 from mazzystr/fix-master-internal-elbKenny Woodson2018-01-242-2/+2
|\ \ \ | | | | | | | | Fix to master-internal elb scheme
| * | | Fix to master-internal elb schemeChris Callegari2018-01-172-2/+2
| | | |
* | | | Merge pull request #6815 from vrutkovs/failed_when-rc-to-intOpenShift Merge Robot2018-01-242-15/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. failed_when lists are implicitely ANDs, not ORs For some reason I believed `failed_when` lists are considered to be ORs, but it turns out these are ANDs. Fixes bug 1534538 Relates to #6751
| * | | | failed_when lists are implicitely ANDs, not ORsVadim Rutkovsky2018-01-222-15/+5
| | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/ansible/ansible/issues/18311#issuecomment-258048690
* | | | | Merge pull request #6718 from sdodson/bz1533658Scott Dodson2018-01-241-1/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove unused symlink
| * | | | | Remove unused symlinkScott Dodson2018-01-131-1/+0
| | | | | |
* | | | | | Merge pull request #6836 from spadgett/rollout-only-if-changedOpenShift Merge Robot2018-01-241-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Only rollout console if config changed /assign @sdodson @jwforres FYI
| * | | | | | Only rollout console if config changedSamuel Padgett2018-01-231-1/+2
| | | | | | |
* | | | | | | Merge pull request #6541 from smarterclayton/move_gcp_inScott Dodson2018-01-2426-19/+525
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Allow openshift-ansible image to deploy to GCP
| * | | | | | | Move origin-gce roles and playbooks into openshift-ansibleClayton Coleman2018-01-2326-19/+525
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves all core functionality into the openshift-ansible repo, adds the necessary equivalent entrypoint to the openshift-ansible installer image, and ensures the dynamic inventory mechanisms in openshift-ansible continue to work. Notable changes from origin-gce: * playbook extensions changed to .yml * dynamic inventory subdirectory created to prevent accidental use * use the custom entrypoint entrypoint-gcp for this image * move tasks into openshift_gcp role
* | | | | | | Merge pull request #6835 from mtnbikenc/fix-1537105OpenShift Merge Robot2018-01-231-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. [1537105] Add openshift_facts to flannel role Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1537105
| * | | | | | | [1537105] Add openshift_facts to flannel roleRussell Teague2018-01-231-0/+1
| |/ / / / / /
* | | | | | | Merge pull request #6837 from spadgett/croOpenShift Merge Robot2018-01-231-0/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Add clusterResourceOverridesEnabled to console config Adds clusterResourceOverridesEnabled flag to console install. See https://github.com/openshift/api/pull/32 See https://github.com/openshift/origin/pull/18231 /assign @sdodson /cc @jwforres
| * | | | | | Add clusterResourceOverridesEnabled to console configSamuel Padgett2018-01-231-0/+2
| |/ / / / /
* | | | | | Merge pull request #6827 from vrutkovs/node-uppercase-certificatesOpenShift Merge Robot2018-01-233-12/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Lowercase node names when creating certificates Additional fix for https://github.com/openshift/openshift-ansible/pull/6812
| * | | | | | Lowercase node names when creating certificatesVadim Rutkovsky2018-01-233-12/+12
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #6682 from giuseppe/fix-registriesMichael Gugino2018-01-232-27/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | CRI-O, Docker: Use images from the CentOS and Fedora registry
| * | | | | | docker_creds: fix python3 exceptionGiuseppe Scrivano2018-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: Object of type 'bytes' is not JSON serializable Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | | docker_creds: fix python3 exceptionGiuseppe Scrivano2018-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Solves this exception with python3: TypeError: a bytes-like object is required, not 'str Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | | docker: use image from CentOS and Fedora registriesGiuseppe Scrivano2018-01-101-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | | crio: use Docker and CentOS registries for the imageGiuseppe Scrivano2018-01-101-19/+8
| | | | | | |
* | | | | | | Merge pull request #6808 from spadgett/check-console-config-existsOpenShift Merge Robot2018-01-231-36/+41
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Bug 1534020 - Only set logging and metrics URLs if console config map exists Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1534020 Related to #6676, but for the tasks that update logging and metrics URLs. /king bug /assign @sdodson
| * | | | | | | Bug 1534020 - Only set logging and metrics URLs if console config map existsSamuel Padgett2018-01-211-36/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1534020
* | | | | | | | Merge pull request #6783 from mgugino-upstream-stage/node-syscon-add-mountsScott Dodson2018-01-233-0/+45
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Add ability to mount volumes into system container nodes
| * | | | | | | Add ability to mount volumes into system container nodesMichael Gugino2018-01-183-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds the ability to mount volumes into system containerized nodes. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1534933
* | | | | | | | Merge pull request #6676 from spadgett/upgrade-consoleOpenShift Merge Robot2018-01-221-25/+81
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Bug 1536924: Migrate previous asset config from master-config.yaml Copy configuration from master-config.yaml to the openshift-web-console asset config config map. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1536924 TODO: - [x] Don't overwrite config map if it exists Follow on: - [ ] Remove assetConfig from master-config.yaml on upgrades to 3.9 - [ ] Warn about existing extensions that aren't migrated on upgrades /assign @sdodson /hold cc @jwforres
| * | | | | | | | Migrate master-config.yaml asset configSamuel Padgett2018-01-211-25/+81
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Don't overwrite existing webconsole-config config map * Copy configuration from master-config.yaml on upgrade
* | | | | | | | Merge pull request #6716 from sosiouxme/20180112-skopeo-proxiesOpenShift Merge Robot2018-01-221-6/+26
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. docker_image_availability: enable skopeo to use proxies Fixes https://github.com/openshift/openshift-ansible/issues/6300 and https://bugzilla.redhat.com/show_bug.cgi?id=1499358 Run skopeo via shell and add in environment variables for proxies if specified in variables.
| * | | | | | | | docker_image_availability: enable skopeo to use proxiesLuke Meyer2018-01-221-6/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run skopeo via shell and add in environment variables for proxies if specified in variables.
* | | | | | | | | Merge pull request #6800 from bparees/adminOpenShift Merge Robot2018-01-222-6/+18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. use admin credentials for tsb install operations
| * | | | | | | | | use admin credentials for tsb install operationsBen Parees2018-01-192-6/+18
| | | | | | | | | |
* | | | | | | | | | Merge pull request #6533 from joelddiaz/prereqs_uninstallOpenShift Merge Robot2018-01-224-0/+63
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. allow uninstalling AWS objects created by prerequisite playbook add deprovisioners/uninstallers for objects created via playbooks/aws/openshift-cluster/prerequisites.yml specifically: security groups, vpcs, and any ssh keys introduce openshift_aws_enable_uninstall_shared_objects to protect AWS objects that would be shared in the case of multiple clusters co-existing in one AWS account. right now it protects the ssh keys, but it can/should be used to protect against deleting the shared IAM instance profile as well. default this variable to False to be on the safe side when uninstalling/deprovisioning.
| * | | | | | | | | allow uninstalling AWS objects created by prerequisite playbookJoel Diaz2018-01-224-0/+63
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add deprovisioners/uninstallers for objects created via playbooks/aws/openshift-cluster/prerequisites.yml specifically: security groups, vpcs, and any ssh keys introduce openshift_aws_enable_uninstall_shared_objects to protect AWS objects that would be shared in the case of multiple clusters co-existing in one AWS account. right now it protects the ssh keys, but it can/should be used to protect against deleting the shared IAM instance profile as well. default this variable to False to be on the safe side when uninstalling/deprovisioning. add some documentation on using deprovisioning playbooks
* | | | | | | | | Merge pull request #6797 from sdodson/bz1523638OpenShift Merge Robot2018-01-224-4/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Adjust registry-console's prefix to be fully qualified 3 commits for easy cherry-picking into release-3.7 and release-3.6 Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1523638
| * | | | | | | | | Fix enterprise registry-console prefixScott Dodson2018-01-192-2/+2
| | | | | | | | | |
| * | | | | | | | | [release-3.7] Fix enterprise registry console image prefixScott Dodson2018-01-191-1/+1
| | | | | | | | | |
| * | | | | | | | | [release-3.6] Fix enterprise registry console image prefixScott Dodson2018-01-191-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #6798 from nhosoi/bz1512825OpenShift Merge Robot2018-01-222-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Bug 1512825 - add mux pod failed for Serial number 02 has already been issued According to mkhan@redhat.com, to run the "oc adm ca create-server-cert" command line with --signer-serial option, the following changes need to be made. 1. adding --overwrite=false 2. <ca.serial.txt> should contain only [0-9A-F]*. (no trailing newlines are allowed for now) This patch solves 1.
| * | | | | | | | | | Bug 1512825 - add mux pod failed for Serial number 02 has already been issuedNoriko Hosoi2018-01-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to mkhan@redhat.com, to run the "oc adm ca create-server-cert" command line with --signer-serial option, the following changes need to be made. 1. adding --overwrite=false 2. <ca.serial.txt> should contain only [0-9A-F]*. (no trailing newlines are allowed for now) This patch solves 1.
* | | | | | | | | | | Merge pull request #6525 from luis5tb/fix-provider-networkMichael Gugino2018-01-222-9/+17
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | Fix provider network support at openstack playbook
| * | | | | | | | | | Fix provider network support at openstack playbookLuis Tomas Bolivar2018-01-082-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It ensures no floating ips are attached if a provider network is used
* | | | | | | | | | | Bug 1536262: Default console and TSB node selector to ↵Samuel Padgett2018-01-212-3/+2
| |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | openshift_hosted_infra_selector Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1536262
* | | | | | | | | | Merge pull request #6754 from spadgett/remove-old-console-configOpenShift Merge Robot2018-01-205-35/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Remove obsolete properties from console config map Stop writing deprecated config to the console config map. /hold This can't be merged until https://github.com/openshift/origin-web-console-server/pull/20 merges. Follow on to https://github.com/openshift/openshift-ansible/pull/6730