summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2267 from Jmainguy/build_md_liesScott Dodson2016-08-081-2/+2
|\
| * BUILD.md liesJonathan Mainguy2016-08-081-2/+2
|/
* Merge pull request #2266 from abutcher/v2-callbacksAndrew Butcher2016-08-083-25/+31
|\
| * Convert ansible facts callback to v2.Andrew Butcher2016-08-083-25/+31
* | Automatic commit of package [openshift-ansible] release [3.3.8-1].Troy Dawson2016-08-082-2/+6
* | Merge pull request #2265 from jmferrer/masterScott Dodson2016-08-083-3/+3
|\ \ | |/ |/|
| * Fix little mistake in openshift_master_htpasswd_users value .jmferrer2016-08-083-3/+3
|/
* Automatic commit of package [openshift-ansible] release [3.3.7-1].Troy Dawson2016-08-052-2/+16
* Merge pull request #2260 from abutcher/new-master-lbScott Dodson2016-08-051-0/+2
|\
| * Call relocated openshift-loadbalancer playbook in master scaleup.Andrew Butcher2016-08-041-0/+2
* | Merge pull request #2259 from abutcher/fix-ca-checkScott Dodson2016-08-051-2/+1
|\ \
| * | [openshift_ca] correct check for missing CA.Andrew Butcher2016-08-041-2/+1
| |/
* | Merge pull request #2257 from smunilla/ose_rename_to_oscpScott Dodson2016-08-041-1/+1
|\ \ | |/ |/|
| * a-o-i: Rename OSE in Install MenuSamuel Munilla2016-08-041-1/+1
|/
* Merge pull request #2255 from abutcher/hosted-knobsScott Dodson2016-08-033-0/+15
|\
| * Add knobs for disabling router/registry management.Andrew Butcher2016-08-033-0/+15
* | Merge pull request #2238 from sdodson/no-network-pluginAndrew Butcher2016-08-031-2/+2
|\ \
| * | Don't set a networkPluginName in 3.3 installsScott Dodson2016-07-291-2/+2
* | | Merge pull request #2254 from smunilla/arbitrary_deployment_varsScott Dodson2016-08-031-13/+11
|\ \ \ | |_|/ |/| |
| * | a-o-i: Allow Arbitrary Deployment VariablesSamuel Munilla2016-08-031-13/+11
* | | Merge pull request #2049 from abutcher/named-certificatesScott Dodson2016-08-0320-80/+239
|\ \ \
| * | | Add options for specifying named ca certificates to be added to the openshift...Andrew Butcher2016-08-0120-72/+215
| * | | oo_collect can be ran against dicts where key isn't present.Andrew Butcher2016-08-011-9/+24
* | | | Merge pull request #2252 from abutcher/etcd-imageScott Dodson2016-08-031-0/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | Restore missing etcd_image fact.Andrew Butcher2016-08-031-0/+5
|/ / /
* | | Automatic commit of package [openshift-ansible] release [3.3.6-1].Troy Dawson2016-08-032-2/+7
* | | Merge pull request #2243 from smunilla/BZ1359427Scott Dodson2016-08-032-5/+9
|\ \ \
| * | | a-o-i: Fix broken uninstallSamuel Munilla2016-08-022-5/+9
* | | | Merge pull request #2250 from abutcher/hosted-nodesScott Dodson2016-08-022-4/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Rename router and registry node list variables.Andrew Butcher2016-08-022-4/+4
|/ / /
* | | Merge pull request #1953 from abutcher/etcd-certificatesScott Dodson2016-08-0223-406/+638
|\ \ \ | |/ / |/| |
| * | Refactor etcd certificates roles.Andrew Butcher2016-08-0223-406/+638
|/ /
* | Automatic commit of package [openshift-ansible] release [3.3.5-1].Troy Dawson2016-08-012-2/+16
* | Merge pull request #2242 from smunilla/BZ1358101Scott Dodson2016-08-012-34/+5
|\ \
| * | a-o-i: Remove AEP, OSE 3.0, and OSE 3.2 choicesSamuel Munilla2016-07-302-34/+5
* | | Merge pull request #2240 from abutcher/roles-to-playbooksScott Dodson2016-08-016-79/+102
|\ \ \
| * | | Move role dependencies to playbooks.Andrew Butcher2016-07-296-79/+102
| | |/ | |/|
* | | Merge pull request #2245 from finiteloopme/install-issue2244Scott Dodson2016-08-011-0/+2
|\ \ \ | |_|/ |/| |
| * | Update for issue#2244Kunal Limaye2016-08-011-1/+2
| * | Update for issue-2244Kunal Limaye2016-08-011-1/+2
|/ /
* | Merge pull request #2239 from smunilla/inventory_write_improvementsScott Dodson2016-07-293-72/+49
|\ \
| * | a-o-i: Better inventory group handlingSamuel Munilla2016-07-293-72/+49
| |/
* | Merge pull request #2237 from sdodson/dot-netScott Dodson2016-07-295-5/+84
|\ \ | |/ |/|
| * Fix xpaas_templates_baseScott Dodson2016-07-291-2/+5
| * Add dotnet image stream to enterprise installsScott Dodson2016-07-295-3/+79
|/
* Merge pull request #2218 from sdodson/image-stream-syncScott Dodson2016-07-29108-1127/+5249
|\
| * Remove old sso70-basic templatesScott Dodson2016-07-261-0/+12
| * xPaaS v1.3.2 releaseScott Dodson2016-07-26107-1127/+5237
* | Merge pull request #2236 from maxamillion/fedoraScott Dodson2016-07-291-1/+1
|\ \
| * | update bootstrap-fedora playbook with new python crypto depsAdam Miller2016-07-281-1/+1