| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #4333 from jarrpa/oc_secret-type | OpenShift Bot | 2017-06-01 | 8 | -5/+46 |
| |\ | | | | | Merged by openshift-bot | ||||
| | * | oc_secret: allow for specifying secret type | Jose A. Rivera | 2017-05-31 | 8 | -5/+46 |
| | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com> | ||||
| * | | Merge pull request #4015 from rparulek/copy-nuage-vsd-certs | OpenShift Bot | 2017-06-01 | 6 | -10/+32 |
| |\ \ | | | | | | | Merged by openshift-bot | ||||
| | * | | Copy Nuage VSD generated user certificates to Openshift master nodes | Sneha Deshpande | 2017-05-22 | 6 | -10/+32 |
| | | | | |||||
| * | | | Merge pull request #4341 from richm/curator-ops-host-vols | Scott Dodson | 2017-06-01 | 2 | -5/+4 |
| |\ \ \ | | | | | | | | | fix curator host, port params; remove curator es volumes | ||||
| | * | | | fix curator host, port params; remove curator es volumes | Rich Megginson | 2017-05-31 | 2 | -5/+4 |
| | | | | | |||||
| * | | | | Merge pull request #4311 from abutcher/skip-router-registry-cert-redeploy | OpenShift Bot | 2017-06-01 | 1 | -0/+2 |
| |\ \ \ \ | |/ / / |/| | | | Merged by openshift-bot | ||||
| | * | | | Skip router/registry cert redeploy when ↵ | Andrew Butcher | 2017-05-30 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | openshift_hosted_manage_{router,registry}=false | ||||
| * | | | | Merge pull request #4332 from stevekuznetsov/skuznets/escalation-fixes | Scott Dodson | 2017-05-31 | 2 | -2/+0 |
| |\ \ \ \ | | | | | | | | | | | Revert "Merge pull request #4271 from DG-i/master" | ||||
| | * | | | | Revert "Merge pull request #4271 from DG-i/master" | Steve Kuznetsov | 2017-05-31 | 2 | -2/+0 |
| | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6b9e05d16a935d632b83eda601538bff2353e4fb, reversing changes made to 240b923c95e04e9467c607c502c857dd86d14179. Signed-off-by: Steve Kuznetsov <skuznets@redhat.com> | ||||
| * | | | | Automatic commit of package [openshift-ansible] release [3.6.89.0-1]. | Scott Dodson | 2017-05-31 | 2 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --keep-version | ||||
| * | | | | Merge pull request #4325 from sdodson/amp20 | Scott Dodson | 2017-05-31 | 12 | -160/+1639 |
| |\ \ \ \ | |/ / / |/| | | | AMP 2.0 | ||||
| | * | | | AMP 2.0 | Scott Dodson | 2017-05-31 | 12 | -160/+1639 |
| |/ / / | |||||
| * | | | Merge pull request #3941 from pgier/JMAN4-161 | Scott Dodson | 2017-05-31 | 4 | -0/+624 |
| |\ \ \ | | | | | | | | | [JMAN4-161] Add template for cloudforms jboss middleware manager | ||||
| | * | | | [JMAN4-161] Add templates and pv example for cloudforms jboss middleware manager | Paul Gier | 2017-04-26 | 4 | -0/+624 |
| | | | | | |||||
| * | | | | Merge pull request #4091 from richm/oc_service-labels-externalIPs | Scott Dodson | 2017-05-31 | 40 | -248/+931 |
| |\ \ \ \ | | | | | | | | | | | add support for oc_service for labels, externalIPs | ||||
| | * | | | | add support for oc_service for labels, externalIPs | Rich Megginson | 2017-05-30 | 40 | -248/+931 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for `labels` and `externalIPs` in Services This also adds support for the `labels` parameter of `oadm registry` and `oadm router` to be a `dict` of values. This also converts `labels` dict values in the router and registry classes into a comma delimited list of `key=value` pairs. The list of `--labels` is sorted for consistency in key pair positioning in the output (and for consistency in testing) - otherwise, the order of the list is not guarantee and has actually been observed to be different from run to run. | ||||
| * | | | | | Automatic commit of package [openshift-ansible] release [3.6.89-1]. | Scott Dodson | 2017-05-31 | 2 | -2/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --keep-version | ||||
| * | | | | | Merge pull request #4225 from ingvagabund/relax-rpm-image-version-check | Jan Chaloupka | 2017-05-31 | 1 | -2/+7 |
| |\ \ \ \ \ | | | | | | | | | | | | | relax check for rpm version and docker image version equality | ||||
| | * | | | | | check for rpm version and docker image version equality only if ↵ | Jan Chaloupka | 2017-05-18 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | openshift_pkg_version and openshift_image_tag are not defined | ||||
| * | | | | | | Merge pull request #4272 from ashcrow/system-package-no-hardcode | OpenShift Bot | 2017-05-30 | 3 | -8/+14 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| | * | | | | | | Remove typos that got reintroduced | Steve Milner | 2017-05-25 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | oc_atomic_container: Workaround for invalid json from atomic command | Steve Milner | 2017-05-25 | 2 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When no other containers are present and one attempts to list containers via the atomic command with the --json flag an empty string is returned. If a json.loads is used on this value an error is raised. This change adds a workaround to fall back to '[]' when an empty string is returned from the atomic containers command. | ||||
| | * | | | | | | Remove system-package=no from container-engine install | Steve Milner | 2017-05-25 | 1 | -2/+0 |
| | | | | | | | | |||||
| | * | | | | | | oc_atomic_container: Hard code system-package=no | Steve Milner | 2017-05-25 | 2 | -2/+6 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #4299 from sdodson/bool | OpenShift Bot | 2017-05-30 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| | * | | | | | | | bool | Scott Dodson | 2017-05-26 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #4298 from mwringe/metrics_imagepullpolicy_always | OpenShift Bot | 2017-05-30 | 3 | -0/+3 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| | * | | | | | | | | Metrics: update the imagePullPolicy to be always | mwringe | 2017-05-26 | 3 | -0/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #4314 from ewolinetz/logging_pvc_check | Scott Dodson | 2017-05-30 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Adding default value for openshift_hosted_logging_storage_kind | ||||
| | * | | | | | | | | | Adding default value for openshift_hosted_logging_storage_kind | ewolinetz | 2017-05-30 | 1 | -4/+4 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge pull request #4280 from ewolinetz/logging_pvc_fix | OpenShift Bot | 2017-05-30 | 1 | -4/+7 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| | * | | | | | | | | | Updating to generate PVC when storage type is passed in as nfs | ewolinetz | 2017-05-25 | 1 | -4/+7 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #4271 from DG-i/master | OpenShift Bot | 2017-05-30 | 2 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | Merged by openshift-bot | ||||
| | * | | | | | | | | | disable become for local actions | Mathias Merscher | 2017-05-24 | 2 | -0/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #4301 from sosiouxme/20170526-add-mem-check-fudge-factor | Scott Dodson | 2017-05-30 | 2 | -20/+36 |
| |\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | memory check: use GiB/MiB and adjust memtotal | ||||
| | * | | | | | | | | | memory check: use GiB/MiB and adjust memtotal | Luke Meyer | 2017-05-29 | 2 | -20/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes https://bugzilla.redhat.com/show_bug.cgi?id=1455884 Various things reserve memory such that memtotal is quite lower than the actual physical RAM of the system. It's larger as RAM increases but it's not really proportional so I just added a flat 1GiB adjustment in the comparison. This ought to "pass when it's close enough." | ||||
| * | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.86-1]. | Jenkins CD Merge Bot | 2017-05-30 | 2 | -2/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.86 | ||||
| * | | | | | | | | | | Merge pull request #4231 from ewolinetz/bz1452214 | Scott Dodson | 2017-05-30 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | Updating registry-console version to be v3.6 instead of 3.6 | ||||
| | * | | | | | | | | | Updating registry-console version to be v3.6 instead of 3.6 | ewolinetz | 2017-05-18 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #4234 from vshn/feature/oreg_url_masternode | OpenShift Bot | 2017-05-26 | 9 | -22/+31 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| | * | | | | | | | | | | allow to configure oreg_url specifically for node or master. refs #4233 | Tobias Brunner | 2017-05-19 | 9 | -22/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit allows to specify imageConfig.format specifically for master or for nodes. One use case of this could be if you want to use customer builder images. In this case imageConfig.format only needs to be changed in the master-config.yml but not in the node-config.yml. | ||||
| * | | | | | | | | | | | Merge pull request #4288 from wozniakjan/logging_es_fix | Scott Dodson | 2017-05-26 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | openshift_logging: increasing *_elasticsearch_* default CPU and memory | ||||
| | * | | | | | | | | | | | openshift_logging: increasing *_elasticsearch_* default CPU and memory | Jan Wozniak | 2017-05-25 | 1 | -4/+4 |
| | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #4300 from sdodson/fedora-ci | Scott Dodson | 2017-05-26 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | Lower memory requirements in fedora-ci jobs | ||||
| | * | | | | | | | | | | Reduce memory requirement to 2gb for fedora ci jobs | Scott Dodson | 2017-05-26 | 1 | -0/+1 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge pull request #4277 from ewolinetz/bz1455310 | Scott Dodson | 2017-05-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | Updating python-passlib assert | ||||
| | * | | | | | | | | | Updating python-passlib assert | ewolinetz | 2017-05-25 | 1 | -1/+1 |
| | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| * | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.85-1]. | Jenkins CD Merge Bot | 2017-05-25 | 2 | -2/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.85 | ||||
| * | | | | | | | | | Merge pull request #4273 from ewolinetz/36_registry_console_upgrade | OpenShift Bot | 2017-05-25 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
 |
index : csa/devops/ansible-patches/openshift.git | |
| Unnamed repository; edit this file 'description' to name the repository. | Suren A. Chilingaryan |
| summaryrefslogtreecommitdiffstats |