summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix up openshift-ansible for use with 'oc cluster up'Jeff Cantrill2017-06-066-5/+6
* Merge pull request #4327 from ewolinetz/fix_logging_secretOpenShift Bot2017-06-063-6/+8
|\
| * Updating Kibana-proxy secret key name, fixing deleting secrets, fixed extra E...ewolinetz2017-05-313-6/+8
* | Merge pull request #3643 from juanvallejo/jvallejo/elastic-search-checkOpenShift Bot2017-06-0613-6/+1575
|\ \
| * | add elasticseatch, fluentd, kibana checkjuanvallejo2017-06-0213-6/+1575
* | | Merge pull request #4348 from tbielawa/bz1451693OpenShift Bot2017-06-052-0/+2
|\ \ \
| * | | Add daemon_reload parameter to service tasksTim Bielawa2017-06-012-0/+2
* | | | Merge pull request #4342 from richm/mux-uses-fluentd-secretOpenShift Bot2017-06-051-1/+1
|\ \ \ \
| * | | | 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
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \ \
| * | | | | | preflight int tests: fix for package_version changesLuke Meyer2017-05-247-6/+42
| * | | | | | Remove unnecessary comment.Rodolfo Carvalho2017-05-241-1/+1
| * | | | | | update aos_version module to support generic pkgs and versionsjuanvallejo2017-05-244-91/+333
* | | | | | | Merge pull request #4157 from juanvallejo/jvallejo/add-retroactive-ovs-versio...OpenShift Bot2017-06-054-0/+376
|\ \ \ \ \ \ \
| * | | | | | | add existing_ovs_version checkjuanvallejo2017-05-195-0/+377
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #4336 from sdodson/BZ1457062OpenShift Bot2017-06-052-0/+18
|\ \ \ \ \ \ \
| * | | | | | | Add mtu setting to /etc/sysconfig/docker-networkScott Dodson2017-06-012-0/+18
* | | | | | | | Merge pull request #4357 from ewolinetz/registry_console_imageScott Dodson2017-06-051-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 certificat...Andrew Butcher2017-06-011-0/+37
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #4321 from ingvagabund/verify-targets-separatellyOpenShift Bot2017-06-0214-79/+144
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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 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