summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6069 from kwoodson/upgrade_scale_groupsScott Dodson2017-12-0118-48/+261
|\ | | | | Initial upgrade for scale groups.
| * Initial upgrade for scale groups.Kenny Woodson2017-11-2918-48/+261
| |
* | Merge pull request #6277 from fabianvf/asb-idempotence-cpickScott Dodson2017-12-019-71/+96
|\ \ | | | | | | Bug 1512793- Fix idempotence issues in ASB deploy
| * | Bug 1512793- Fix idempotence issues in ASB deployFabian von Feilitzsch2017-11-289-71/+96
| | | | | | | | | | | | | | | | | | | | | - Add support for annotations in oc_service - Use oc_service instead of oc_obj - Use oc_pvc instead of oc_obj - Work around lack of idempotency for oc_obj DeploymentConfig
* | | Merge pull request #6170 from shawn-hurley/bug-1514417Scott Dodson2017-12-011-1/+1
|\ \ \ | | | | | | | | Bug 1514417 - Adding correct advertise-client-urls
| * | | Bug 1514417 - Adding correct advertise-client-urlsShawn Hurley2017-11-171-1/+1
| | | |
* | | | Merge pull request #6325 from sosiouxme/20171201-glusterfs-bugScott Dodson2017-12-011-1/+1
|\ \ \ \ | | | | | | | | | | storage_glusterfs: fix typo
| * | | | storage_glusterfs: fix typoLuke Meyer2017-12-011-1/+1
| | | | |
* | | | | Merge pull request #6302 from sosiouxme/20170817-add-retriesLuke Meyer2017-12-0150-0/+142
|\ \ \ \ \ | | | | | | | | | | | | retry package operations
| * | | | | retry package operationsLuke Meyer2017-11-3050-0/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a package install/update fails due to network blips or other spotty availability, retry it. If the failure is a real failure (e.g. package is really not there) it still fails after 3 tries (Ansible default).
* | | | | | Merge pull request #6326 from mtnbikenc/fix-glusterfs-checkpointScott Dodson2017-12-011-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Fix glusterfs checkpoint info
| * | | | | Fix glusterfs checkpoint infoRussell Teague2017-12-011-1/+1
| |/ / / /
* | | | | Merge pull request #6205 from irozzo-1A/logging-become-masterScott Dodson2017-12-011-0/+6
|\ \ \ \ \ | |/ / / / |/| | | | Do not escalate privileges in jks generation tasks
| * | | | Do not escalate privileges in jks generation tasksirozzo2017-11-301-0/+6
|/ / / /
* | | | Merge pull request #6282 from mtnbikenc/fix-include_roleScott Dodson2017-11-305-8/+5
|\ \ \ \ | | | | | | | | | | Correct usage of include_role
| * | | | Correct usage of include_roleRussell Teague2017-11-275-8/+5
| | | | | | | | | | | | | | | | | | | | Switch to import_role for some required roles.
* | | | | Merge pull request #6290 from tomassedovic/openstack-no-dnsScott Dodson2017-11-305-78/+45
|\ \ \ \ \ | |_|_|_|/ |/| | | | Use IP addresses for OpenStack nodes
| * | | | Update the doc textTomas Sedovic2017-11-292-5/+6
| | | | |
| * | | | Use IP addresses for OpenStack nodesTomas Sedovic2017-11-285-78/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike other cloud providers, OpenStack VMs are not able to resolve each other by their names. If you try to run the playbooks against nodes without a pre-created /etc/hosts or a DNS that provides the hostname/ip resolution, it will fail. By setting the `openshift_hostname` variable to each node's IP address, we're able to deploy a functional cluster without running a custom DNS. It is still possible to provide an external server with nsupdate keys and have it be populated, but that is no longer a hard requirement.
* | | | | Merge pull request #6307 from mgugino-upstream-stage/no-log-fixOpenShift Merge Robot2017-11-292-6/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix no_log warnings for custom module We need to set no_log for password and private_key variables.
| * | | | | Fix no_log warnings for custom moduleMichael Gugino2017-11-282-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to set no_log for password and private_key variables.
* | | | | | Merge pull request #5723 from mjudeikis/gluster-registry-backendScott Dodson2017-11-2914-48/+128
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add external glusterfs backend to hosted and glusterfs playbook
| * | | | | | Add support for external glusterfs as registry backendMangirdas2017-11-2114-48/+128
| | | | | | |
* | | | | | | Merge pull request #6301 from mgugino-upstream-stage/project_cfg_factsOpenShift Merge Robot2017-11-284-41/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Remove openshift_facts project_cfg_facts
| * | | | | | | Remove openshift_facts project_cfg_factsMichael Gugino2017-11-284-41/+12
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | This simplifies some variable logic.
* | | | | | | Merge pull request #6073 from mjudeikis/fix_glusterfs_restartScott Dodson2017-11-281-0/+10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | fix for Gluster force restart
| * | | | | | Add check for gluterFS DS to stop restartsMangirdas2017-11-191-0/+10
| |/ / / / /
* | | | | | Merge pull request #6299 from mgugino-upstream-stage/dns-factsMichael Gugino2017-11-284-21/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove dns_port fact
| * | | | | | Remove dns_port factMichael Gugino2017-11-284-21/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | Simply dns_port variable by remove from openshift_facts.
* | | | | | Merge pull request #6295 from mtnbikenc/remove-etcd-fileRussell Teague2017-11-281-8/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove unused task file from etcd role
| * | | | | | Remove unused task file from etcd roleRussell Teague2017-11-281-8/+0
| | | | | | |
* | | | | | | Merge pull request #6269 from mgugino-upstream-stage/clock-dependsMichael Gugino2017-11-286-3/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove openshift_clock from meta depends
| * | | | | | | Remove openshift_clock from meta dependsMichael Gugino2017-11-276-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds openshift_clock role to required plays instead of using meta_depends.
* | | | | | | | Merge pull request #6268 from mgugino-upstream-stage/combine-dnsmasq-with-nodeMichael Gugino2017-11-2817-124/+23
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Combine openshift_node and openshift_node_dnsmasq
| * | | | | | | | Combine openshift_node and openshift_node_dnsmasqMichael Gugino2017-11-2717-124/+23
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit combines these two roles. This will prevent openshift_node_facts from running twice.
* | | | | | | | Merge pull request #6283 from mgugino-upstream-stage/schedulableMichael Gugino2017-11-285-21/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | remove schedulable from openshift_facts
| * | | | | | | | remove schedulable from openshift_factsMichael Gugino2017-11-275-21/+8
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit removes schedulable from openshift_facts in favor of detecting whether or not a host is a master via inventory.
* | | | | | | | Merge pull request #6259 from adelton/issue-6255Michael Gugino2017-11-2832-43/+43
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | dist.iteritems() no longer exists in Python 3.
| * | | | | | | dist.iteritems() no longer exists in Python 3.Jan Pazdziora2017-11-2732-43/+43
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #6280 from mgugino-upstream-stage/cli_imageScott Dodson2017-11-286-12/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove openshift.common.cli_image
| * | | | | | | Remove openshift.common.cli_imageMichael Gugino2017-11-276-12/+13
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | This commit removes openshift.common.cli_image in favor of openshift_cli_image.
* | | | | | | Merge pull request #6287 from zgalor/prom-version-updateScott Dodson2017-11-281-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update prometheus to 2.0.0 GA
| * | | | | | | Update prometheus to 2.0.0 GAZohar Galor2017-11-281-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #6291 from ingvagabund/fix-typeScott Dodson2017-11-281-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | fix type in authroize
| * | | | | | fix type in authroizeJan Chaloupka2017-11-281-2/+2
|/ / / / / /
* | | | | | Merge pull request #6284 from ashcrow/add-svc-catalog-inventory-docScott Dodson2017-11-271-0/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | inventory: Add example for service catalog vars
| * | | | | | inventory: Add example for service catalog varsSteve Milner2017-11-271-0/+8
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Steve Milner <smilner@redhat.com>
* | | | | | Merge pull request #6272 from abutcher/fix-env-factsScott Dodson2017-11-271-6/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix openshift_env fact creation within openshift_facts.
| * | | | | | Fix openshift_env fact creation within openshift_facts.Andrew Butcher2017-11-271-6/+19
| | | | | | |
* | | | | | | Merge pull request #6240 from ↵Russell Teague2017-11-276-12/+12
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | mtnbikenc/include-deprecation-openshift-service-catalog Include Deprecation - openshift-service-catalog