summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #677 from stenwt/sturpin-2015-10-08-ovs-monitorSten Turpin2015-10-082-24/+26
|\ | | | | moved vswitch from master to node
| * moved vswitch from master to nodeSten Turpin2015-10-082-24/+26
| |
* | Merge pull request #676 from stenwt/sturpin-2015-10-08-ovs-monitorSten Turpin2015-10-081-1/+1
|\| | | | | fixed not equals syntax
| * fixed not equals syntaxSten Turpin2015-10-081-1/+1
| |
* | Merge pull request #675 from stenwt/sturpin-2015-10-08-ovs-monitorSten Turpin2015-10-081-0/+22
|\| | | | | added items + triggers for ovs tests
| * added items + triggers for ovs testsSten Turpin2015-10-081-0/+22
| |
* | Merge pull request #674 from kwoodson/zabagentKenny Woodson2015-10-083-0/+34
|\ \ | |/ |/| Adding zabbix agent template to config management
| * Adding zabbix agent templateKenny Woodson2015-10-083-0/+34
| |
* | Merge pull request #655 from stenwt/sturpin-2015-10-01-running-podsSten Turpin2015-10-081-0/+6
|\ \ | | | | | | Sturpin 2015 10 01 running pods
| * | fixed spacingSten Turpin2015-10-081-5/+5
| | |
| * | added running podsSten Turpin2015-10-081-0/+6
|/ /
* | Merge pull request #672 from kwoodson/zbxmediafixKenny Woodson2015-10-081-0/+3
|\ \ | | | | | | Fixed a bug where we are updating where we should be creating.
| * | Fixed user media bug where we would update media when we really wanted to ↵Kenny Woodson2015-10-081-0/+3
| | | | | | | | | | | | create.
* | | removed static xvda checksMatt Woodson2015-10-081-32/+0
| |/ |/|
* | Merge pull request #633 from robotmaxtron/mwhittin-cluster-user-countThomas Wiest2015-10-081-0/+12
|\ \ | | | | | | Zabbix check and trigger for user count
| * | Changed trigger to only info alert if users is at 0Max Whittingham2015-10-051-1/+1
| | |
| * | Zabbix check and trigger for user countMax Whittingham2015-09-301-0/+12
| | |
* | | Merge pull request #669 from kwoodson/protofixMatt Woodson2015-10-071-3/+3
|\ \ \ | |_|/ |/| | Fixed a bug where applicationids were not being queried properly.
| * | Fixed a bug where applicationids were not being filtered properlyKenny Woodson2015-10-071-3/+3
|/ /
* | Merge pull request #668 from kwoodson/quick2Kenny Woodson2015-10-073-0/+441
|\ \ | | | | | | Adding zabbix template to config management
| * | Zabbix server template addedKenny Woodson2015-10-073-0/+441
|/ /
* | Merge pull request #660 from sdodson/updated-registry-factsBrenton Leanhardt2015-10-071-4/+4
|\ \ | | | | | | Updated registry fact with latest deployment_type mappings
| * | Updated registry fact with latest deployment_type mappingsScott Dodson2015-10-061-4/+4
| | |
* | | Merge pull request #638 from jaryn/patch-2Brenton Leanhardt2015-10-071-1/+2
|\ \ \ | | | | | | | | Fix newline
| * | | Fix newlineJaroslav Henner2015-09-301-1/+2
| | | |
* | | | Merge pull request #667 from kwoodson/loopbackKenny Woodson2015-10-071-7/+0
|\ \ \ \ | | | | | | | | | | Removed last play in playbook as it will fail
| * | | | Removing the last step as it will fail.Kenny Woodson2015-10-071-7/+0
| | | | |
* | | | | Merge pull request #666 from kwoodson/loopbackMatt Woodson2015-10-071-3/+1
|\| | | | | | | | | | | | | | Removed io1 and added gp2
| * | | | Removed io1 type for gp2Kenny Woodson2015-10-071-3/+1
| | | | |
* | | | | Merge pull request #657 from liggitt/schedulerBrenton Leanhardt2015-10-061-0/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | Add kind/apiVersion to scheduler.json template
| * | | | Add kind/apiVersion to scheduler.json templateJordan Liggitt2015-10-051-0/+2
| | | | |
* | | | | Merge pull request #653 from arsogukpinar/masterBrenton Leanhardt2015-10-061-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | Fix for name conflict
| * | | | Fix for name conflictAli Sogukpinar2015-10-051-2/+2
| | | | | | | | | | | | | | | Template name is conflicting with the template name from 'eap6-basic-sti.json' .
* | | | | 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.