summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Copying upstream fix for ansible 2.4 ec2_group module.Kenny Woodson2017-12-112-2/+905
|
* Merge pull request #6362 from mgugino-upstream-stage/crt-playsScott Dodson2017-12-0724-343/+259
|\ | | | | Implement container_runtime playbooks and changes
| * Implement container_runtime playbooks and changesMichael Gugino2017-12-0724-343/+259
| | | | | | | | | | | | This commit refactors some duplicate code, removes usage of set_fact where not needed, and reorganizes container_runtime role to use include_role.
* | Merge pull request #6365 from mtnbikenc/consolidate-etcd-upgradeRussell Teague2017-12-0721-67/+64
|\ \ | | | | | | Playbook Consolidation - etcd Upgrade
| * | Playbook Consolidation - etcd UpgradeRussell Teague2017-12-0521-67/+64
| | |
* | | Merge pull request #6361 from mtnbikenc/consolidate-deploy-clusterScott Dodson2017-12-076-59/+52
|\ \ \ | | | | | | | | Playbook Consolidation - byo/config.yml
| * | | Playbook Consolidation - byo/config.ymlRussell Teague2017-12-066-59/+52
| | | |
* | | | Merge pull request #6372 from mtnbikenc/include-to-include_tasksOpenShift Merge Robot2017-12-0736-88/+82
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Include Deprecation: Convert to include_tasks For all roles/ * Converts to include_tasks: for dynamic includes * Converts to import_tasks: for static includes Trello: https://trello.com/c/ZTyZu3UM/484-3-ansible-24-include-deprecation
| * | | | Include Deprecation: Convert to include_tasksRussell Teague2017-12-0636-88/+82
| |/ / /
* | | | Merge pull request #6310 from tomassedovic/openstack-rhel-subscriptionMichael Gugino2017-12-072-21/+14
|\ \ \ \ | |_|_|/ |/| | | Optionally subscribe OpenStack RHEL nodes
| * | | Remove shell environment lookupTomas Sedovic2017-12-011-2/+2
| | | |
| * | | Revert "Fix syntax error caused by an extra paren"Tomas Sedovic2017-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The rhel_subscribe fixes will be done in a separate pull request. This reverts commit e05e4d3d4fab4eaf462a23f5d5ee39fb57f4f0a0.
| * | | Revert "Fix the env lookup fallback in rhel_subscribe"Tomas Sedovic2017-12-011-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | The rhel_subscribe role fixes will be done in a separate pull request. This reverts commit 691179281336dcd56d17b70cdf4067a142238b83.
| * | | Optionally subscribe OpenStack RHEL nodesTomas Sedovic2017-11-292-21/+14
| | | |
| * | | Fix the env lookup fallback in rhel_subscribeTomas Sedovic2017-11-291-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The role is looking for the usernames, passwords, etc. first in the shell environment and then in the Ansible vars. When the environment is empty, however, the lookup returns an empty string not an undefined variable, so the `default` fallback is never used and the ansible variables end up being ignored. By adding `True` to the end of the filter, it will work with any falsey value (including an empty string) not just undefined variables.
| * | | Fix syntax error caused by an extra parenTomas Sedovic2017-11-291-1/+1
| | | |
* | | | Merge pull request #6254 from jihoon5/jihoon5Michael Gugino2017-12-071-0/+1
|\ \ \ \ | | | | | | | | | | Add external_svc_subnet for k8s loadbalancer type service
| * | | | Add external_svc_subnet for k8s loadbalancer type servicejihoon.o2017-11-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add external_svc_subnet field for k8s loadbalancer type service in kuryr-kubernetes code support external service subnet but openshift does not support yet Signed-off-by: jihoon.o <jihoon.o@samsung.com>
* | | | | Merge pull request #6373 from kwoodson/ami_build_container_runtimeKenny Woodson2017-12-062-7/+7
|\ \ \ \ \ | | | | | | | | | | | | Fix ami building.
| * | | | | Fix ami building.Kenny Woodson2017-12-062-7/+7
| | |_|/ / | |/| | |
* | | | | Merge pull request #6034 from cwilkers/containerized-lb-portfixScott Dodson2017-12-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Mod startup script to publish all frontend binds
| * | | | | Mod startup script to publish all frontend bindsChandler Wilkerson2017-11-061-1/+1
| | | | | |
* | | | | | Merge pull request #6376 from sosiouxme/20171206-logging-vars-typoLuke Meyer2017-12-061-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | openshift_logging_kibana: fix missing paren
| * | | | | | openshift_logging_kibana: fix mixing parenLuke Meyer2017-12-061-1/+1
|/ / / / / /
* | | | | | Merge pull request #6366 from mgugino-upstream-stage/fix-pv-pluginMichael Gugino2017-12-061-5/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Fix generate_pv_pvcs_list plugin undef
| * | | | | Fix generate_pv_pvcs_list plugin undefMichael Gugino2017-12-051-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | Fixes bug of referencing variable before assignment.
* | | | | | Merge pull request #6340 from bogdando/openstack_cleanup_dnsScott Dodson2017-12-068-209/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | Cleanup not required dns bits
| * | | | | | Fix and cleanup not required dns bitsBogdan Dobrelya2017-12-058-209/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Do not manage hostnames for openstack cloud provider, let cloud-init to do its job. * Make python-dns / dnspython dependency check conditional. * Drop not used dns node flavor and image. * Do not manage dns nodes and sec groups in heat stacks. * Keep supporting dynamic updates for private DNS records, yet only limited to an external DNS managed elsewhere (not deployed by the openshift_openstack provider). So users may still benefit from this feature, sending nsupdates to private and public servers as they want it. * Fix openstack default for external nsupdate keys. It should be undefined by default as the dns-populate logic is based on that. * Fix dns records generation for openstack provider's populate-dns * Update docs
* | | | | | | Merge pull request #6370 from mtnbikenc/fix-openshift-loggingScott Dodson2017-12-062-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add missing symlinks in openshift-logging
| * | | | | | | Add missing symlinks in openshift-loggingRussell Teague2017-12-062-0/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #6360 from mtnbikenc/remove-legacy-ci-entryRussell Teague2017-12-062-6/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove entry point files no longer needed by CI
| * | | | | | | Remove entry point files no longer needed by CIRussell Teague2017-12-052-6/+0
| |/ / / / / /
* | | | | | | Merge pull request #6350 from mtnbikenc/fix-dup-importRussell Teague2017-12-061-2/+0
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Remove duplicate init import in network_manager.yml
| * | | | | | Remove duplicate init import in network_manager.ymlRussell Teague2017-12-051-2/+0
| | | | | | |
* | | | | | | Merge pull request #6155 from abutcher/remove-pacemakerScott Dodson2017-12-0521-243/+8
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Remove all references to pacemaker (pcs, pcsd) and openshift.master.cluster_method.
| * | | | | | Remove all references to pacemaker (pcs, pcsd) and ↵Andrew Butcher2017-12-0521-243/+8
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | openshift.master.cluster_method. With pacemaker removed there is no longer a need for openshift.master.cluster_method. We only have one option.
* | | | | | Merge pull request #6154 from mtnbikenc/consolidate-openshift-loggingScott Dodson2017-12-058-11/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | Playbook Consolidation - openshift-logging
| * | | | | | Playbook Consolidation - openshift-loggingRussell Teague2017-11-308-11/+16
| | | | | | |
* | | | | | | Merge pull request #6306 from mgugino-upstream-stage/fix-hosted-varsScott Dodson2017-12-0551-1035/+414
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix hosted vars
| * | | | | | | Fix hosted varsMichael Gugino2017-12-0551-1035/+414
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove hosted vars from openshift_facts. The current pattern is causing a bunch of undesired sideffects.
* | | | | | | | Merge pull request #6357 from mgugino-upstream-stage/fix-container-reg-authScott Dodson2017-12-052-4/+12
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Fix oreg_auth_credentials_create register var
| * | | | | | | Fix oreg_auth_credentials_create register varMichael Gugino2017-12-052-4/+12
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a variable collision for the *oreg_auth_credentials_create variables in openshift_master and openshift_node registry_create tasks. This commit ensures standard and alternative oreg auth credential placement tasks don't use the same register variable. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1520866
* | | | | | | Merge pull request #6341 from bogdando/openstack_cleanup_staticMichael Gugino2017-12-055-122/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Cleanup unused openstack provider code
| * | | | | | Cleanup unused openstack provider codeBogdan Dobrelya2017-12-045-122/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove references for bastion, ssh UI tunnek and static inventory. Update docs. Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
* | | | | | | Merge pull request #6345 from bogdando/openstack_openshift_testing_reposScott Dodson2017-12-052-2/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use openshift testing repos for openstack
| * | | | | | | Document testing repos for dev purposesBogdan Dobrelya2017-12-052-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
| * | | | | | | Use openshift testing repos for openstackBogdan Dobrelya2017-12-042-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use testing openshift repos to sidestep packaging issues for 3.6 clients being used in 3.7 deployments or something. Poke host requirements Centos 7.4 as 7.3 can't see that testing repo. Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
* | | | | | | | Merge pull request #6297 from mgugino-upstream-stage/crt_roleScott Dodson2017-12-0483-422/+178
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Implement container runtime role
| * | | | | | | Implement container runtime roleMichael Gugino2017-12-0183-422/+178
| | | | | | | |
* | | | | | | | Merge pull request #6324 from mtnbikenc/consolidate-redeploy-certificatesOpenShift Merge Robot2017-12-0430-106/+88
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Playbook Consolidation - Redeploy Certificates This PR moves the certificate redeploy playbooks out of {byo,common}/openshift-cluster and into their respective component areas. - playbooks/openshift-etcd (redeploy-certificates.yml, redeploy-ca.yml) - playbooks/openshift-master (redeploy-certificates.yml, redeploy-openshift-ca.yml) - playbooks/openshift-node (redeploy-certificates.yml) - playbooks/openshift-hosted (redeploy-registry-certificates.yml, redeploy-router-certificates.yml) playbooks/byo/openshift-cluster/redeploy-certificates.yml was moved to playbooks/redeploy-certificates.yml Trello: https://trello.com/c/zCz6RIHM/578-2-playbook-consolidation-openshift-cluster-redeploy-certificates
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 13:12:58 +0000