summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into prodThomas Wiest2015-12-09226-809/+27305
|\
| * Merge pull request #1043 from abutcher/session_varsBrenton Leanhardt2015-12-091-10/+2
| |\ | | | | | | Simplify session secrets overrides.
| | * Simplify session secrets overrides.Andrew Butcher2015-12-091-10/+2
| | |
| * | Merge pull request #1037 from sdodson/ansible194Brenton Leanhardt2015-12-091-1/+1
| |\ \ | | |/ | |/| Bump ansible requirement to 1.9.4
| | * Bump ansible requirement to 1.9.4Scott Dodson2015-12-081-1/+1
| | |
| * | Merge pull request #1040 from abutcher/pacemaker-passBrenton Leanhardt2015-12-091-7/+2
| |\ \ | | | | | | | | Squash pcs install into one task.
| | * | Squash pcs install into one task.Andrew Butcher2015-12-091-7/+2
| | | |
| * | | Automatic commit of package [openshift-ansible] release [3.0.19-1].Brenton Leanhardt2015-12-092-2/+8
| | | |
| * | | Merge pull request #1039 from sdodson/fix-version-dependent-contentBrenton Leanhardt2015-12-094-866/+76
| |\ \ \ | | |/ / | |/| | Fix version dependent image streams
| | * | Fix version dependent image streamsScott Dodson2015-12-094-866/+76
| | |/
| * | Merge pull request #1029 from jtslear/better-readingThomas Wiest2015-12-081-8/+19
| |\ \ | | | | | | | | Betterize AWS readme
| | * | Betterize AWS readmeJohn T Skarbek2015-12-051-8/+19
| | |/ | | | | | | | | | * Horridly low priority
| * | Merge pull request #1038 from smunilla/big_stack_traceBrenton Leanhardt2015-12-081-3/+9
| |\ \ | | | | | | | | atomic-openshift-installer: Error handling on yaml loading
| | * | atomic-openshift-installer: Error handling on yaml loadingSamuel Munilla2015-12-081-3/+9
| |/ / | | | | | | | | | | | | | | | This addresses the stack trace that has been plaguing recent demos. In the case of an error with callback_facts.yaml the program output is much clearer and a course of action is suggested.
| * | Automatic commit of package [openshift-ansible] release [3.0.18-1].Brenton Leanhardt2015-12-082-2/+12
| | |
| * | Merge pull request #1020 from abutcher/pre-3.1-dnsipBrenton Leanhardt2015-12-084-5/+6
| |\ \ | | | | | | | | Default 3.0.x dnsIP
| | * | Pass in and use first_master_ip as dnsIP for pre 3.1 nodes.Andrew Butcher2015-12-084-5/+6
| | | |
| * | | Merge pull request #1032 from sdodson/opensslBrenton Leanhardt2015-12-081-0/+1
| |\ \ \ | | | | | | | | | | Require pyOpenSSL
| | * | | Require pyOpenSSLScott Dodson2015-12-071-0/+1
| | | |/ | | |/|
| * | | Merge pull request #1036 from joelddiaz/zbx-actionJoel Diaz2015-12-081-2/+2
| |\ \ \ | | | | | | | | | | Fix absent state
| | * | | Fix delete stateJoel Diaz2015-12-081-2/+2
| | | | |
| * | | | Merge pull request #959 from sdodson/fix-depsBrenton Leanhardt2015-12-081-3/+3
| |\ \ \ \ | | | | | | | | | | | | Fix missing dependency version locking
| | * | | | Fix missing dependency version lockingScott Dodson2015-11-231-3/+3
| | | | | |
| * | | | | Merge pull request #986 from sdodson/preflightBrenton Leanhardt2015-12-081-7/+10
| |\ \ \ \ \ | | | | | | | | | | | | | | Clarify the preflight port check output
| | * | | | | Clarify the preflight port check outputScott Dodson2015-11-301-7/+10
| | | | | | |
| * | | | | | Merge pull request #1011 from sdodson/sync-examplesBrenton Leanhardt2015-12-0817-67/+259
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Sync db-templates, image-streams, and quickstart-templates
| | * | | | | | Update sync db-templates, image-streams, and quickstart-templatesScott Dodson2015-12-0217-67/+259
| | | | | | | |
| * | | | | | | Automatic commit of package [openshift-ansible] release [3.0.17-1].Brenton Leanhardt2015-12-082-2/+73
| | | | | | | |
| * | | | | | | Merge pull request #1035 from brenton/bz1287977Brenton Leanhardt2015-12-083-3/+66
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Bug 1287977 - Incorrect check output from atomic-openshift-installer …
| | * | | | | | | Improving output when gathering factsBrenton Leanhardt2015-12-081-1/+1
| | | | | | | | |
| | * | | | | | | Bug 1287977 - Incorrect check output from atomic-openshift-installer when ↵Brenton Leanhardt2015-12-082-2/+65
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | working with preconfigured load balancer
| * | | | | | | Merge pull request #946 from sdodson/dt-oeBrenton Leanhardt2015-12-083-11/+370
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | Add origin hosts example and ose example
| | * | | | | | Add unique AEP, OSE, and Origin BYO inventoriesScott Dodson2015-12-073-11/+370
| |/ / / / / /
| * | | | | | Merge pull request #996 from lhuard1A/openstack_etcdThomas Wiest2015-12-045-1/+106
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Add etcd nodes management in OpenStack
| | * | | | | | Add etcd nodes management in OpenStackLénaïc Huard2015-11-185-1/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #472
| * | | | | | | Merge pull request #1016 from joelddiaz/move-docker-timeout-workaroundJoel Diaz2015-12-046-129/+57
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | bring the docker udev workaround into openshift-ansible.git
| | * | | | | | | bring the docker udev workaround into openshift-ansible.gitJoel Diaz2015-12-046-129/+57
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge pull request #988 from dak1n1/upgradesStefanie Forrester2015-12-043-3/+36
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | added upgrade playbook for online
| | * | | | | | | added upgrade playbook for onlineStefanie Forrester2015-12-013-3/+36
| | | | | | | | |
| * | | | | | | | Merge pull request #1025 from mwoodson/master_checksMatt Woodson2015-12-041-0/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Zabbix: put in a note about trigger prototype dependency
| | * | | | | | | | Zabbix: put in a note about trigger prototype dependencyMatt Woodson2015-12-041-0/+3
| | | | | | | | | |
| * | | | | | | | | Merge pull request #983 from enoodle/manageiq_serviceBrenton Leanhardt2015-12-045-1/+78
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Adding ManageIQ service account
| | * | | | | | | | | ManageIQ Service Account: added role for ManageIQ service accountenoodle2015-12-045-1/+78
| | | |_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: enoodle <efreiber@redhat.com>
| * | | | | | | | | Merge pull request #1023 from mwoodson/master_checksMatt Woodson2015-12-041-5/+7
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | Zabbix: added dependency for inode disk check
| | * | | | | | | | Zabbix: added dependency for inode disk checkMatt Woodson2015-12-041-5/+7
| | | | | | | | | |
| * | | | | | | | | Merge pull request #1022 from mwoodson/master_checksMatt Woodson2015-12-041-5/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Zabbix: added dependency for disk check
| | * | | | | | | | Zabbix: added dependency for disk checkMatt Woodson2015-12-041-5/+8
| | | | | | | | | |
| * | | | | | | | | Merge pull request #1021 from mwoodson/master_checksMatt Woodson2015-12-042-38/+67
| |\| | | | | | | | | | |_|_|_|_|_|_|/ | |/| | | | | | | added pv checks; added trigger dependencies
| | * | | | | | | zabbix: removed ethernet graphsMatt Woodson2015-12-041-12/+0
| | | | | | | | |
| | * | | | | | | Zabbix: added trigger dependencies to certain master checksMatt Woodson2015-12-041-26/+37
| | | | | | | | |