summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add correct parsing of ec2_security_groups env variableDavid Mat2016-02-231-10/+5
|
* Merge pull request #1471 from twiest/prThomas Wiest2016-02-231-3/+3
|\ | | | | changed oso_host_monitoring to use the oo_ vars
| * changed oso_host_monitoring to use the oo_ varsThomas Wiest2016-02-231-3/+3
|/
* Merge pull request #1337 from abutcher/master-scaleupBrenton Leanhardt2016-02-2221-131/+368
|\ | | | | Support for adding new masters
| * Add openshift_docker roles to master/node scaleup.Andrew Butcher2016-02-162-12/+20
| |
| * Fail when master.master_count descreases or master.ha changes.Andrew Butcher2016-02-161-5/+9
| |
| * Protected facts.Andrew Butcher2016-02-161-20/+89
| |
| * Add modify_yaml module.Andrew Butcher2016-02-162-3/+98
| |
| * Re-arrange scaleup playbooks.Andrew Butcher2016-02-169-3/+23
| |
| * Move additional master configuration into a separate master playbook.Andrew Butcher2016-02-1610-92/+84
| |
| * Generate each master's certificates separately.Andrew Butcher2016-02-163-37/+9
| |
| * Add new_masters to scaleup playbook.Andrew Butcher2016-02-168-16/+93
| |
* | Merge pull request #1465 from detiber/gitignore_ansible_cfgBrenton Leanhardt2016-02-221-0/+1
|\ \ | | | | | | Add ansible.cfg to .gitignore
| * | Add ansible.cfg to .gitignoreJason DeTiberus2016-02-221-0/+1
|/ /
* | Merge pull request #1423 from ↵Brenton Leanhardt2016-02-221-5/+6
|\ \ | | | | | | | | | | | | jdnieto/openstack_add_master_and_infra_to_node_security_group Openstack add master and infra to node security group
| * | added node-secgroup to master_nodesJose David Martin Nieto2016-02-221-5/+6
| | |
* | | Merge pull request #1456 from puiterwijk/aws-fixesBrenton Leanhardt2016-02-221-2/+11
|\ \ \ | | | | | | | | AWS Documentation fixes
| * | | Document setting the VPC subnetPatrick Uiterwijk2016-02-201-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | This is needed because the default instance type requires a VPC. Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
| * | | Update the AMIs used in README_AWSPatrick Uiterwijk2016-02-201-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
* | | | Automatic commit of package [openshift-ansible] release [3.0.45-1].Brenton Leanhardt2016-02-222-2/+19
| | | |
* | | | Merge pull request #1450 from smunilla/BZ1308440Brenton Leanhardt2016-02-221-8/+17
|\ \ \ \ | | | | | | | | | | a-o-i: Redo logic for detecting master_lb
| * | | | a-o-i: Redo logic for detecting master_lbSamuel Munilla2016-02-191-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After much research and debugging, it turns out the facts for nativeha hosts were much less consistent than I hoped. With this newfound knowledge, I've implemented this method. In short, you check with the first master to see what it thinks the master_lb is, then you include that host as "installed".
* | | | | Merge pull request #1461 from mmahut/etcdMarek Mahut2016-02-221-5/+0
|\ \ \ \ \ | | | | | | | | | | | | Do not monitor for etcd watchers
| * | | | | Do not monitor for etcd watchersMarek Mahut2016-02-221-5/+0
|/ / / / /
* | | | | Merge pull request #1452 from joelddiaz/master-registry-itemsJoel Diaz2016-02-191-20/+0
|\ \ \ \ \ | | |/ / / | |/| | | remove old master registry item/triggers
| * | | | remove old master registry item/triggersJoel Diaz2016-02-191-20/+0
|/ / / /
* | | | Merge pull request #1442 from abutcher/pv-failed-whenBrenton Leanhardt2016-02-191-2/+2
|\ \ \ \ | | | | | | | | | | Fix pv/c creation failed_when condition
| * | | | Fix pv/c creation failed_when.Andrew Butcher2016-02-191-2/+2
| | | | |
* | | | | Merge pull request #1449 from detiber/fixVersionCheckBrenton Leanhardt2016-02-191-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Fix 1.2 version check
| * | | | Fix 1.2 version checkJason DeTiberus2016-02-191-1/+1
|/ / / /
* | | | Merge pull request #1411 from smunilla/pylint_16_feb_2016Brenton Leanhardt2016-02-193-11/+20
|\ \ \ \ | | | | | | | | | | a-o-i: pylint fixes related to too-long lines
| * | | | a-o-i: pylint fixes related to too-long linesSamuel Munilla2016-02-163-11/+20
| | | | |
* | | | | Merge pull request #1439 from xlr-8/masterStefanie Forrester2016-02-181-1/+6
|\ \ \ \ \ | | | | | | | | | | | | Add extra parameters for S3 registry: delete file, create bucket.
| * | | | | Rename variable to delete temporary file, add configurable path.Hugo Rosnet2016-02-181-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The variable's name for deleting the temporary file was a bit missleading, so it has been renamed to be more explicit. While the path was hardcoded in /root/, which could be problematic when the playbook is not run as run.
| * | | | | Add extra parameters for S3 registry: delete file, create bucket.Hugo Rosnet2016-02-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It would be nice to have options to be able to: * Delete or not the temporary config file - so that it can be check/modified directly * Create or not the bucket, as you might not have the right to do so This commit allows both of those things, without changing the default behavior of the playbook.
* | | | | | Merge pull request #1440 from sdodson/containerized-efkBrenton Leanhardt2016-02-181-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Add /var/log to containerized node mounts
| * | | | | Add /var/log to containerized node mountsScott Dodson2016-02-181-1/+1
| |/ / / /
* | | | | Merge pull request #1432 from sdodson/bz1302513Brenton Leanhardt2016-02-182-0/+9
|\ \ \ \ \ | |/ / / / |/| | | | Don't make config files world readable
| * | | | Don't make config files world readableScott Dodson2016-02-172-0/+9
|/ / / /
* | | | Merge pull request #1427 from rharrison10/rharriso/dynRussell Harrison2016-02-171-1/+1
|\ \ \ \ | | | | | | | | | | Fix requiring state and providing a default
| * | | | Fix requiring state and providing a defaultRussell Harrison2016-02-171-1/+1
| | | | |
* | | | | Merge pull request #1415 from joelddiaz/host-mon-registryJoel Diaz2016-02-171-1/+3
|\ \ \ \ \ | | | | | | | | | | | | bind in /etc/origin/node for non-master monitoring to be able to talk…
| * | | | | bind in /etc/origin/node for non-master monitoring to be able to talk with ↵Joel Diaz2016-02-161-1/+3
| | |_|/ / | |/| | | | | | | | | | | | | master
* | | | | Automatic commit of package [openshift-ansible] release [3.0.44-1].Brenton Leanhardt2016-02-172-2/+7
| | | | |
* | | | | Merge pull request #1425 from smunilla/BZ1308440Brenton Leanhardt2016-02-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | a-o-i: Change method for counting master_lb as installed
| * | | | | a-o-i: Change method for counting master_lb as installedSamuel Munilla2016-02-171-1/+1
| | | | | |
* | | | | | Merge pull request #1426 from joelddiaz/registry-node-itemsJoel Diaz2016-02-171-2/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | create registry items/triggers under Openshift Node
| * | | | | | create registry items/triggers under Openshift NodeJoel Diaz2016-02-171-2/+18
| | | | | | |
* | | | | | | Automatic commit of package [openshift-ansible] release [3.0.43-1].Brenton Leanhardt2016-02-162-2/+14
| | | | | | |
* | | | | | | Merge pull request #1417 from rharrison10/rharriso/dynRussell Harrison2016-02-161-5/+25
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | Adding examples to the dyn_record module