summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into upgrade33Devan Goodwin2016-06-1016-74/+233
|\
| * Merge pull request #2007 from bachp/lowercase-proxy-varsScott Dodson2016-06-092-0/+12
| |\
| | * Add lower case proxy variablesPascal Bach2016-06-092-0/+12
| * | Merge pull request #2013 from sdodson/masterScott Dodson2016-06-092-2/+20
| |\ \
| | * | Automatic commit of package [openshift-ansible] release [3.3.0-1].Scott Dodson2016-06-092-2/+20
| |/ /
| * | Merge pull request #2005 from brenton/bz1338726Brenton Leanhardt2016-06-0912-65/+202
| |\ \
| | * \ Merge pull request #1 from dgoodwin/docker1.10Brenton Leanhardt2016-06-093-8/+17
| | |\ \
| | | * | Restore mistakenly reverted code.Devan Goodwin2016-06-093-8/+17
| | |/ /
| | * | Bug 1338726 - never abort install if the latest version of docker is already ...Brenton Leanhardt2016-06-081-1/+1
| | * | Merge branch 'docker1.10' of https://github.com/dgoodwin/openshift-ansibleBrenton Leanhardt2016-06-0714-82/+210
| | |\ \
| | | * | Fix Docker 1.10 problems with empty tags and trailing :Devan Goodwin2016-06-064-7/+11
| | | * | Docker 1.10 UpgradeDevan Goodwin2016-06-0311-75/+199
* | | | | Fix version unset bug, and set common ver fact on containerized nodes.Devan Goodwin2016-06-103-3/+17
* | | | | Fix missing openshift.common.version fact on containerized nodes.Devan Goodwin2016-06-102-0/+5
* | | | | Merge remote-tracking branch 'upstream/master' into upgrade33Devan Goodwin2016-06-0920-50/+213
|\| | | |
| * | | | Merge pull request #2002 from jkhelil/fix_openstack_master_sec_group_dns_entryJason DeTiberus2016-06-091-0/+8
| |\ \ \ \
| | * | | | add skydns port 8053 to openstack master sec groupjawed2016-06-071-0/+8
| | |/ / /
| * | | | Merge pull request #1996 from abutcher/ansible-2.1Andrew Butcher2016-06-082-5/+17
| |\ \ \ \
| | * | | | Ansible 2.1 support.Andrew Butcher2016-06-072-5/+17
| | |/ / /
| * | | | Merge pull request #2004 from abutcher/bz1342995Jason DeTiberus2016-06-087-36/+79
| |\ \ \ \
| | * | | | Add openshift_loadbalancer_facts role to set lb facts prior to running depend...Andrew Butcher2016-06-087-36/+79
| |/ / / /
| * | | | Merge pull request #1964 from sdodson/fix-proxy-smashingScott Dodson2016-06-085-5/+52
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Preserve proxy config if it's undefinedScott Dodson2016-06-072-0/+44
| | * | | At least backup thingsScott Dodson2016-06-071-0/+3
| | * | | Use unique play names to make things easier to debugScott Dodson2016-06-073-5/+5
| * | | | Merge pull request #1994 from jkhelil/fix_dns_openstack_flavorJason DeTiberus2016-06-071-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | fix dns openstack flavor instead of openshift flavorjawed2016-06-071-1/+1
| |/ / /
| * | | Merge pull request #1973 from ibotty/preserve_htpasswdScott Dodson2016-06-062-1/+10
| |\ \ \
| | * | | ensure htpasswd file existsTobias Florek2016-06-061-1/+9
| | * | | Add flag to manage htpasswd, or not.Tobias Florek2016-06-022-1/+2
| * | | | Automatic commit of package [openshift-ansible] release [3.0.97-1].Scott Dodson2016-06-062-2/+46
* | | | | Begin major simplification of 3.2 upgrade.Devan Goodwin2016-06-091-73/+24
* | | | | Respect image tag/pkg version during upgrade.Devan Goodwin2016-06-073-11/+15
* | | | | Force version to latest 3.2 during upgrade.Devan Goodwin2016-06-073-2/+8
* | | | | Verify openshift_release is correct or absent in inventory before upgrade.Devan Goodwin2016-06-071-4/+20
* | | | | Drop unused and broken "when" in vars section.Devan Goodwin2016-06-061-7/+0
* | | | | Do not install rpm for version in openshift_version role.Devan Goodwin2016-06-066-17/+23
* | | | | Merge remote-tracking branch 'upstream/master' into upgrade33Devan Goodwin2016-06-0662-289/+3620
|\| | | |
| * | | | Merge pull request #1984 from sdodson/issue1966Jason DeTiberus2016-06-031-75/+69
| |\ \ \ \
| | * | | | Only run node specific bits on nodesScott Dodson2016-06-031-75/+69
| |/ / / /
| * | | | Merge pull request #1983 from openshift/logging_fixJason DeTiberus2016-06-031-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Update main.yamlJason DeTiberus2016-06-031-1/+1
| |/ / /
| * | | Merge pull request #1979 from dumdan/issue_1970Jason DeTiberus2016-06-031-2/+2
| |\ \ \
| | * | | Hardcoded values in "launch_instances" - isue # 1970Daniel Dumitriu2016-06-031-2/+2
| |/ / /
| * | | Merge pull request #1976 from abutcher/default-log-driverJason DeTiberus2016-06-034-11/+6
| |\ \ \
| | * | | Configure default docker logging options.Andrew Butcher2016-06-024-11/+6
| | |/ /
| * | | Merge pull request #1977 from sdodson/image-stream-syncJason DeTiberus2016-06-0237-141/+3443
| |\ \ \
| | * | | XPAAS v1.3.1 content for Origin 1.1 / OSE 3.1Scott Dodson2016-06-0218-70/+1721
| | * | | XPAAS v1.3.1 release for Origin 1.2 / OSE 3.2Scott Dodson2016-06-0219-71/+1722
| * | | | Merge pull request #1975 from sdodson/issue1972Jason DeTiberus2016-06-021-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 11:58:17 +0000