summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'BZ1308440' of https://github.com/smunilla/openshift-ansibleBrenton Leanhardt2016-02-241-3/+6
|\
| * a-o-i: Double safety check on master_lbSamuel Munilla2016-02-241-2/+3
| * a-o-i: Better method for identifying master_lbSamuel Munilla2016-02-241-1/+3
* | Automatic commit of package [openshift-ansible] release [3.0.46-1].Brenton Leanhardt2016-02-232-2/+5
* | Merge branch 'BZ1308440' of https://github.com/smunilla/openshift-ansibleBrenton Leanhardt2016-02-231-1/+1
|\|
| * a-o-i: Exception checking around master_lbSamuel Munilla2016-02-231-1/+1
* | 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_lbSamuel Munilla2016-02-191-8/+17
* | Merge pull request #1461 from mmahut/etcdMarek Mahut2016-02-221-5/+0
|\ \
| * | 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/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.Andrew Butcher2016-02-191-2/+2
* | | Merge pull request #1449 from detiber/fixVersionCheckBrenton Leanhardt2016-02-191-1/+1
|\ \ \ | |_|/ |/| |
| * | 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 linesSamuel Munilla2016-02-163-11/+20
* | | Merge pull request #1439 from xlr-8/masterStefanie Forrester2016-02-181-1/+6
|\ \ \
| * | | Rename variable to delete temporary file, add configurable path.Hugo Rosnet2016-02-181-3/+4
| * | | Add extra parameters for S3 registry: delete file, create bucket.Hugo Rosnet2016-02-181-0/+4
* | | | Merge pull request #1440 from sdodson/containerized-efkBrenton Leanhardt2016-02-181-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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 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 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 with ma...Joel Diaz2016-02-161-1/+3
* | | | 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 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 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
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Add default to state paramRussell Harrison2016-02-161-1/+1
| * | | | | Add type to record_type paramRussell Harrison2016-02-161-1/+1
| * | | | | Add types to module paramsRussell Harrison2016-02-161-3/+3
| * | | | | Adding examples to the dyn_record moduleRussell Harrison2016-02-161-0/+20
* | | | | | Merge pull request #1416 from joelddiaz/registry-pingJoel Diaz2016-02-161-0/+6
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * / / / add item to track docker-registry pingsJoel Diaz2016-02-161-0/+6
|/ / / /
* | | | Merge pull request #1409 from brenton/bz1308411Brenton Leanhardt2016-02-162-38/+38
|\ \ \ \
| * | | | Handle case where the user already had access to the sccBrenton Leanhardt2016-02-161-2/+5
| * | | | Refactoring the add-scc-to-user logicBrenton Leanhardt2016-02-162-38/+35
| | |/ / | |/| |
* | | | Merge pull request #1410 from abutcher/docker-scaleupBrenton Leanhardt2016-02-161-0/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Apply openshift_docker to nodes during scaleup.Andrew Butcher2016-02-161-0/+10
| | |/ | |/|
* | | Merge pull request #1387 from talset/atomic_uninstallBrenton Leanhardt2016-02-161-0/+7
|\ \ \
| * | | Change etcd deamon name for atomic-hosttalset2016-02-131-0/+7