summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #43 from twiest/prKenny Woodson2014-12-181-0/+4
|\ | | | | fixed bug in multi_ec2.py where it was only allowing relatively path'd providers if you ran multi_ec2.py from the inventory directory.
| * fixed bug in multi_ec2.py where it was only allowing relatively path'd ↵Thomas Wiest2014-12-181-0/+4
|/ | | | providers if you ran multi_ec2.py from the inventory directory.
* Merge pull request #42 from kwoodson/testKenny Woodson2014-12-184-4/+88
|\ | | | | Adding unittests for multi_ec2.
| * unittest for merge_destructively. More to comeKenny Woodson2014-12-184-4/+88
|/ | | | | | | | Added a readme so its obvious how to run tests Leaving this alone. Getting cleaned up in next PR Fixing space
* Merge pull request #39 from twiest/prThomas Wiest2014-12-184-13/+10
|\ | | | | changed multi_ec2.py to print the json result string instead of the python pretty print string.
| * changed multi_ec2.py to print the json result string instead of the python ↵Thomas Wiest2014-12-184-13/+10
|/ | | | pretty print string.
* Merge pull request #38 from kwoodson/default_envKenny Woodson2014-12-181-8/+30
|\ | | | | Adding default aws credentials when calling mutli_ec2
| * Variable-ized the config file path with the name.Kenny Woodson2014-12-181-1/+1
| |
| * Added default environment behavoir for aws credentialsKenny Woodson2014-12-181-8/+30
|/
* Merge pull request #37 from twiest/prThomas Wiest2014-12-151-2/+2
|\ | | | | minor bug fix
| * minor bug fixThomas Wiest2014-12-151-2/+2
|/
* Merge pull request #36 from twiest/prThomas Wiest2014-12-1558-1035/+71
|\ | | | | changed atomic proxy to use pre-built container images
| * changed atomic proxy to use pre-built container imagesThomas Wiest2014-12-1558-1035/+71
|/
* Merge pull request #35 from liangxia/masterThomas Wiest2014-12-151-1/+1
|\ | | | | suppress error unbound variable
| * suppress error unbound variableliangxia2014-12-151-1/+1
| |
* | Merge pull request #34 from kwoodson/meta_inventoryKenny Woodson2014-12-153-0/+213
|\ \ | |/ |/| Adding a meta inventory to query multiple cloud accounts.
| * Updated the function name to accurately reflect its procedure.Kenny Woodson2014-12-121-3/+3
| |
| * Updated merge function to merge recursivelyKenny Woodson2014-12-122-24/+37
| |
| * Fixed naming for chache file.Kenny Woodson2014-12-121-1/+1
| |
| * In order to agree with previous renaming these naming changes were made.Kenny Woodson2014-12-123-2/+2
| |
| * Updated with the class name.Kenny Woodson2014-12-121-2/+2
| |
| * Updated name to multi_ec2 instead of meta.Kenny Woodson2014-12-122-0/+1
| |
| * First version of meta inventory.Kenny Woodson2014-12-123-0/+199
| |
* | Merge pull request #32 from akram/masterThomas Wiest2014-12-129-8/+245
|\ \ | |/ |/| Adding AWS support to openshift-ansible module
| * Adding AWS support to openshift-ansible moduleAkram Ben Aissi2014-12-129-8/+245
|/ | | | | | | | | | - Update documentation to say that ssh configuration need to point to the private key file - Removing the -p argument when calling time .... because it is misintrepreted by ruby - Turning the cluster.sh to agnostic in its help/error message by replacing explicit reference to GCE by a a variable - Fixing a bug within the playbooks that incorrectly references the minions and master fact group. - Adding playbooks for AWS, which are almost of copy/paste for those of GCE - Added environment variable OO_PROVIDER to allow definition of the provider. Defaults is gce - TODO implement the terminate.yml cookbook
* Merge pull request #28 from maxamillion/admiller/fix_cluster_shThomas Wiest2014-11-131-1/+1
|\ | | | | short-term fix up for cluster.sh supported environment tags
| * short-term fix up for cluster.sh supported environment tagsAdam Miller2014-11-111-1/+1
| |
* | Merge pull request #31 from twiest/prThomas Wiest2014-11-131-0/+3
|\ \ | | | | | | added libra_ops group to puppet container
| * | added libra_ops group to puppet containerThomas Wiest2014-11-131-0/+3
|/ /
* | Merge pull request #30 from jwhonce/wip/qeJhon Honce2014-11-132-2/+2
|\ \ | | | | | | Add lint environment tag for QE
| * | Add lint environment tag for QEJhon Honce2014-11-132-2/+2
|/ /
* | Merge pull request #29 from twiest/prThomas Wiest2014-11-123-6/+9
|\ \ | |/ |/| made ops-ctl-haproxy work inside of the proxy container.
| * made ops-ctl-haproxy work inside of the proxy container.Thomas Wiest2014-11-122-2/+9
| |
| * removed zbxapi workaround as it's no longer neededThomas Wiest2014-11-111-4/+0
|/
* Merge pull request #27 from twiest/prKenny Woodson2014-11-047-3/+17
|\ | | | | making atomic proxy be able to be deployed to PROD.
| * making atomic proxy be able to be deployed to PROD.Thomas Wiest2014-11-037-3/+17
|/
* Merge pull request #26 from jwhonce/wip/lastestThomas Wiest2014-11-031-8/+6
|\ | | | | Update docs
| * Update docsJhon Honce2014-11-031-8/+6
|/
* Merge pull request #25 from tdawson/2014-10/fix-docsThomas Wiest2014-10-311-7/+12
|\ | | | | 2014 10/fix docs
| * Fixing up GCE READMETroy Dawson2014-10-311-0/+1
| |
| * Fixing up GCE READMETroy Dawson2014-10-311-7/+11
|/
* Merge pull request #24 from twiest/prThomas Wiest2014-10-314-4/+4
|\ | | | | updated docs to have better setup instructions, fixed minor bugs, added envs for admiller (amint) and tdawson (tdint).
| * updated docs to have better setup instructions, fixed minor bugs, addedThomas Wiest2014-10-314-4/+4
|/ | | | envs for admiller (amint) and tdawson (tdint).
* Merge pull request #23 from twiest/prThomas Wiest2014-10-303-17/+8
|\ | | | | fixed cluster.sh to only run minion and master creation once, and to use -c if there are multiple needed. Also added nicer output.
| * fixed cluster.sh to only run minion and master creation once, and to use -c ↵Thomas Wiest2014-10-303-17/+8
|/ | | | if there are multiple needed. Also added nicer output.
* Merge pull request #22 from twiest/prThomas Wiest2014-10-3018-355/+27
|\ | | | | cleaned up unused GCE host types, changed back to using gce.ini, and added a better ssh detection on launch.
| * cleaned up unused GCE host types, changed back to using gce.ini, and added a ↵Thomas Wiest2014-10-3018-355/+27
|/ | | | better ssh detection on launch.
* Merge pull request #21 from twiest/doc_updatesThomas Wiest2014-10-301-1/+10
|\ | | | | Documentation updates
| * Documentation updatesThomas Wiest2014-10-301-1/+10
|/
* Merge pull request #20 from twiest/prThomas Wiest2014-10-297-89/+0
|\ | | | | removed shutdown_nightly from atomic proxy hosts
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 15:06:54 +0000