summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6048 from fabianvf/1510546-asb-fix-cert-indentScott Dodson2017-11-071-2/+2
|\ | | | | Bug 1510546- Fix previous fix, task was indented one level too deep
| * Bug 1510546- Fix previous fix, task was indented one level too deepFabian von Feilitzsch2017-11-071-2/+2
|/
* Merge pull request #6044 from fabianvf/1510546-asb-fix-cert-conditionalScott Dodson2017-11-071-11/+11
|\ | | | | Fix ansible service broker etcd cert generation logic.
| * Move fact definition that breaks when check to end of blockFabian von Feilitzsch2017-11-071-11/+11
| |
* | Merge pull request #6036 from mgugino-upstream-stage/fix-prometheus-varsOpenShift Merge Robot2017-11-074-49/+48
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix prometheus default vars Currently, prometheus role tries to set some defaults depending on openshift_deployment_type. This commit simplifies that logic. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1509782
| * | Fix prometheus default varsMichael Gugino2017-11-074-49/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, prometheus role tries to set some defaults depending on openshift_deployment_type. This commit simplifies that logic. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1509782
* | | Merge pull request #6009 from dymurray/templateOpenShift Merge Robot2017-11-072-2/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Update service broker configmap and serviceaccount privileges Addresses Bugs https://bugzilla.redhat.com/show_bug.cgi?id=1503289 and https://bugzilla.redhat.com/show_bug.cgi?id=1507111
| * | | Proper quotesDylan Murray2017-11-031-2/+2
| | | |
| * | | Update service broker configmap and serviceaccount privilegesDylan Murray2017-11-032-2/+18
| | | |
* | | | Merge pull request #5998 from SaravanaStorageNetwork/fix_for_etcdMichael Gugino2017-11-075-0/+20
|\ \ \ \ | |_|_|/ |/| | | Add etcd as part of inventory file
| * | | Add etcd as part of inventory file.Saravanakumar Arumugam2017-11-035-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise, it fails as "Running etcd as an embedded service is no longer supported." Signed-off-by: Saravanakumar Arumugam <sarumuga@redhat.com>
* | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.197.0].Jenkins CD Merge Bot2017-11-072-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | Merge pull request #6031 from abutcher/temporary-servinginfo-clientcaOpenShift Merge Robot2017-11-065-6/+61
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Temporarily set master servingInfo.clientCA as client-ca-bundle.crt during rolling CA redeployment. This PR temporarily configures master `servingInfo.clientCA` as `client-ca-bundle.crt` during CA redeploy so that clients referencing the old OpenShift CA can continue to function until all cluster certificates have been replaced and `servingInfo.clientCA` is reset to `ca.crt`. `client-ca-bundle.crt` is a new bundle created by the `openshift_ca` role which contains old and new OpenShift CA certificates. https://bugzilla.redhat.com/show_bug.cgi?id=1509124 Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1493276
| * | | | Temporarily set master servingInfo.clientCA as client-ca-bundle.crt during ↵Andrew Butcher2017-11-065-6/+61
| | | | | | | | | | | | | | | | | | | | rolling CA redeployment.
* | | | | Merge pull request #5976 from fabianvf/asb-etcd-certsScott Dodson2017-11-063-13/+174
|\ \ \ \ \ | | | | | | | | | | | | Bug 1507617- Move etcd into its own service/dc with SSL
| * | | | | Bug 1507617- Move etcd into its own service/dc with SSLFabian von Feilitzsch2017-11-033-13/+174
| | | | | |
* | | | | | Merge pull request #6027 from ↵OpenShift Merge Robot2017-11-067-9/+42
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mgugino-upstream-stage/retry-restart-master-controllers Automatic merge from submit-queue. Retry restarting master controllers Currently, master controller services may fail to restart if master api services are not fully initialized. This commit enables retry of master controllers. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1509837
| * | | | | | Retry restarting master controllersMichael Gugino2017-11-067-9/+42
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, master controller services may fail to restart if master api services are not fully initialized. This commit enables retry of master controllers. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1509837
* | | | | | Merge pull request #6024 from mgugino-upstream-stage/upgrade-validator-fixOpenShift Merge Robot2017-11-061-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix preupgrade authorization objects are in sync Currently, this task is executed based on openshift_version. openshift_version is based on the upgrade target, thus not the currently install versions. This commit ensures that the task executes as intended. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1508301
| * | | | | | Fix preupgrade authorization objects are in syncMichael Gugino2017-11-061-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, this task is executed based on openshift_version. openshift_version is based on the upgrade target, thus not the currently install versions. This commit ensures that the task executes as intended. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1508301
* | | | | | Merge pull request #6030 from giuseppe/fix-selinux-docker-tooOpenShift Merge Robot2017-11-062-4/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. container-engine: ensure /var/lib/containers/ is properly labelled we were doing it only when CRI-O is installed. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1509880 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | | container-engine: ensure /var/lib/containers/ is properly labelledGiuseppe Scrivano2017-11-062-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we were doing it only when CRI-O is installed. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1509880 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | | Merge pull request #6007 from kwoodson/container_locationOpenShift Merge Robot2017-11-062-0/+48
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Moving docker location to share path with system containers.
| * | | | | | | Moving docker location to share path with system containers.Kenny Woodson2017-11-062-0/+48
| | | | | | | |
* | | | | | | | Merge pull request #6026 from fabianvf/1509680-asb-credential-checkScott Dodson2017-11-064-5/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Bug 1509680- Fix ansible-service-broker registry settings/validations
| * | | | | | | | Bug 1509680- Fix ansible-service-broker registry validationsFabian von Feilitzsch2017-11-064-5/+7
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove outdated dockerhub registry validations - Add the local openshift registry by default - Add whitelist parameter for local registry - Set default dockerhub org to ansibleplaybookbundle
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.196.0].Jenkins CD Merge Bot2017-11-062-2/+8
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | Merge pull request #5994 from djzager/bz1509052-broker-logfileScott Dodson2017-11-061-1/+0
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Bug 1509052 - Remove logfile from broker config
| * | | | | | Bug 1509052 - Remove logfile from broker configDavid Zager2017-11-021-1/+0
| | | | | | |
* | | | | | | Merge pull request #5988 from mgugino-upstream-stage/github-auth-fixScott Dodson2017-11-061-4/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix github auth validation
| * | | | | | | Fix github auth validationMichael Gugino2017-11-021-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit ensures github auth validation filter works as intended. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1444367
* | | | | | | | Merge pull request #5836 from jkroepke/issue_5835Scott Dodson2017-11-062-2/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Remove provisioner restrictions on oc_storageclass
| * | | | | | | Re-generate lib_openshiftJan-Otto Kröpke2017-10-251-1/+1
| | | | | | | |
| * | | | | | | Remove provisioner restrictions on oc_storageclassJan-Otto Kröpke2017-10-221-1/+1
| | | | | | | |
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.195.0].Jenkins CD Merge Bot2017-11-062-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | Merge pull request #6010 from fabianvf/1507787-asb-fix-ocp-defaultsScott Dodson2017-11-051-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Bug 1507787- add full path to default asb etcd image
| * | | | | | | | Bug 1507787- add full path to default asb etcd imageFabian von Feilitzsch2017-11-031-1/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.194.0].Jenkins CD Merge Bot2017-11-052-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | Merge pull request #6015 from openshift/revert-6006-elb-v2Clayton Coleman2017-11-0526-329/+276
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Revert "Bootstrap enhancements."
| * | | | | | | | Revert "Bootstrap enhancements."Clayton Coleman2017-11-0526-329/+276
| | | | | | | | |
* | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.193.0].Jenkins CD Merge Bot2017-11-052-2/+6
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | Merge pull request #5991 from tbielawa/gate_cfmeOpenShift Merge Robot2017-11-043-5/+65
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. management: users must acknowledge use of beta software Adds a new role variable, openshift_management_install_beta. This variable defaults to false. The value of this variable is checked during the validation phase. * If true, the install will not continue. * If false, The user is presented with an informative message letting them know this is beta software and there is low/no support at this time. The installation will abort and instruct the user how to continue.
| * | | | | | | | management: enterprise users must acknowledge use of beta softwareTim Bielawa2017-11-033-5/+65
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a new role variable, openshift_management_install_beta. This variable defaults to false. The value of this variable is checked during the validation phase for enterprise deployment types. * If true, the install will not continue. * If false, The user is presented with an informative message letting them know this is beta software and there is low/no support at this time. The installation will abort and instruct the user how to continue.
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.192.0].Jenkins CD Merge Bot2017-11-042-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | Merge pull request #6006 from mgugino-upstream-stage/elb-v2OpenShift Merge Robot2017-11-0326-276/+329
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Bootstrap enhancements. This includes the elb work.
| * | | | | | | | Bootstrap enhancements.Kenny Woodson2017-11-0326-276/+329
| | | | | | | | |
* | | | | | | | | Merge pull request #6005 from mgugino-upstream-stage/fix-master-version-detectOpenShift Merge Robot2017-11-032-1/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix master upgrade version detect and systemd enable Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1508755 Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1509158
| * | | | | | | | | Fix master upgrade version detect and systemd enableMichael Gugino2017-11-032-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1508755 Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1509158
* | | | | | | | | | Merge pull request #5983 from ewolinetz/37_bz1508150OpenShift Merge Robot2017-11-031-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Use the currently attached pvc for an ES dc if available Otherwise fall back to current logic of labelled PVCs or creating if necessary. This is to address https://bugzilla.redhat.com/show_bug.cgi?id=1508150 The order of the PVC priority is as follows: 1. The PVC currently claimed on the DC 1. A PVC from the list of PVCs as collected by logging_facts 1. Create a new PVC
| * | | | | | | | | Using the currently attached pvc for an ES dc if available, otherwise ↵Eric Wolinetz2017-11-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | falling back to current logic
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 09:28:44 +0000