summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | Merge pull request #4352 from mmckinst/openshift_hosted_manage_registryScott Dodson2017-06-022-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | show correct default value in inventoryMark McKinstry2017-06-012-8/+8
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #4232 from richm/mux-namespaces-docsOpenShift Bot2017-06-025-15/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | add mux docs; allow to specify mux namespacesRich Megginson2017-05-315-15/+60
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #4322 from ashcrow/1455843OpenShift Bot2017-06-011-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | upgrade: Reload systemd before restartSteve Milner2017-05-311-0/+8
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #4333 from jarrpa/oc_secret-typeOpenShift Bot2017-06-018-5/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | oc_secret: allow for specifying secret typeJose A. Rivera2017-05-318-5/+46
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #4015 from rparulek/copy-nuage-vsd-certsOpenShift Bot2017-06-016-10/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Copy Nuage VSD generated user certificates to Openshift master nodesSneha Deshpande2017-05-226-10/+32
* | | | | | | | | | | | | | | Merge pull request #4341 from richm/curator-ops-host-volsScott Dodson2017-06-012-5/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | fix curator host, port params; remove curator es volumesRich Megginson2017-05-312-5/+4
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #4311 from abutcher/skip-router-registry-cert-redeployOpenShift Bot2017-06-011-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Skip router/registry cert redeploy when openshift_hosted_manage_{router,regis...Andrew Butcher2017-05-301-0/+2
* | | | | | | | | | | | | | Merge pull request #4332 from stevekuznetsov/skuznets/escalation-fixesScott Dodson2017-05-312-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Revert "Merge pull request #4271 from DG-i/master"Steve Kuznetsov2017-05-312-2/+0
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.89.0-1].Scott Dodson2017-05-312-2/+8
* | | | | | | | | | | | | Merge pull request #4325 from sdodson/amp20Scott Dodson2017-05-3112-160/+1639
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | AMP 2.0Scott Dodson2017-05-3112-160/+1639
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #3941 from pgier/JMAN4-161Scott Dodson2017-05-314-0/+624
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | [JMAN4-161] Add templates and pv example for cloudforms jboss middleware managerPaul Gier2017-04-264-0/+624
* | | | | | | | | | | | Merge pull request #4091 from richm/oc_service-labels-externalIPsScott Dodson2017-05-3140-248/+931
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | add support for oc_service for labels, externalIPsRich Megginson2017-05-3040-248/+931
* | | | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.89-1].Scott Dodson2017-05-312-2/+20
* | | | | | | | | | | | | Merge pull request #4225 from ingvagabund/relax-rpm-image-version-checkJan Chaloupka2017-05-311-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | check for rpm version and docker image version equality only if openshift_pkg...Jan Chaloupka2017-05-181-2/+7
* | | | | | | | | | | | | Merge pull request #4272 from ashcrow/system-package-no-hardcodeOpenShift Bot2017-05-303-8/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove typos that got reintroducedSteve Milner2017-05-251-2/+2
| * | | | | | | | | | | | | oc_atomic_container: Workaround for invalid json from atomic commandSteve Milner2017-05-252-2/+6
| * | | | | | | | | | | | | Remove system-package=no from container-engine installSteve Milner2017-05-251-2/+0
| * | | | | | | | | | | | | oc_atomic_container: Hard code system-package=noSteve Milner2017-05-252-2/+6
* | | | | | | | | | | | | | Merge pull request #4299 from sdodson/boolOpenShift Bot2017-05-301-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | boolScott Dodson2017-05-261-2/+2
* | | | | | | | | | | | | | | Merge pull request #4298 from mwringe/metrics_imagepullpolicy_alwaysOpenShift Bot2017-05-303-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Metrics: update the imagePullPolicy to be alwaysmwringe2017-05-263-0/+3
* | | | | | | | | | | | | | | | Merge pull request #4314 from ewolinetz/logging_pvc_checkScott Dodson2017-05-301-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Adding default value for openshift_hosted_logging_storage_kindewolinetz2017-05-301-4/+4
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #4280 from ewolinetz/logging_pvc_fixOpenShift Bot2017-05-301-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Updating to generate PVC when storage type is passed in as nfsewolinetz2017-05-251-4/+7
* | | | | | | | | | | | | | | | | Merge pull request #4271 from DG-i/masterOpenShift Bot2017-05-302-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | disable become for local actionsMathias Merscher2017-05-242-0/+2
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #4301 from sosiouxme/20170526-add-mem-check-fudge-factorScott Dodson2017-05-302-20/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | memory check: use GiB/MiB and adjust memtotalLuke Meyer2017-05-292-20/+36
| | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.86-1].Jenkins CD Merge Bot2017-05-302-2/+12
* | | | | | | | | | | | | | | Merge pull request #4231 from ewolinetz/bz1452214Scott Dodson2017-05-301-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Updating registry-console version to be v3.6 instead of 3.6ewolinetz2017-05-181-2/+2
* | | | | | | | | | | | | | | Merge pull request #4234 from vshn/feature/oreg_url_masternodeOpenShift Bot2017-05-269-22/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | allow to configure oreg_url specifically for node or master. refs #4233Tobias Brunner2017-05-199-22/+31
* | | | | | | | | | | | | | | | Merge pull request #4288 from wozniakjan/logging_es_fixScott Dodson2017-05-261-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | openshift_logging: increasing *_elasticsearch_* default CPU and memoryJan Wozniak2017-05-251-4/+4
| | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |