| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | changed multi_ec2.py to print the json result string instead of the python pr... | Thomas Wiest | 2014-12-18 | 4 | -13/+10 |
|/ |
|
* | Merge pull request #38 from kwoodson/default_env | Kenny Woodson | 2014-12-18 | 1 | -8/+30 |
|\ |
|
| * | Variable-ized the config file path with the name. | Kenny Woodson | 2014-12-18 | 1 | -1/+1 |
| * | Added default environment behavoir for aws credentials | Kenny Woodson | 2014-12-18 | 1 | -8/+30 |
|/ |
|
* | Merge pull request #37 from twiest/pr | Thomas Wiest | 2014-12-15 | 1 | -2/+2 |
|\ |
|
| * | minor bug fix | Thomas Wiest | 2014-12-15 | 1 | -2/+2 |
|/ |
|
* | Merge pull request #36 from twiest/pr | Thomas Wiest | 2014-12-15 | 58 | -1035/+71 |
|\ |
|
| * | changed atomic proxy to use pre-built container images | Thomas Wiest | 2014-12-15 | 58 | -1035/+71 |
|/ |
|
* | Merge pull request #35 from liangxia/master | Thomas Wiest | 2014-12-15 | 1 | -1/+1 |
|\ |
|
| * | suppress error unbound variable | liangxia | 2014-12-15 | 1 | -1/+1 |
* | | Merge pull request #34 from kwoodson/meta_inventory | Kenny Woodson | 2014-12-15 | 3 | -0/+213 |
|\ \
| |/
|/| |
|
| * | Updated the function name to accurately reflect its procedure. | Kenny Woodson | 2014-12-12 | 1 | -3/+3 |
| * | Updated merge function to merge recursively | Kenny Woodson | 2014-12-12 | 2 | -24/+37 |
| * | Fixed naming for chache file. | Kenny Woodson | 2014-12-12 | 1 | -1/+1 |
| * | In order to agree with previous renaming these naming changes were made. | Kenny Woodson | 2014-12-12 | 3 | -2/+2 |
| * | Updated with the class name. | Kenny Woodson | 2014-12-12 | 1 | -2/+2 |
| * | Updated name to multi_ec2 instead of meta. | Kenny Woodson | 2014-12-12 | 2 | -0/+1 |
| * | First version of meta inventory. | Kenny Woodson | 2014-12-12 | 3 | -0/+199 |
* | | Merge pull request #32 from akram/master | Thomas Wiest | 2014-12-12 | 9 | -8/+245 |
|\ \
| |/
|/| |
|
| * | Adding AWS support to openshift-ansible module | Akram Ben Aissi | 2014-12-12 | 9 | -8/+245 |
|/ |
|
* | Merge pull request #28 from maxamillion/admiller/fix_cluster_sh | Thomas Wiest | 2014-11-13 | 1 | -1/+1 |
|\ |
|
| * | short-term fix up for cluster.sh supported environment tags | Adam Miller | 2014-11-11 | 1 | -1/+1 |
* | | Merge pull request #31 from twiest/pr | Thomas Wiest | 2014-11-13 | 1 | -0/+3 |
|\ \ |
|
| * | | added libra_ops group to puppet container | Thomas Wiest | 2014-11-13 | 1 | -0/+3 |
|/ / |
|
* | | Merge pull request #30 from jwhonce/wip/qe | Jhon Honce | 2014-11-13 | 2 | -2/+2 |
|\ \ |
|
| * | | Add lint environment tag for QE | Jhon Honce | 2014-11-13 | 2 | -2/+2 |
|/ / |
|
* | | Merge pull request #29 from twiest/pr | Thomas Wiest | 2014-11-12 | 3 | -6/+9 |
|\ \
| |/
|/| |
|
| * | made ops-ctl-haproxy work inside of the proxy container. | Thomas Wiest | 2014-11-12 | 2 | -2/+9 |
| * | removed zbxapi workaround as it's no longer needed | Thomas Wiest | 2014-11-11 | 1 | -4/+0 |
|/ |
|
* | Merge pull request #27 from twiest/pr | Kenny Woodson | 2014-11-04 | 7 | -3/+17 |
|\ |
|
| * | making atomic proxy be able to be deployed to PROD. | Thomas Wiest | 2014-11-03 | 7 | -3/+17 |
|/ |
|
* | Merge pull request #26 from jwhonce/wip/lastest | Thomas Wiest | 2014-11-03 | 1 | -8/+6 |
|\ |
|
| * | Update docs | Jhon Honce | 2014-11-03 | 1 | -8/+6 |
|/ |
|
* | Merge pull request #25 from tdawson/2014-10/fix-docs | Thomas Wiest | 2014-10-31 | 1 | -7/+12 |
|\ |
|
| * | Fixing up GCE README | Troy Dawson | 2014-10-31 | 1 | -0/+1 |
| * | Fixing up GCE README | Troy Dawson | 2014-10-31 | 1 | -7/+11 |
|/ |
|
* | Merge pull request #24 from twiest/pr | Thomas Wiest | 2014-10-31 | 4 | -4/+4 |
|\ |
|
| * | updated docs to have better setup instructions, fixed minor bugs, added | Thomas Wiest | 2014-10-31 | 4 | -4/+4 |
|/ |
|
* | Merge pull request #23 from twiest/pr | Thomas Wiest | 2014-10-30 | 3 | -17/+8 |
|\ |
|
| * | fixed cluster.sh to only run minion and master creation once, and to use -c i... | Thomas Wiest | 2014-10-30 | 3 | -17/+8 |
|/ |
|
* | Merge pull request #22 from twiest/pr | Thomas Wiest | 2014-10-30 | 18 | -355/+27 |
|\ |
|
| * | cleaned up unused GCE host types, changed back to using gce.ini, and added a ... | Thomas Wiest | 2014-10-30 | 18 | -355/+27 |
|/ |
|
* | Merge pull request #21 from twiest/doc_updates | Thomas Wiest | 2014-10-30 | 1 | -1/+10 |
|\ |
|
| * | Documentation updates | Thomas Wiest | 2014-10-30 | 1 | -1/+10 |
|/ |
|
* | Merge pull request #20 from twiest/pr | Thomas Wiest | 2014-10-29 | 7 | -89/+0 |
|\ |
|
| * | removed shutdown_nightly from atomic proxy hosts | Thomas Wiest | 2014-10-29 | 7 | -89/+0 |
|/ |
|
* | Merge pull request #19 from twiest/remove_project_info | Thomas Wiest | 2014-10-29 | 3 | -53/+22 |
|\ |
|
| * | removed gce.ini and instead added instructions for setting up secrets.py | Thomas Wiest | 2014-10-29 | 3 | -53/+22 |
|/ |
|
* | Merge pull request #18 from twiest/pr | Thomas Wiest | 2014-10-29 | 52 | -0/+981 |
|\ |
|
| * | Added Docker image build stuff | Thomas Wiest | 2014-10-29 | 52 | -0/+981 |
|/ |
|