summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\ | | | | | | [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
| | | |
| * | | Merge pull request #1685 from detiber/centos_sigJason DeTiberus2016-05-313-4/+20
| |\ \ \ | | |/ / | |/| | Switch to using CentOS SIG repos for Origin installs
| | * | switch to using sig release packagesJason DeTiberus2016-05-263-9/+20
| | | |
| | * | temporarily disable gpg checking until we have a way to cleanly enable itJason DeTiberus2016-05-261-1/+1
| | | |
| | * | Switch to using CentOS SIG repos for Origin installsJason DeTiberus2016-05-262-0/+5
| | | |
| * | | Merge pull request #1963 from abutcher/readme-awsJason DeTiberus2016-05-311-6/+6
| |\ \ \ | | | | | | | | | | Document protocol in readme aws.
| | * | | Document protocol in readme aws.Andrew Butcher2016-05-311-6/+6
| |/ / /
* | | | Update openshift_version author info.Devan Goodwin2016-06-011-2/+2
| | | |
* | | | Fix installing release 3.1 not converting to precise version.Devan Goodwin2016-06-013-4/+8
| | | |
* | | | Stop requiring/using first master version fact and use openshift_version var ↵Devan Goodwin2016-05-311-5/+4
| | | | | | | | | | | | | | | | instead.
* | | | Break version calc out into a role, separate yaml for containerized/rpm.Devan Goodwin2016-05-316-84/+104
| | | |
* | | | Drop unnecessary node playbook version calculation.Devan Goodwin2016-05-312-17/+1
| | | |
* | | | Merge remote-tracking branch 'upstream/master' into upgrade33Devan Goodwin2016-05-3116-315/+260
|\| | |
| * | | Merge pull request #1962 from abutcher/revert-certJason DeTiberus2016-05-3019-371/+289
| |\ \ \ | | | | | | | | | | Revert openshift-certificates changes.
| | * | | Revert openshift-certificates changes.Andrew Butcher2016-05-3019-371/+289
| |/ / /
* | | | Add leading v for remaining IMAGE_VERSION templates.Devan Goodwin2016-05-302-2/+2
| | | |
* | | | Fix error restarting master service that may not be there.Devan Goodwin2016-05-301-2/+7
| | | |
* | | | Fix use of openshift_version in ca role.Devan Goodwin2016-05-301-4/+1
| | | |
* | | | Fix image tag to rpm version filter.Devan Goodwin2016-05-301-3/+2
| | | |
* | | | Fix error with containerized etcd install.Devan Goodwin2016-05-301-6/+6
| | | | | | | | | | | | | | | | | | | | Role was assuming it could successfully disable the rpm etcd service without checking if it was actuall present.
* | | | Merge remote-tracking branch 'upstream/master' into upgrade33Devan Goodwin2016-05-3084-2049/+1255
|\| | |
| * | | Merge pull request #1896 from abutcher/openshift-loadbalancerJason DeTiberus2016-05-2716-82/+123
| |\ \ \ | | | | | | | | | | Separate master and haproxy config playbooks.
| | * | | Separate master and haproxy config playbooks.Andrew Butcher2016-05-2616-82/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move haproxy configuration to a separate openshift-loadbalancer play. * Move the haproxy role to openshift_loadbalancer. * Add openshift_loadbalancer* facts which drive haproxy configuration.
| * | | | Merge pull request #1947 from abutcher/rm-binJason DeTiberus2016-05-2725-1659/+0
| |\ \ \ \ | | |_|/ / | |/| | | Cleanup following move to openshift-tools
| | * | | Cleanup bin, test and roles/openshift_ansible_inventory following move to ↵Andrew Butcher2016-05-2525-1659/+0
| | | | | | | | | | | | | | | | | | | | openshift-tools
| * | | | Merge pull request #1672 from jstuever/os_clocksJason DeTiberus2016-05-269-0/+51
| |\ \ \ \ | | |_|/ / | |/| | | Add openshift_clock role
| | * | | Adding openshift_clock parameters to example inventory filesJeremiah Stuever2016-05-203-0/+8
| | | | |
| | * | | Enable openshift_clock role for openshift_master, openshift_node, and ↵Jeremiah Stuever2016-05-203-0/+3
| | | | | | | | | | | | | | | | | | | | openshift_etcd