summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3380 from ↵Scott Dodson2017-02-163-0/+9
|\ | | | | | | | | ingvagabund/initialize-nodes-to-upgrade-when-running-control-plane-upgrade-only initialize oo_nodes_to_upgrade group when running control plane upgrade only
| * initialize oo_nodes_to_upgrade group when running control plane upgrade onlyJan Chaloupka2017-02-163-0/+9
|/
* Merge pull request #3371 from detiber/fixLintScott Dodson2017-02-151-1/+0
|\ | | | | Fix some lint
| * Fix some lintJason DeTiberus2017-02-151-1/+0
|/
* Merge pull request #3364 from detiber/lintCleanupScott Dodson2017-02-155-8/+18
|\ | | | | Ansible Lint cleanup and making filter/lookup plugins used by openshift_master_facts available within the role
| * Ansible Lint cleanup and making filter/lookup plugins used by ↵Jason DeTiberus2017-02-145-8/+18
| | | | | | | | openshift_master_facts available within the role
* | Merge pull request #3367 from soltysh/upgrade_jobsScott Dodson2017-02-153-0/+23
|\ \ | | | | | | Add upgrade job step after the entire upgrade performs
| * | Add upgrade job step after the entire upgrade performsMaciej Szulik2017-02-153-0/+23
| | |
* | | Merge pull request #3368 from ↵Jan Chaloupka2017-02-151-1/+1
|\ \ \ | |/ / |/| | | | | | | | ingvagabund/fix-path-to-disabled-exclude-in-34-node-upgrade upgrades: fix path to disable_excluder.yml
| * | upgrades: fix path to disable_excluder.ymlJan Chaloupka2017-02-151-1/+1
|/ /
* | Merge pull request #3332 from giuseppe/system-containers-haGiuseppe Scrivano2017-02-157-13/+81
|\ \ | | | | | | system containers: add support for HA deployments
| * | node, vars/main.yml: define l_is_ha and l_is_same_versionGiuseppe Scrivano2017-02-143-10/+10
| | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | master, vars/main.yml: define l_is_ha and l_is_same_versionGiuseppe Scrivano2017-02-142-12/+15
| | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | node: simplify when conditionalsGiuseppe Scrivano2017-02-101-2/+5
| | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | openvswitch: simplify when conditionalsGiuseppe Scrivano2017-02-101-4/+5
| | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | uninstall: delete master-api and master-controllersGiuseppe Scrivano2017-02-101-0/+16
| | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | master: support HA deployments with system containersGiuseppe Scrivano2017-02-102-2/+47
| | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #3362 from ashcrow/1421033Scott Dodson2017-02-141-1/+2
|\ \ \ | | | | | | | | Update variant_version
| * | | Update variant_versionSteve Milner2017-02-141-1/+2
|/ / / | | | | | | | | | 3.5 added and 3.4 moved to LEGACY
* | | Merge pull request #3350 from mwringe/bz1421860Scott Dodson2017-02-142-4/+4
|\ \ \ | |_|/ |/| | BZ1421860: increase Heapster's metric resolution to 30s
| * | BZ1421860: increase Heapster's metric resolution to 30smwringe2017-02-132-4/+4
| | |
* | | Merge pull request #3351 from detiber/fixConfigClobberJason DeTiberus2017-02-1422-66/+22
|\ \ \ | | | | | | | | Fix cases where child classes override OpenShiftCLI values
| * | | Fix cases where child classes override OpenShiftCLI valuesJason DeTiberus2017-02-1322-66/+22
| |/ /
* | | Merge pull request #3355 from tbielawa/idempotency_please_workScott Dodson2017-02-147-46/+100
|\ \ \ | | | | | | | | Idempotency please work
| * | | Add block+when skip to `openshift_facts` tasksTim Bielawa2017-02-141-46/+58
| | | | | | | | | | | | | | | | | | | | * Speed improvements as a side-effect of skipping the tasks in future includes of `openshift_facts`
| * | | Trying to fix up/audit note some changesTim Bielawa2017-02-146-0/+42
| | | |
* | | | Merge pull request #3359 from ewolinetz/logging_metrics_defaultsScott Dodson2017-02-142-2/+2
|\ \ \ \ | | | | | | | | | | updating defaults for logging and metrics roles
| * | | | updating defaults for logging and metrics rolesewolinetz2017-02-142-2/+2
| | | | |
* | | | | Merge pull request #3356 from mtnbikenc/mod-fixesScott Dodson2017-02-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix logic for checking docker-registry
| * | | | | Fix logic for checking docker-registryRussell Teague2017-02-141-1/+1
| |/ / / /
* | | | | Merge pull request #3308 from mtnbikenc/oc_labelRussell Teague2017-02-144-65/+10
|\ \ \ \ \ | |/ / / / |/| | | | Modify playbooks to use oc_label module
| * | | | Modify playbooks to use oc_label moduleRussell Teague2017-02-144-77/+10
| | | | |
* | | | | Merge pull request #3342 from mtnbikenc/oc_objRussell Teague2017-02-146-148/+191
|\ \ \ \ \ | |_|/ / / |/| | | | Modify playbooks to use oc_obj module
| * | | | Modify playbooks to use oc_obj moduleRussell Teague2017-02-146-148/+191
| |/ / /
* | | | Merge pull request #3291 from ashcrow/oc-route-moduleJan Chaloupka2017-02-143-93/+67
|\ \ \ \ | |/ / / |/| | | [WIP] oc route commands now using the oc_route module
| * | | oc route commands now using the oc_route moduleSteve Milner2017-02-143-93/+67
| | | |
* | | | Merge pull request #3289 from mtnbikenc/upgrade-commonJan Chaloupka2017-02-146-100/+128
|\ \ \ \ | |_|/ / |/| | | Modify playbooks to use oadm_manage_node module
| * | | Modify playbooks to use oadm_manage_node moduleRussell Teague2017-02-136-100/+128
| | | |
* | | | Merge pull request #3346 from mwringe/BZ1421834Scott Dodson2017-02-133-5/+5
|\ \ \ \ | | | | | | | | | | BZ1421834: increase the Heapster metric resolution to 30s
| * | | | BZ1421834: increase the Heapster metric resolution to 30smwringe2017-02-133-5/+5
|/ / / /
* | | | Merge pull request #3343 from sdodson/bz1419654Scott Dodson2017-02-131-19/+5
|\ \ \ \ | |/ / / |/| | | BZ1419654 Remove legacy config_base fallback to /etc/openshift
| * | | Fix Bug 1419654 Remove legacy config_base fallback to /etc/openshiftScott Dodson2017-02-131-19/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a host had /etc/openshift but not /etc/origin we were setting the config_base to /etc/openshift in some places but not all. This code was transitional in order to migrate between 3.0 and 3.1. Given that current playbooks are only supported when moving from the previous version to current version this should no longer be necessary.
* | | | Merge pull request #3306 from ingvagabund/oc_serviceJan Chaloupka2017-02-132-12/+14
|\ \ \ \ | |/ / / |/| | | replace 'oc service' command with its lib_openshift equivalent
| * | | replace 'oc service' command with its lib_openshift equivalentJan Chaloupka2017-02-113-12/+15
| | | |
* | | | Merge pull request #3338 from sdodson/issue3303Scott Dodson2017-02-131-0/+1
|\ \ \ \ | | | | | | | | | | Add libselinux-python dependency for localhost
| * | | | Add libselinux-python dependency for localhostScott Dodson2017-02-101-0/+1
| | | | | | | | | | | | | | | | | | | | Fixes #3303
* | | | | Merge pull request #3299 from kwoodson/oc_envScott Dodson2017-02-137-0/+2582
|\ \ \ \ \ | | | | | | | | | | | | Adding oc_env to lib_openshift.
| * | | | | Fixing docs, linting, and comments.Kenny Woodson2017-02-103-14/+24
| | | | | |
| * | | | | Pleasing the linting bot.Kenny Woodson2017-02-085-66/+7
| | | | | |
| * | | | | Adding integration tests.Kenny Woodson2017-02-084-257/+411
| | | | | |