summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'int' into stgTroy Dawson2015-05-2126-520/+1014
|\
| * Merge branch 'master' into intTroy Dawson2015-05-2126-520/+1014
| |\
| | * Merge pull request #239 from tdawson/201505UpdateAMITroy Dawson2015-05-214-4/+4
| | |\ | | | | | | | | Update online ami image
| | | * Update online ami imageTroy Dawson2015-05-214-4/+4
| | | |
| | * | Merge pull request #238 from detiber/skydnsPortFixThomas Wiest2015-05-211-1/+4
| | |\ \ | | | |/ | | |/| openshift_master open port for skydns service
| | | * openshift_master open port for skydns serviceJason DeTiberus2015-05-201-1/+4
| | | |
| | * | Merge pull request #235 from detiber/awsNoPublicWesley Hearn2015-05-211-5/+5
| | |\ \ | | | | | | | | | | Guard against missing aws metadata for hostnames/ips
| | | * | Guard against missing aws metadata for hostnames/ipsJason DeTiberus2015-05-201-5/+5
| | | |/
| | * | Merge pull request #237 from detiber/ansibleVerCheckThomas Wiest2015-05-211-0/+6
| | |\ \ | | | | | | | | | | Verify ansible is greater than 1.8.0 and not 1.9.0
| | | * | Verify ansible is greater than 1.8.0 and not 1.9.0Jason DeTiberus2015-05-201-0/+6
| | | |/
| | * | Merge pull request #236 from detiber/byoMasterFixThomas Wiest2015-05-211-0/+2
| | |\ \ | | | | | | | | | | BYO playbook fix
| | | * | BYO playbook fixJason DeTiberus2015-05-201-0/+2
| | | |/ | | | | | | | | | | | | | | | | - Fix bug where playbooks/byo/config.yml would error if only a master is defined in the inventory.
| | * | Revert "oo_filters.py: oo_set_node_label"Wesley Hearn2015-05-201-34/+1
| | | | | | | | | | | | | | | | This reverts commit d04ddc76227db51fda8b1850a09a9c3cfd9125db.
| | * | Revert "Initial add of openshift_master_post"Wesley Hearn2015-05-206-205/+0
| | | | | | | | | | | | | | | | This reverts commit 294f2254b818c466ecf7ab71426a08b6dc99f89c.
| | * | Revert "Made a generic set_attr and set_attrs function to reduce dup code"Wesley Hearn2015-05-202-87/+32
| | | | | | | | | | | | | | | | This reverts commit 4da7b790d5eb8e870bd81208f7074bba81a0989b.
| | * | Made a generic set_attr and set_attrs function to reduce dup codeWesley Hearn2015-05-202-32/+87
| | | |
| | * | Initial add of openshift_master_postWesley Hearn2015-05-206-0/+205
| | | |
| | * | oo_filters.py: oo_set_node_labelWesley Hearn2015-05-201-1/+34
| | |/
| | * Merge pull request #232 from kwoodson/changesKenny Woodson2015-05-191-14/+0
| | |\ | | | | | | | | Removed destination format.
| | | * Removing destination formatKenny Woodson2015-05-191-14/+0
| | |/
| | * Merge pull request #230 from kwoodson/nocowsThomas Wiest2015-05-183-7/+12
| | |\ | | | | | | | | Disabling cows and refactor of config options to ansible.cfg.
| | | * Updating ansible config through a separate config.ymlKenny Woodson2015-05-183-7/+12
| | |/
| | * Automatic commit of package [openshift-ansible-bin] release [0.0.17-1].Thomas Wiest2015-05-152-2/+5
| | |
| | * Merge pull request #229 from twiest/prThomas Wiest2015-05-152-6/+7
| | |\ | | | | | | | | fixed the openshift-ansible-bin build
| | | * fixed the openshift-ansible-bin buildThomas Wiest2015-05-152-6/+7
| | |/
| | * Automatic commit of package [openshift-ansible-inventory] release [0.0.7-1].Kenny Woodson2015-05-152-2/+5
| | |
| | * Automatic commit of package [openshift-ansible-bin] release [0.0.16-1].Kenny Woodson2015-05-152-2/+5
| | |
| | * Automatic commit of package [openshift-ansible-bin] release [0.0.15-1].Kenny Woodson2015-05-152-2/+5
| | |
| | * Automatic commit of package [openshift-ansible-bin] release [0.0.14-1].Thomas Wiest2015-05-152-2/+5
| | |
| | * Merge pull request #228 from twiest/prThomas Wiest2015-05-151-1/+1
| | |\ | | | | | | | | Fixed openshift-ansible-bin rpm build
| | | * Fixed openshift-ansible-bin rpm buildThomas Wiest2015-05-151-1/+1
| | |/
| | * Merge pull request #227 from kwoodson/ec2_libraryKenny Woodson2015-05-145-55/+11
| | |\ | | | | | | | | Update to call multi_ec2 as library for command line tools.
| | | * Command line tools import multi_ec2 as libKenny Woodson2015-05-145-55/+11
| | |/
| | * Merge pull request #226 from kwoodson/hostvarsKenny Woodson2015-05-141-0/+7
| | |\ | | | | | | | | Added ability to group by hostvars specified in yaml.
| | | * Added ability to create groupby options on hostvarsKenny Woodson2015-05-141-0/+7
| | |/
| | * Merge pull request #225 from kwoodson/multi_ec2_libKenny Woodson2015-05-141-12/+27
| | |\ | | | | | | | | multi_ec2 can be called as a library
| | | * Making multi_ec2 into a libraryKenny Woodson2015-05-141-12/+27
| | |/
| | * Automatic commit of package [openshift-ansible-inventory] release [0.0.6-1].Thomas Wiest2015-05-132-2/+5
| | |
| | * Merge pull request #224 from kwoodson/multi_ec2_fixKenny Woodson2015-05-132-17/+53
| | |\ | | | | | | | | Added group option to multi_ec2. Also tmp file removal fix.
| | | * Added support for grouping and a bug fix.Kenny Woodson2015-05-132-17/+53
| | |/
| | * Merge pull request #223 from kwoodson/multi_ec2_iniThomas Wiest2015-05-131-0/+7
| | |\ | | | | | | | | Added option to use alternate ec2.ini.
| | | * Added options for separate ec2.ini filesKenny Woodson2015-05-131-0/+7
| | |/
| | * Automatic commit of package [openshift-ansible-inventory] release [0.0.5-1].Thomas Wiest2015-05-122-2/+7
| | |
| | * Merge pull request #222 from twiest/prThomas Wiest2015-05-121-2/+1
| | |\ | | | | | | | | removed ec2.ini from the openshift-ansible-inventory.spec file so that we're not dictating what the ec2.ini file should look like.
| | | * removed ec2.ini from the openshift-ansible-inventory.spec file so that we're ↵Thomas Wiest2015-05-121-2/+1
| | |/ | | | | | | | | | not dictating what the ec2.ini file should look like.
| | * Merge pull request #221 from kwoodson/ec2_iniKenny Woodson2015-05-122-21/+63
| | |\ | | | | | | | | Added option to use alternate ec2.ini.
| | | * Added capability to pass in ec2.ini file.Kenny Woodson2015-05-122-21/+63
| | |/
| | * Merge pull request #220 from kwoodson/global_configKenny Woodson2015-05-114-13/+36
| | |\ | | | | | | | | Adding cache location for multi ec2.
| | | * Adding cache location for multi ec2Kenny Woodson2015-05-114-13/+36
| | | |
| | * | Merge pull request #218 from twiest/prThomas Wiest2015-05-081-0/+0
| | |\ \ | | | |/ | | |/| renamed ansible.cfg to ansible.cfg.example to avoid ansible accidentally picking this up as it's config file.