summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1096 from git001/masterBrenton Leanhardt2015-12-245-0/+32
|\ | | | | Add the new metrics and logging urls v2
| * 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 #1103 from abutcher/lb-no-dockerBrenton Leanhardt2015-12-242-1/+2
|\ \ | | | | | | Remove lb from docker hosts.
| * | Remove lb from docker hosts.Andrew Butcher2015-12-232-1/+2
| | |
* | | Merge pull request #1094 from abutcher/notifyBrenton Leanhardt2015-12-243-2/+9
|\ \ \ | |/ / |/| | Reset Type=notify for controllers service
| * | Conditionalize for 3.1.1/1.1.1Andrew Butcher2015-12-182-0/+9
| | |
| * | Use notify for workaround controllers unit.Andrew Butcher2015-12-182-3/+1
| |/
* | Merge pull request #1100 from sdodson/xpaas-1.2-jboss-fuseBrenton Leanhardt2015-12-231-1/+1
|\ \ | | | | | | Install all xpaas streams when enabled
| * | Install all xpaas streams when enabledScott Dodson2015-12-221-1/+1
| | |
* | | Merge pull request #1098 from lloy0076/patch-1Brenton Leanhardt2015-12-231-1/+1
|\ \ \ | |/ / |/| | Link to Tito Home Page is Broken
| * | Link to Tito Home Page is BrokenDavid Lloyd2015-12-221-1/+1
|/ / | | | | I've found the "most likely" link - the linked project describes itself as: "Tito is a tool for managing RPM based projects using git for their source code repository" ... which sounds like what this might have once linked to. The documentation examples in the link's README.md also looks very much like the above.
* | Merge pull request #808 from sdodson/containersBrenton Leanhardt2015-12-1968-122/+827
|\ \ | |/ |/| Containerized install with SDN support
| * Add some guards to wait for images to be pulled before moving onScott Dodson2015-12-164-6/+63
| |
| * Install httpd-tools when not is_atomicScott Dodson2015-12-161-1/+1
| |
| * Fix containerized variableScott Dodson2015-12-151-1/+1
| |
| * Skip yum/dnf ops when is_containerizedScott Dodson2015-12-1520-15/+36
| |
| * Move all docker config into openshift_docker to minimize docker restartsScott Dodson2015-12-153-8/+31
| |
| * Add openshift_cli roleScott Dodson2015-12-156-18/+68
| | | | | | | | | | | | This role ensures that the clients package is installed or if it's a containerized install places a wrapper script in /usr/local/bin/openshift and symlinks for oc, oadm, and kubectl.
| * pull docker images only if not already presentJason DeTiberus2015-12-154-10/+41
| |
| * fixesJason DeTiberus2015-12-1512-84/+104
| |
| * Containerization work by @sdodsonScott Dodson2015-12-1549-174/+527
| |
| * Initial containerization work from @ibottyTobias Florek2015-12-1531-23/+173
| | | | | | | | copied from https://github.com/eparis/kubernetes-ansible/blob/17f98edd7ff53e649b43e26822b8fbc0be42b233/roles/common/tasks/main.yml
* | 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.