summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4349 from sdodson/bz1392519Scott Dodson2017-06-071-5/+7
|\ | | | | Do not attempt to override openstack nodename
| * Do not attempt to override openstack nodenameJason DeTiberus2017-06-011-5/+7
| | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1392519
* | Merge pull request #4331 from stevekuznetsov/skuznets/update-isScott Dodson2017-06-072-8/+40
|\ \ | | | | | | Update image stream to openshift/origin:2c55ade
| * | Update image stream to openshift/origin:2c55adeSteve Kuznetsov2017-05-312-8/+40
| | | | | | | | | | | | Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
* | | Merge pull request #4278 from abutcher/loopback-kubeconfigOpenShift Bot2017-06-073-3/+38
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | Use local openshift.master.loopback_url when generating initial master ↵Andrew Butcher2017-06-023-3/+38
| | | | | | | | | | | | | | | | loopback kubeconfigs.
* | | | 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-054-92/+334
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | 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 #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 #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
| | | | | | | | | |
* | | | | | | | | | fix curator host, port params; remove curator es volumesRich Megginson2017-05-312-5/+4
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | 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>
* / | | | | | | 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.
* | | | | | | | 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
| | | | | | | | | | |