summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4322 from ashcrow/1455843OpenShift Bot2017-06-011-0/+8
|\ | | | | Merged by openshift-bot
| * upgrade: Reload systemd before restartSteve Milner2017-05-311-0/+8
| | | | | | | | | | | | | | | | | | The installer now lays down updated systemd unit files in /etc/systemd/system/ which override the units that come with the rpms. Because of this we need to reload systemd before restarting services. Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1455843
* | Merge pull request #4333 from jarrpa/oc_secret-typeOpenShift Bot2017-06-018-5/+46
|\ \ | | | | | | Merged by openshift-bot
| * | oc_secret: allow for specifying secret typeJose A. Rivera2017-05-318-5/+46
| | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | Merge pull request #4015 from rparulek/copy-nuage-vsd-certsOpenShift Bot2017-06-016-10/+32
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | 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 volumes
| * | | | 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
|\ \ \ \ \ | |/ / / / |/| | | | Merged by openshift-bot
| * | | | Skip router/registry cert redeploy when ↵Andrew Butcher2017-05-301-0/+2
| | | | | | | | | | | | | | | | | | | | openshift_hosted_manage_{router,registry}=false
* | | | | Merge pull request #4332 from stevekuznetsov/skuznets/escalation-fixesScott Dodson2017-05-312-2/+0
|\ \ \ \ \ | | | | | | | | | | | | Revert "Merge pull request #4271 from DG-i/master"
| * | | | | Revert "Merge pull request #4271 from DG-i/master"Steve Kuznetsov2017-05-312-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 Dodson2017-05-312-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --keep-version
* | | | | Merge pull request #4325 from sdodson/amp20Scott Dodson2017-05-3112-160/+1639
|\ \ \ \ \ | |/ / / / |/| | | | AMP 2.0
| * | | | AMP 2.0Scott Dodson2017-05-3112-160/+1639
|/ / / /
* | | | Merge pull request #3941 from pgier/JMAN4-161Scott Dodson2017-05-314-0/+624
|\ \ \ \ | |_|_|/ |/| | | [JMAN4-161] Add template for cloudforms jboss middleware manager
| * | | [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, externalIPs
| * | | | add support for oc_service for labels, externalIPsRich Megginson2017-05-3040-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 Dodson2017-05-312-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --keep-version
* | | | | Merge pull request #4225 from ingvagabund/relax-rpm-image-version-checkJan Chaloupka2017-05-311-2/+7
|\ \ \ \ \ | | | | | | | | | | | | relax check for rpm version and docker image version equality
| * | | | | check for rpm version and docker image version equality only if ↵Jan Chaloupka2017-05-181-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | openshift_pkg_version and openshift_image_tag are not defined
* | | | | | Merge pull request #4272 from ashcrow/system-package-no-hardcodeOpenShift Bot2017-05-303-8/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | boolScott Dodson2017-05-261-2/+2
| | | | | | | |
* | | | | | | | Merge pull request #4298 from mwringe/metrics_imagepullpolicy_alwaysOpenShift Bot2017-05-303-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | 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_kind
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | Merged by openshift-bot
| * | | | | | | | | 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 memtotal
| * | | | | | | | | memory check: use GiB/MiB and adjust memtotalLuke Meyer2017-05-292-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 Bot2017-05-302-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.86
* | | | | | | | | | Merge pull request #4231 from ewolinetz/bz1452214Scott Dodson2017-05-301-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.6ewolinetz2017-05-181-2/+2
| | | | | | | | | |
* | | | | | | | | | Merge pull request #4234 from vshn/feature/oreg_url_masternodeOpenShift Bot2017-05-269-22/+31
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | allow to configure oreg_url specifically for node or master. refs #4233Tobias Brunner2017-05-199-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_fixScott Dodson2017-05-261-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | openshift_logging: increasing *_elasticsearch_* default CPU and memory
| * | | | | | | | | | | openshift_logging: increasing *_elasticsearch_* default CPU and memoryJan Wozniak2017-05-251-4/+4
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #4300 from sdodson/fedora-ciScott Dodson2017-05-261-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | Lower memory requirements in fedora-ci jobs
| * | | | | | | | | | Reduce memory requirement to 2gb for fedora ci jobsScott Dodson2017-05-261-0/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #4277 from ewolinetz/bz1455310Scott Dodson2017-05-261-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | Updating python-passlib assert
| * | | | | | | | | Updating python-passlib assertewolinetz2017-05-251-1/+1
| | |_|_|_|/ / / / | |/| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 10:58:00 +0000