summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix docker 1.10 upgrade on embedded etcd masters.Devan Goodwin2016-06-101-2/+2
| | | | | | | | | | | The tasks were attempting to stop/start etcd, which would be fine on the stop but on start could actually kick the non-containerized etcd service which happens to be layed down even though it's unused. When the service was requested to start again it would claim the port embedded etcd needs and the master would then fail to come up. Instead use the correct etcd_container service.
* Merge pull request #2007 from bachp/lowercase-proxy-varsScott Dodson2016-06-092-0/+12
|\ | | | | Add lower case proxy variables
| * Add lower case proxy variablesPascal Bach2016-06-092-0/+12
| | | | | | | | | | | | | | | | Some applications expect the *_PROXY variables to be lower case. To support this too inject them in addition to the upper case ones. Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Reviewed-by: Fabio Huser <fabio.huser@siemens.com>
* | Merge pull request #2013 from sdodson/masterScott Dodson2016-06-092-2/+20
|\ \ | | | | | | Automatic commit of package [openshift-ansible] release [3.3.0-1].
| * | 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
|\ \ | | | | | | Bug 1338726 - never abort install if the latest version of docker is already installed
| * \ Merge pull request #1 from dgoodwin/docker1.10Brenton Leanhardt2016-06-093-8/+17
| |\ \ | | | | | | | | Restore mistakenly reverted code.
| | * | 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
| | | | | | | | | | | | installed
| * | 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 is no longer tolerant of commands like "docker pull myimage:" when we do not have an image tag in play. Adjust all occurrences with one that only includes the : if a version is defined. Adjust the containerized CLI wrappers for a similar problem.
| | * | Docker 1.10 UpgradeDevan Goodwin2016-06-0311-75/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a separate playbook for Docker 1.10 upgrade that can be run standalone on a pre-existing 3.2 cluster. The upgrade will take each node out of rotation, and remove *all* containers and images on it, as this is reportedly faster and more storage efficient than performing the in place 1.10 upgrade. This process is integrated into the 3.1 to 3.2 upgrade process. Normal config playbooks now become 3.2 only, and require Docker 1.10. Users of older environments will have to use an appropriate openshift-ansible version. Config playbooks no longer are in the business of upgrading or downgrading docker.
* | | | 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 group(needed for 3.2)
| * | | | 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.
| * | | | Ansible 2.1 support.Andrew Butcher2016-06-072-5/+17
| |/ / /
* | | | Merge pull request #2004 from abutcher/bz1342995Jason DeTiberus2016-06-087-36/+79
|\ \ \ \ | | | | | | | | | | Bug 1342995 - Incorrect port opened on loadbalancer host
| * | | | Add openshift_loadbalancer_facts role to set lb facts prior to running ↵Andrew Butcher2016-06-087-36/+79
|/ / / / | | | | | | | | | | | | dependencies.
* | | | Merge pull request #1964 from sdodson/fix-proxy-smashingScott Dodson2016-06-085-5/+52
|\ \ \ \ | |/ / / |/| | | Preserve proxy config if it exists in the sysconfig files but is undefined in our config
| * | | 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 flavor
| * | | 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
|\ \ \ | | | | | | | | Add flag to manage htpasswd, or not.
| * | | ensure htpasswd file existsTobias Florek2016-06-061-1/+9
| | | | | | | | | | | | | | | | Also move file mode to the file-exists check to not specify twice.
| * | | Add flag to manage htpasswd, or not.Tobias Florek2016-06-022-1/+2
| | | | | | | | | | | | | | | | | | | | Setting `openshift_master_manage_htpasswd` falsy will disable managing the htpasswd file. It won't get overwritten/generated.
* | | | Automatic commit of package [openshift-ansible] release [3.0.97-1].Scott Dodson2016-06-062-2/+46
| | | |
* | | | Merge pull request #1984 from sdodson/issue1966Jason DeTiberus2016-06-031-75/+69
|\ \ \ \ | | | | | | | | | | [WIP] Only run node specific bits on nodes
| * | | | 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
|\ \ \ \ | |_|/ / |/| | | fix int to string conversion in openshift_hosted_logging
| * | | 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 # 1970
| * | | 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.
| * | | 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
| * | | 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
|\ \ \ \ | |/ / / |/| | | Run rhel_subscribe on l_oo_all_hosts rather than all
| * | | Run rhel_subscribe on l_oo_all_hosts rather than allScott Dodson2016-06-021-1/+1
|/ / /
* | | Merge pull request #1971 from dgoodwin/missing-services-fixJason DeTiberus2016-06-022-8/+13
|\ \ \ | |/ / |/| | Fix error with stopping services that may not exist.
| * | Fix error with stopping services that may not exist.Devan Goodwin2016-06-022-8/+13
| | | | | | | | | | | | | | | | | | Causes a hard failure due to missing etcd/atomic-openshift-master services. Instead, check that the services exist before ensuring they're stopped/disabled.
* | | Merge pull request #1968 from abutcher/os-firewall-evalJason DeTiberus2016-06-0111-39/+37
|\ \ \ | | | | | | | | [v2] Move os_firewall_allow from defaults to role dependencies.
| * | | Add haproxy_frontend_port to vars for openshift-loadbalancer.Andrew Butcher2016-06-013-8/+9
| | | |
| * | | Move os_firewall_allow from defaults to role dependencies.Andrew Butcher2016-06-018-31/+28
| | | |
* | | | Merge pull request #1957 from jfcoz/metrics_wait_deployerJason DeTiberus2016-06-013-22/+32
|\ \ \ \ | |_|/ / |/| | | wait metrics-deployer complete (need to configure nodes before hosted…
| * | | wait metrics-deployer complete (need to configure nodes before hosted services)jfcoz2016-05-273-22/+32
| | | |
* | | | Merge pull request #1965 from abutcher/router-registryurlJason DeTiberus2016-05-311-1/+3
|\ \ \ \ | |_|/ / |/| | | Ensure registry url evaluated when creating router.
| * | | Ensure registry url evaluated when creating router.Andrew Butcher2016-05-311-1/+3
| | | |