summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
* | | 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
|/ / /
* | | 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
|/ / /
* | | 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