summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* specify all logging index mappings for kibanaJeff Cantrill2017-06-061-0/+1
|
* Merge pull request #4327 from ewolinetz/fix_logging_secretOpenShift Bot2017-06-063-6/+8
|\ | | | | Merged by openshift-bot
| * Updating Kibana-proxy secret key name, fixing deleting secrets, fixed extra ↵ewolinetz2017-05-313-6/+8
| | | | | | | | ES dc creation
* | Merge pull request #3643 from juanvallejo/jvallejo/elastic-search-checkOpenShift Bot2017-06-0613-6/+1575
|\ \ | | | | | | Merged by openshift-bot
| * | add elasticseatch, fluentd, kibana checkjuanvallejo2017-06-0213-6/+1575
| | |
* | | Merge pull request #4348 from tbielawa/bz1451693OpenShift Bot2017-06-052-0/+2
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | Add daemon_reload parameter to service tasksTim Bielawa2017-06-012-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes "Could not find the requested service atomic-openshift-master: cannot enable" error during reinstall. https://bugzilla.redhat.com/show_bug.cgi?id=1451693
* | | | Merge pull request #4342 from richm/mux-uses-fluentd-secretOpenShift Bot2017-06-051-1/+1
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | mux uses fluentd cert/key to talk to ESRich Megginson2017-05-311-1/+1
| | | | |
* | | | | Merge pull request #4267 from ozdanborne/byo-etcdOpenShift Bot2017-06-057-23/+52
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| * | | | | Support byo etcd for calicoDan Osborne2017-05-247-23/+52
| | | | | |
* | | | | | Merge pull request #4064 from juanvallejo/jvallejo/add-ovs-version-checkOpenShift Bot2017-06-0511-98/+376
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | preflight int tests: fix for package_version changesLuke Meyer2017-05-247-6/+42
| | | | | | |
| * | | | | | Remove unnecessary comment.Rodolfo Carvalho2017-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Capturing the ImportError is a common idiom in Ansible modules, and it is not specific to tox.
| * | | | | | update aos_version module to support generic pkgs and versionsjuanvallejo2017-05-244-91/+333
| | | | | | |
* | | | | | | Merge pull request #4157 from ↵OpenShift Bot2017-06-054-0/+376
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | juanvallejo/jvallejo/add-retroactive-ovs-version-check Merged by openshift-bot
| * | | | | | | add existing_ovs_version checkjuanvallejo2017-05-195-0/+377
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #4336 from sdodson/BZ1457062OpenShift Bot2017-06-052-0/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | Add mtu setting to /etc/sysconfig/docker-networkScott Dodson2017-06-012-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1457062
* | | | | | | | Merge pull request #4357 from ewolinetz/registry_console_imageScott Dodson2017-06-051-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Updating image for registry_console
| * | | | | | | | Updating image for registry_consoleewolinetz2017-06-021-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #4360 from abutcher/expired-ca-skip-restartsScott Dodson2017-06-021-0/+37
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Skip service restarts within ca redeployment playbook when expired certificates are detected.
| * | | | | | | | | Skip service restarts within ca redeployment playbook when expired ↵Andrew Butcher2017-06-011-0/+37
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | certificates are detected.
* | | | | | | | | Merge pull request #4321 from ingvagabund/verify-targets-separatellyOpenShift Bot2017-06-0214-79/+144
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | verify upgrade targets separately for each group (masters, nodes, etcd)Jan Chaloupka2017-05-3114-79/+144
| | | | | | | | | |
* | | | | | | | | | Merge pull request #4309 from ingvagabund/disable-docker-excluder-when-updatingOpenShift Bot2017-06-021-2/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | disable docker excluder before it is updated to remove older excluded packagesJan Chaloupka2017-05-301-2/+4
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #4352 from mmckinst/openshift_hosted_manage_registryScott Dodson2017-06-022-8/+8
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | show correct default value in inventory
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | | add mux docs; allow to specify mux namespacesRich Megginson2017-05-315-15/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the necessary documentation for the mux parameters and behavior. This also adds new parameters which allow to specify the namespaces mux must create by default, and which can be optionally added. This casts openshift_logging_use_mux to bool wherever it is used as a boolean. Also - use oc_service `labels` and `external_ips` which are now available.
* | | | | | | | | | | | 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.