summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #53 from twiest/atomicThomas Wiest2015-02-0515-88/+106
|\ | | | | Changed os2-atomic-proxy to be able to launch inside of both a vpc and classic. Changed STG to default to launching in a vpc, prod still launches in classic. Also cleaned up some cruft.
| * changed os2-atomic-proxy to be able to launch inside of both a vpc and ↵Thomas Wiest2015-02-052-2/+37
| | | | | | | | classic. Changed STG to default to launching in a vpc, prod still launches in classic.
| * removed ignore_bug_6407 as that bug has now been fixed by ansible.Thomas Wiest2015-02-053-12/+0
| |
| * removed the usage of yaml '>' for multiline entries and replaced them with ↵Thomas Wiest2015-02-0510-74/+69
|/ | | | yaml dictionaries as demonstrated by the ansible documentation.
* Merge pull request #52 from pravisankar/cluster-config-optsJhon Honce2015-02-042-12/+35
|\ | | | | Bug 1163631 - Make master/minion playbook configurable in cluster.sh
| * Bug 1163631 - Make master/minion playbook configurable in cluster.shRavi Sankar Penta2015-02-042-12/+35
|/ | | | Now config options can take both short and long notations.
* Merge pull request #51 from calfonso/bz1174620Jhon Honce2015-02-041-0/+1
|\ | | | | Adding a more informative message if no supported environments are found...
| * Adding a more informative message if no supported environments are found.Chris Alfonso2015-02-031-0/+1
| |
* | Merge pull request #50 from calfonso/bz1174620Jhon Honce2015-02-031-1/+1
|\| | | | | BZ1174620 - Show grep error of no such file when upper case provider..
| * BZ1174620 - Show grep error of no such file when upper case provider..Chris Alfonso2015-02-031-1/+1
|/ | | | * This patch just silences grep errors
* Merge pull request #49 from kwoodson/filtersKenny Woodson2015-01-291-3/+12
|\ | | | | Adding filtering capabilities to oo_select ansible filtering.
| * Add filters to oo_collect filter so that we can pick and choose what we want ↵Kenny Woodson2015-01-291-3/+12
|/ | | | to receive back based on more than a single attribute.
* Merge pull request #45 from jwhonce/wip/pod_updatesJhon Honce2015-01-099-8/+10
|\ | | | | Infrastructure - Update pod definitions
| * Infrastructure - Update pod definitionsJhon Honce2015-01-099-8/+10
|/ | | | * Bring pod definitions in line with lates k8s release
* Merge pull request #44 from kwoodson/add_multi_testsKenny Woodson2014-12-181-0/+28
|\ | | | | Add multi tests
| * Merge branch 'master' into add_multi_testsKenny Woodson2014-12-181-0/+4
| |\ | |/ |/|
* | 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.
| * Updated with more testsKenny Woodson2014-12-181-0/+28
|/
* 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
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 05:27:18 +0000