summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add kind/apiVersion to scheduler.json templateJordan Liggitt2015-10-051-0/+2
|
* Merge pull request #654 from openshift/revert-641-gce-supportThomas Wiest2015-10-0516-211/+80
|\ | | | | Revert "GCE support" because it breaks openstack.
| * Revert "GCE support"Thomas Wiest2015-10-0516-211/+80
|/
* Merge pull request #641 from menren/gce-supportThomas Wiest2015-10-0516-80/+211
|\ | | | | GCE support
| * openshift master public api url defaults to None, it will get its default ↵Chengcheng Mu2015-10-023-31/+32
| | | | | | | | | | | | value in openshift_facts commented infra-node code until it's solved
| * Removed some application specific code like insecure registries, heat templateChengcheng Mu2015-10-013-24/+3
| |
| * oo_option fixed, some clean upChengcheng Mu2015-10-014-31/+3
| |
| * Rebased on masterChengcheng Mu2015-10-010-0/+0
| |\
| | * fixed some issues to boot VM on GCEChengcheng Mu2015-10-0140-140/+401
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | corrected openshift master config, commented infra correct list and terminate, it was bugged in case where no instance were terminated Using openshift-sdn for gce new join_node playbook for gce openstack/hosts/nova.py is now taking the nova/ini of its directory and not the directory of execution of bin/cluster add fix of ICMP reject rules Avoid a recursive loop Jenkins image was renamed Default masters to t2.medium instead of t2.small Fix a minor bug involving AWS ENV Keys * If a user forgot to set their AWS keys, we'd get a non descriptive error about a variable not being set * This patch uses the correct variable so the error message is more informative delete some fix that are needed anymore (selinux, iptables rules for sdn) GCE : all variables needed are in gce.ini, it will be used by bin/cluster (now check better the presence of gce.init in the default place or use GCE_INI_PATH to locate it ), also by gce.ini openshift_node_labels : get from oo_option fix syntax error in bin/cluster fix lookup for openshift_node_labels Adding desc, multiplier, and units to zabbix item Adding capability to have descriptions on triggers updated triggers and items to have better descriptions and multipliers Move openshift_data_dir to a fact based on deployment_type Previously this was being set to /var/lib/origin regardless of deployment_type which isn't correct given that existing 'enterprise' and 'online' deployments would have been deployed with /var/lib/openshift Verify again that ansible version is different than 1.9.0 and 1.9.0.1 bin/cluste does not take -a and -s anymore fix master_public_api_url : using by default a correct url Really fixed master public api url this time Really fixed master public api url this time uncommented infra deployment like before fixed again masterpublicurl in a template README_GCE.md : use GCE_INI_PATH in order to locate gce.ini, update description of gce.ini
| * | GCE-support (more information in PR, README_GCE.md)Chengcheng Mu2015-10-0118-55/+234
| | |
* | | Merge pull request #651 from twiest/cprThomas Wiest2015-10-024-5/+38
|\ \ \ | | | | | | | | added Template Ops Tools
| * | | added Template Ops ToolsThomas Wiest2015-10-024-5/+38
|/ / /
* | | Merge pull request #650 from smunilla/masterBrenton Leanhardt2015-10-021-0/+2
|\ \ \ | | | | | | | | openshift_facts.py: Correct error case for uninstalled systems
| * | | openshift_facts.py: Correct error case for uninstalled systemsSamuel Munilla2015-10-021-0/+2
|/ / / | | | | | | | | | | | | | | | This adds a default value to the version to cover the case where the user doesn't have /usr/bin/openshift on the system, correcting the bug found in PR #646.
* | | Merge pull request #639 from jaryn/localonly_dnsBrenton Leanhardt2015-10-011-1/+1
|\ \ \ | | | | | | | | Prevent dns resolution recursion (loop).
| * | | Prevent dns resolution recursion (loop).Jaroslav Henner2015-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dnsmasq should not be resolving the example.com recursively, because in case that we have /etc/NetworkManager/dnsmasq.d/libvirt_dnsmasq.conf: server=/example.com/192.168.55.1 the dnsmasq will be asking itself, therefore a dns resolution loop is created, which causes Maximum number of concurrent DNS queries reached (max: 150) and performance degradation of dns resolution on the whole hypervizor and guests. This patch will fix that in the domain.xml, which will cause adding local=/example.com/ to the /var/lib/libvirt/dnsmasq/openshift-ansible.conf, effectively fixing the problem.
* | | | Merge pull request #646 from smunilla/masterWesley Hearn2015-10-011-0/+14
|\ \ \ \ | | | | | | | | | | openshift_facts.py: Ansible fact for openshift version
| * | | | openshift_facts.py: Ansible fact for openshift versionSamuel Munilla2015-10-011-0/+14
|/ / / / | | | | | | | | | | | | | | | | | | | | This added some logic to add a new the version of openshift rpm-based installations. This fact is intentionally not cached to account for users potenially updating versions outside of ansible playbooks.
* | | | Merge pull request #644 from dak1n1/logrotateStefanie Forrester2015-10-012-2/+2
|\ \ \ \ | | | | | | | | | | added 'missingok' to logrotate and disabled fluentd in online
| * | | | added 'missingok' to logrotate and disabled fluentd in onlineStefanie Forrester2015-10-012-2/+2
|/ / / /
* | | | Merge pull request #643 from kwoodson/cputrigKenny Woodson2015-10-011-0/+15
|\ \ \ \ | |_|/ / |/| | | Adding zabbix triggers for cpu idle
| * | | Adding trggers for cpu idleKenny Woodson2015-10-011-0/+15
|/ / /
* | | Merge pull request #640 from kwoodson/unitsKenny Woodson2015-09-301-0/+8
|\ \ \ | | | | | | | | Adding % units for kernel.all.cpu items
| * | | Adding % to unitsKenny Woodson2015-09-301-0/+8
|/ / /
* | | Merge pull request #636 from kwoodson/quick1Kenny Woodson2015-09-301-8/+8
|\ \ \ | | | | | | | | Correcting cpu types to floats for percentage
| * | | Updating these to the correct typeKenny Woodson2015-09-301-8/+8
|/ / /
* | | Merge pull request #611 from wshearn/fix_product_typeWesley Hearn2015-09-301-1/+1
|\ \ \ | | | | | | | | Add missing ,
| * | | Add missing ,Wesley Hearn2015-09-241-1/+1
| | | |
* | | | Merge pull request #582 from sdodson/upgradesBrenton Leanhardt2015-09-3013-8/+153
|\ \ \ \ | | | | | | | | | | Upgrade playbook
| * | | | UpgradesScott Dodson2015-09-2313-8/+153
| | | | |
* | | | | Merge pull request #634 from abutcher/whats-nextBrenton Leanhardt2015-09-303-46/+11
|\ \ \ \ \ | | | | | | | | | | | | Point to advanced installation guide for post install steps
| * | | | | Point to advanced installation guide in READMEsAndrew Butcher2015-09-303-46/+11
|/ / / / /
* | | | | Merge pull request #630 from mwoodson/grow_docker_vgMatt Woodson2015-09-291-2/+1
|\ \ \ \ \ | | | | | | | | | | | | added pylint as a package to ansible-tower
| * | | | | added pylint as a package to ansible-towerMatt Woodson2015-09-291-2/+1
| | | | | |
* | | | | | Merge pull request #629 from mwoodson/grow_docker_vgMatt Woodson2015-09-291-0/+2
|\| | | | | | | | | | | | | | | | | don't want file ext in prod
| * | | | | added comment to the grow_docker_vg playbookMatt Woodson2015-09-291-0/+2
| | | | | |
* | | | | | Merge pull request #628 from mwoodson/grow_docker_vgMatt Woodson2015-09-292-0/+245
|\| | | | | | | | | | | | | | | | | added the grow_docker_vg adhoc playbook
| * | | | | added the grow_docker_vg adhoc playbookMatt Woodson2015-09-292-0/+245
|/ / / / /
* | | | | Merge pull request #626 from kwoodson/quickMatt Woodson2015-09-281-0/+4
|\ \ \ \ \ | | | | | | | | | | | | Error handling added
| * | | | | Added some debug when zbxapi has an issueKenny Woodson2015-09-281-0/+4
|/ / / / /
* | | | | Merge pull request #625 from kwoodson/triggerprotoKenny Woodson2015-09-284-1/+216
|\ \ \ \ \ | | | | | | | | | | | | Adding trigger prototype support
| * | | | | Trigger prototype supportKenny Woodson2015-09-284-1/+216
| | | | | |
* | | | | | Merge pull request #624 from abutcher/merge-factsBrenton Leanhardt2015-09-281-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Avoid attribute error in merge facts
| * | | | | | Only continue to merge facts if both old and new values are type dict.Andrew Butcher2015-09-281-1/+1
| |/ / / / /
* | | | | | Merge pull request #613 from jaryn/patch-1Brenton Leanhardt2015-09-281-1/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix bullets in libvirt readme
| * | | | | Fix bullets in libvirt readmeJaroslav Henner2015-09-251-1/+6
| | |_|/ / | |/| | |
* | | | | Merge pull request #616 from kwoodson/tmp3Kenny Woodson2015-09-251-9/+44
|\ \ \ \ \ | | | | | | | | | | | | Required updates to zabbix user media
| * | | | | Updates to zbx_user_mediaKenny Woodson2015-09-251-9/+44
| | |_|/ / | |/| | |
* | | | | Merge pull request #612 from kwoodson/zbx_actionKenny Woodson2015-09-251-0/+538
|\ \ \ \ \ | | | | | | | | | | | | First attempt at a ansible zabbix action class
| * | | | | Initial stab at zabbix actionsKenny Woodson2015-09-251-0/+538
| |/ / / /