summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1105 from EricMountain-1A/fix-restart-docker-handlerBrenton Leanhardt2016-01-043-4/+10
|\ | | | | Fix Docker restart handling
| * Fixes typo assigning docker_service_status_changed which leads to ↵Eric Mountain2015-12-293-4/+10
| | | | | | | | | | | | misinterpretation in handler. Fixes Docker restart handling to ensure openshift_docker role does restart Docker on change.
* | Merge pull request #1110 from abutcher/argsBrenton Leanhardt2016-01-044-2/+20
|\ \ | | | | | | Fix osm_controller_args and osm_api_server_args settings.
| * | Fix osm_controller_args and osm_api_server_args settings.Andrew Butcher2016-01-044-2/+20
| | |
* | | Merge pull request #1050 from enoodle/propose_manageiq_as_defaultBrenton Leanhardt2016-01-041-1/+1
|\ \ \ | | | | | | | | Propose adding ManageIQ service account by default
| * | | Adding ManageIQ service account by defaultenoodle2015-12-301-1/+1
| | |/ | |/| | | | | | | Signed-off-by: enoodle <efreiber@redhat.com>
* | | Merge pull request #958 from kwoodson/envfixKenny Woodson2016-01-0452-267/+378
|\ \ \ | |_|/ |/| | Fixing meta data tags env and environment
| * | Fix error in byo cluster_hosts.ymlJason DeTiberus2016-01-045-5/+10
| | |
| * | Cleanup and fixes for cluster_id changeJason DeTiberus2016-01-0428-219/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Move debug_level into vars.yml and byo inventory - change variables in cluster_hosts.yml to be g_* and update playbooks to use those values directly instead of setting them indirectly - added a new g_all_hosts entry in cluster_hosts to use in the update playbook instead of unioning all host types within the playbook - added a cluster_hosts.yml for the byo playbook
| * | Removing environment and env tags.Kenny Woodson2016-01-0438-170/+301
| | |
* | | Merge pull request #1108 from abutcher/kube-argsBrenton Leanhardt2016-01-043-0/+9
|\ \ \ | | | | | | | | Add node kubelet args to inventory examples.
| * | | Add node kubelet args to inventory examples.Andrew Butcher2016-01-043-0/+9
|/ / /
* | | Merge pull request #1101 from sdodson/bz1292684Brenton Leanhardt2016-01-041-1/+1
|\ \ \ | |/ / |/| | Install iptables, iptables-services when not is_aotmic
| * | Install iptables, iptables-services when not is_aotmicScott Dodson2015-12-221-1/+1
| | |
* | | Merge pull request #951 from abutcher/nfsWesley Hearn2016-01-0424-4/+220
|\ \ \ | | | | | | | | NFS for registry storage
| * | | Create nfs host group with registry volume attachment.Andrew Butcher2015-12-1524-4/+220
| | | |
* | | | Merge pull request #1095 from abutcher/restartsBrenton Leanhardt2016-01-046-10/+10
|\ \ \ \ | |_|_|/ |/| | | Fix restart handlers
| * | | Fix restart handlers.Andrew Butcher2015-12-266-10/+10
|/ / /
* | | 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