summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* master: latest use same predicates as last versionGiuseppe Scrivano2017-02-081-1/+1
| | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* master: latest use same priorities as last versionGiuseppe Scrivano2017-02-081-1/+1
| | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* Merge pull request #3282 from kwoodson/specify_wait_portKenny Woodson2017-02-071-0/+1
|\ | | | | Specify a port for wait_for call on master upgrade.
| * Moving to ansible variable.Kenny Woodson2017-02-071-1/+1
| |
| * Specifying port for wait_for call.Kenny Woodson2017-02-071-0/+1
|/
* Merge pull request #3275 from sdodson/bz1419893Scott Dodson2017-02-071-1/+1
|\ | | | | Fix playbooks/byo/openshift_facts.yml include path
| * Fix playbooks/byo/openshift_facts.yml include pathScott Dodson2017-02-071-1/+1
| | | | | | | | Fixes Bug 1419893
* | Merge pull request #3260 from ashcrow/1395168Andrew Butcher2017-02-073-0/+34
|\ \ | |/ |/| Copies CloudFront pem file to registry hosts
| * Copies CloudFront pem file to registry hostsSteve Milner2017-02-063-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | This change copies the CloudFront private key to registry hosts when the provider is set to s3 and CloudFront baseurl, privatekey, and keyparid are all provided. It also adds the following variable examples in the host inventory files: - openshift_hosted_registry_storage_s3_cloudfront_baseurl - openshift_hosted_registry_storage_s3_cloudfront_privatekeyfile - openshift_hosted_registry_storage_s3_cloudfront_keypairid See https://bugzilla.redhat.com/show_bug.cgi?id=1395168
* | Merge pull request #3273 from rhcarvalho/missing-rolesScott Dodson2017-02-071-0/+1
|\ \ | | | | | | Add missing symlink to roles
| * | Add missing symlink to rolesRodolfo Carvalho2017-02-071-0/+1
|/ / | | | | | | | | | | | | | | | | It turned out that the playbook `playbooks/byo/openshift-preflight/check.yml` would only work under a certain `ansible.cfg` in which `roles/` was added to `roles_path`. It was the case with the example config prior to b804e70cdd0bc8601bfc87fcf3e34043223828ee.
* | Bump registry-console to 3.5Scott Dodson2017-02-061-2/+2
| |
* | Merge pull request #3261 from sdodson/excluderScott Dodson2017-02-0622-0/+235
|\ \ | | | | | | Manage the excluder functionality
| * | Move excluder disablement into control plane and node upgrade playbooksScott Dodson2017-02-0610-2/+36
| | | | | | | | | | | | | | | So that excluder is disabled and reset within the scope of each of those in addition to the overall playbook
| * | Add excluder management to upgrade and config playbooksScott Dodson2017-02-066-0/+33
| | |
| * | Add openshift_excluder roleScott Dodson2017-02-068-0/+168
| | | | | | | | | | | | | | | | | | | | | | | | - install -- installs excluders, which enables them too - exclude -- enables the excludes - unexclude -- disables the excludes - status -- sets facts based on status, included in main.yml - reset -- sets excluders back to original state based on recorded facts
* | | Merge pull request #3264 from twiest/oc_serviceaccount_secretThomas Wiest2017-02-0621-101/+2291
|\ \ \ | | | | | | | | Added oc_serviceaccount_secret to lib_openshift.
| * | | Added oc_serviceaccount_secret to lib_openshift.Thomas Wiest2017-02-0621-101/+2291
| | | |
* | | | Merge pull request #3257 from jcantrill/bz1417261_deployer_with_35Scott Dodson2017-02-067-28/+28
|\ \ \ \ | | | | | | | | | | fixes 1417261. Points playbooks to the correct 3.5 roles for logging …
| * | | | fixes 1417261. Points playbooks to the correct 3.5 roles for logging and metricsJeff Cantrill2017-02-027-28/+28
| | | | |
* | | | | Merge pull request #3254 from dgoodwin/skip-router-registry-hackScott Dodson2017-02-061-4/+10
|\ \ \ \ \ | | | | | | | | | | | | Temporary hack to skip router/registry upgrade.
| * | | | | Temporary hack to skip router/registry upgrade.Devan Goodwin2017-02-021-4/+10
| |/ / / /
* | | | | Merge pull request #3271 from jcantrill/metrics_node_selectorsScott Dodson2017-02-067-0/+24
|\ \ \ \ \ | | | | | | | | | | | | fix 1406057. Allow openshift_metrics nodeselectors for components
| * | | | | fix 1406057. Allow openshift_metrics nodeselectors for componentsJeff Cantrill2017-02-067-0/+24
| | | | | |
* | | | | | Merge pull request #3272 from abutcher/router-certsScott Dodson2017-02-061-15/+16
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Use service annotations to redeploy router service serving cert signer cert
| * | | | | Use service annotations to redeploy router service serving cert signer cert.Andrew Butcher2017-02-061-15/+16
| | |_|/ / | |/| | |
* | | | | Merge pull request #3270 from tbielawa/fix_rhel_sub_pathScott Dodson2017-02-061-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Fix RHEL Subscribe std_include path
| * | | | Fix RHEL Subscribe std_include pathTim Bielawa2017-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | Closes #3268
* | | | | Merge pull request #3265 from sdodson/image-stream-syncScott Dodson2017-02-0619-105/+2922
|\ \ \ \ \ | | | | | | | | | | | | Update v1.4 content
| * | | | | Bump registry to 3.4Scott Dodson2017-02-061-2/+2
| | | | | |
| * | | | | Sync latest image stream contentScott Dodson2017-02-0618-103/+2920
| | | | | |
* | | | | | Merge pull request #3266 from abutcher/bz1419026Scott Dodson2017-02-061-7/+8
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Bug 1419026 - openshift_master_certificates task failed when installing multiple masters env
| * | | | | Remove legacy router/registry certs and client configs from synchronized ↵Andrew Butcher2017-02-061-7/+8
| | |_|_|/ | |/| | | | | | | | | | | | | master certs.
* | | | | Merge pull request #3262 from giuseppe/fix-latestScott Dodson2017-02-061-1/+2
|\ \ \ \ \ | |/ / / / |/| | | | Support latest for containerized version
| * | | | Support latest for containerized versionGiuseppe Scrivano2017-02-041-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | Merge pull request #3249 from kwoodson/oc_labelKenny Woodson2017-02-058-0/+2535
|\ \ \ \ \ | |/ / / / |/| | | | Adding oc_label to lib_openshift.
| * | | | Doc enhancements.Kenny Woodson2017-02-024-10/+69
| | | | |
| * | | | Fixing linters.Kenny Woodson2017-02-026-97/+17
| | | | |
| * | | | Adding unit test. Fixed redudant calls to get.Kenny Woodson2017-02-014-55/+245
| | | | |
| * | | | Fixing doc and generating new label with updated base.Kenny Woodson2017-02-013-41/+63
| | | | |
| * | | | oc_label ansible moduleJoel Diaz2017-02-017-0/+2344
| | | | | | | | | | | | | | | | | | | | used for adding/removing labels on various OpenShift objects
* | | | | Merge pull request #3259 from sdodson/ruamel-yaml-depScott Dodson2017-02-034-4/+11
|\ \ \ \ \ | | | | | | | | | | | | Ensure python-ruamel-yaml is installed
| * | | | | Ensure python2-ruamel-yaml is installedScott Dodson2017-02-034-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | need to revisit this, currently python2-ruamel-yaml doesn't provide 'python-ruamel-yaml'. It probably should and that should be what we're installing.
* | | | | | Merge pull request #2671 from abutcher/cert-redeploy-restructureScott Dodson2017-02-0343-422/+1026
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Restructure certificate redeploy playbooks
| * | | | | Restructure certificate redeploy playbooksAndrew Butcher2017-02-0243-422/+1026
| | | | | |
* | | | | | Merge pull request #3243 from ↵Scott Dodson2017-02-032-2/+55
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | ingvagabund/upgrade-node-part-of-masters-as-part-of-control-plane-upgrade Upgrade node part of masters as part of control plane upgrade
| * | | | | run node upgrade if master is node as part of the control plan upgrade onlyJan Chaloupka2017-02-022-2/+55
| | |_|_|/ | |/| | |
* | | | | Merge pull request #3179 from jcantrill/logging_pull_secretScott Dodson2017-02-033-0/+30
|\ \ \ \ \ | | | | | | | | | | | | openshift_logging link pull secret to serviceaccounts
| * | | | | openshift_logging link pull secret to serviceaccountsJeff Cantrill2017-02-033-0/+30
| | |_|_|/ | |/| | | | | | | | | | | | | fix unlabel when undeploying
* | | | | Merge pull request #3255 from mtnbikenc/version-checkScott Dodson2017-02-031-4/+9
|\ \ \ \ \ | |/ / / / |/| | | | Add logic to verify patched version of Ansible