summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add the necessary URLs for logging and metricsgit0012015-12-225-0/+32
| | | | | | | | | | | | | | add the necessary URLs for logging and metrics use the dict in the right way add the new variables into the hosts file add the new variables into the hosts file add the new variables into the hosts file Adopted the config text
* Merge pull request #1086 from sdodson/xpaas-1.2-jboss-fuseThomas Wiest2015-12-1742-458/+6825
|\ | | | | Xpaas 1.2 and JBOSS Fuse examples
| * Add jboss-fuse/application-templates/fis-image-streams.jsonScott Dodson2015-12-172-0/+57
| |
| * Update from jboss-openshift/application-templates ose-v1.2.0-1Scott Dodson2015-12-1741-458/+6768
| |
* | Merge pull request #1065 from lebauce/flannel-fixesBrenton Leanhardt2015-12-171-0/+1
|\ \ | | | | | | Use inventory value when checking for flannel
| * | Properly set use_flannel factSylvain Baubeau2015-12-161-0/+1
| | |
* | | Merge pull request #1085 from smunilla/fix_test_fresh_install_with_configBrenton Leanhardt2015-12-171-1/+1
|\ \ \ | | | | | | | | atomic-openshift-installer: Fix broken nosetest
| * | | atomic-openshift-installer: Fix broken nosetestSamuel Munilla2015-12-171-1/+1
| | | | | | | | | | | | | | | | This is a fix for the failing test_fresh_install_with_config.
* | | | Merge pull request #1091 from joelddiaz/dns-averageJoel Diaz2015-12-171-2/+2
|\ \ \ \ | | | | | | | | | | change dns triggers to average
| * | | | change dns triggers to averageJoel Diaz2015-12-171-2/+2
|/ / / /
* | | | Merge pull request #1089 from joelddiaz/docker-dns-existingJoel Diaz2015-12-171-0/+10
|\ \ \ \ | |_|_|/ |/| | | add item/trigger for dns tests on all currently running containers
| * | | add item/trigger for dns tests on all currently running containersJoel Diaz2015-12-171-0/+10
|/ / /
* | | Merge pull request #1084 from joelddiaz/docker-dns-triggerJoel Diaz2015-12-171-1/+1
|\ \ \ | |/ / |/| | fix logic to tolerate occasional failures
| * | fix logic to tolerate occasional failuresJoel Diaz2015-12-171-1/+1
| | |
* | | Merge pull request #1062 from smunilla/3.0_ha_hintBrenton Leanhardt2015-12-162-10/+29
|\ \ \ | | | | | | | | atomic-openshift-installer: Remove HA hint for 3.0 install
| * | | quick installer testsSamuel Munilla2015-12-161-0/+19
| | | | | | | | | | | | | | | | Add test for not displaying HA hints for 3.0 installs
| * | | atomic-openshift-installer: Remove HA hint for 3.0 installSamuel Munilla2015-12-161-10/+10
| | | | | | | | | | | | | | | | | | | | Small update to remove the hint for multiple masters if we are doing a 3.0 installation.
* | | | Merge pull request #1076 from sdodson/versionsThomas Wiest2015-12-161-3/+2
|\ \ \ \ | | | | | | | | | | Clean up versions.sh
| * | | | Clean up versions.shScott Dodson2015-12-161-3/+2
| |/ / /
* | | | Merge pull request #1074 from joelddiaz/zagg-client-ovsJoel Diaz2015-12-161-1/+1
|\ \ \ \ | | |/ / | |/| | change ovs mount to /var/run/openvswitch
| * | | change ovs mount to /var/run/openvswitchJoel Diaz2015-12-161-1/+1
|/ / / | | | | | | | | | will not require a container restart if openvswitch service is restarted
* | | Merge pull request #1073 from twiest/prThomas Wiest2015-12-161-3/+13
|\ \ \ | |/ / |/| | split zagg.server.processor.errors into separate heartbeat and metrics error items (needed since the scripts are split now).
| * | split zagg.server.processor.errors into separate heartbeat and metrics error ↵Thomas Wiest2015-12-161-3/+13
|/ / | | | | | | items (needed since the scripts are split now).
* | Merge pull request #1069 from joelddiaz/docker-dnsJoel Diaz2015-12-151-0/+10
|\ \ | | | | | | Add zabbix values to track docker container DNS results
| * | Add zabbix values to track docker container DNS resultsJoel Diaz2015-12-151-0/+10
| | |
* | | Merge pull request #1067 from dgoodwin/node-registry-bugThomas Wiest2015-12-151-2/+2
|\ \ \ | | | | | | | | Fix registry modification for new deployment types.
| * | | Fix registry modification for new deployment types.Devan Goodwin2015-12-151-2/+2
| | | | | | | | | | | | | | | | | | | | New deployment types were missed when installing with additional docker registries.
* | | | Merge pull request #1057 from EricMountain-1A/fix-node-network-fail-4githubThomas Wiest2015-12-152-4/+4
|\ \ \ \ | |/ / / |/| | | Fix typos that cause master/node restarts which break openshift SDN setup
| * | | Fixes typo when setting facts to record whether master/node has been ↵Eric Mountain2015-12-142-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | restarted already, to decide whether notify handler should do so or not. Currently, this causes random SDN network setup failures as openshift-node gets restarted while the setup script is running, and the subsequent start fails to configure the SDN because it thinks it's already done.
* | | | Merge pull request #1064 from kwoodson/ohifixKenny Woodson2015-12-143-49/+75
|\ \ \ \ | | | | | | | | | | Adding option for cache reading and specify openshift version.
| * | | | Updates to ohi to pull cache if specified. Also require versionKenny Woodson2015-12-143-49/+75
| | | | |
* | | | | Merge pull request #1063 from mwoodson/create_appMatt Woodson2015-12-141-0/+8
|\ \ \ \ \ | | | | | | | | | | | | Zabbix: added trigger to monitor app create over the last hour
| * | | | | Zabbix: added trigger to monitor app create over the last hourMatt Woodson2015-12-141-0/+8
|/ / / / /
* | | | | Merge pull request #1054 from twiest/prThomas Wiest2015-12-142-0/+49
|\ \ \ \ \ | |/ / / / |/| | | | added 'Template Zagg Server'
| * | | | added 'Template Zagg Server'Thomas Wiest2015-12-142-0/+49
|/ / / /
* | | | Merge pull request #1028 from kwoodson/remove_env_host_typeKenny Woodson2015-12-1438-135/+139
|\ \ \ \ | |/ / / |/| | | Removing env-host-type in preparation of env and environment changes.
| * | | Updating env-host-type to host patternsKenny Woodson2015-12-1138-135/+139
| | | |
* | | | Merge pull request #1052 from abutcher/controllers-serviceBrenton Leanhardt2015-12-132-6/+1
|\ \ \ \ | | | | | | | | | | Change controllers service type to simple.
| * | | | Change controllers service type to simple.Andrew Butcher2015-12-112-6/+1
|/ / / /
* | | | Merge pull request #954 from damaestro/update_latest_cloud_imageThomas Wiest2015-12-104-5/+16
|\ \ \ \ | | | | | | | | | | Update for latest CentOS-7-x86_64-GenericCloud.
| * | | | Use join for the uncompress command.Jonathan Steffan2015-11-221-1/+1
| | | | |
| * | | | Update for latest CentOS-7-x86_64-GenericCloud.Jonathan Steffan2015-11-224-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use xz compressed image - Update sha256 for new image - Update docs to reflect new settings
* | | | | Merge pull request #1000 from detiber/localhostFixThomas Wiest2015-12-1043-11/+112
|\ \ \ \ \ | | | | | | | | | | | | Enforce connection: local and become: no on all localhost plays
| * | | | | Enforce connection: local and become: no on all localhost playsJason DeTiberus2015-11-3043-11/+112
| | | | | |
* | | | | | Merge pull request #1045 from maxamillion/fedoraThomas Wiest2015-12-101-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add note that Fedora 23+ is acceptable deployment target for origin
| * | | | | | Add note that Fedora 23+ is acceptable deployment target for originAdam Miller2015-12-091-1/+1
| | | | | | |
* | | | | | | Automatic commit of package [openshift-ansible] release [3.0.20-1].Thomas Wiest2015-12-102-2/+18
| | | | | | |
* | | | | | | Revert "Automatic commit of package [openshift-ansible] release [3.0.20-1]."Thomas Wiest2015-12-102-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit be8f7c3c96dd077a10b71447c513811203673028.
* | | | | | | Automatic commit of package [openshift-ansible] release [3.0.20-1].Thomas Wiest2015-12-102-2/+14
| |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #1044 from joelddiaz/zbx-actionJoel Diaz2015-12-101-6/+120
|\ \ \ \ \ \ | | | | | | | | | | | | | | add support for remote command actions