Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3950 from lhuard1A/enterprise_ose_3.5 | OpenShift Bot | 2017-04-26 | 1 | -3/+6 |
|\ | | | | | Merged by openshift-bot | ||||
| * | Make the rhel_subscribe role subscribe to OSE 3.5 channel by default | Lénaïc Huard | 2017-04-19 | 1 | -3/+6 |
| | | |||||
* | | Merge pull request #3860 from sdodson/backup-v3-data | OpenShift Bot | 2017-04-25 | 1 | -32/+28 |
|\ \ | | | | | | | Merged by openshift-bot | ||||
| * | | Cleanup comments and remove extraneous tasks | Scott Dodson | 2017-04-10 | 1 | -23/+7 |
| | | | |||||
| * | | Store backups in /var/lib/etcd/openshift-backup | Scott Dodson | 2017-04-10 | 1 | -19/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | Because containerized installs don't mount /var/lib/origin and we switched to running the backup inside the container that meant that we were backing up the etcd data into a directory inside the container filesystem. Since we have no other volume mounted we need to backup into /var/lib/etcd. | ||||
| * | | Create member/snap directory encase it doesn't exist | Scott Dodson | 2017-04-07 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes TASK [Copy etcd v3 data store] ************************************************* fatal: [host.redhat.com]: FAILED! => { "changed": true, "cmd": [ "cp", "-a", "/var/lib/etcd//member/snap", "/var/lib/origin/etcd-backup-pre-upgrade-20170407055413/member/" ], "delta": "0:00:00.003152", "end": "2017-04-07 01:54:17.584685", "failed": true, "rc": 1, "start": "2017-04-07 01:54:17.581533", "warnings": [] } STDERR: cp: cannot create directory ?/var/lib/origin/etcd-backup-pre-upgrade-20170407055413/member/?: No such file or directory | ||||
| * | | Copy v3 data dir when performing backup | Scott Dodson | 2017-04-05 | 1 | -1/+15 |
| | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1433272 | ||||
* | | | Merge pull request #3970 from mtnbikenc/3_6-upgrade | OpenShift Bot | 2017-04-25 | 138 | -18/+27 |
|\ \ \ | | | | | | | | | Merged by openshift-bot | ||||
| * | | | Standardize all Origin versioning on 3.6 | Russell Teague | 2017-04-25 | 138 | -18/+27 |
| | | | | |||||
* | | | | Merge pull request #3988 from abutcher/router-cert-vars | OpenShift Bot | 2017-04-25 | 2 | -10/+10 |
|\ \ \ \ | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | Replace original router cert variable names. | Andrew Butcher | 2017-04-24 | 2 | -10/+10 |
| | | | | | |||||
* | | | | | Merge pull request #3968 from jarrpa/oc_obj-kinds | OpenShift Bot | 2017-04-25 | 3 | -14/+8 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Merged by openshift-bot | ||||
| * | | | | oc_obj: Allow for multiple kinds in delete | Jose A. Rivera | 2017-04-21 | 3 | -14/+8 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com> | ||||
* | | | | | Merge pull request #3962 from sdodson/image-stream-sync | OpenShift Bot | 2017-04-25 | 6 | -8/+50 |
|\ \ \ \ \ | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | Update v1.5 content | Scott Dodson | 2017-04-20 | 3 | -4/+25 |
| | | | | | | |||||
| * | | | | | Update v1.6 content | Scott Dodson | 2017-04-20 | 3 | -4/+25 |
| | | | | | | |||||
* | | | | | | Merge pull request #3911 from ewolinetz/logging_15_picks | OpenShift Bot | 2017-04-25 | 5 | -159/+202 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | Addressing yamllint | ewolinetz | 2017-04-13 | 1 | -4/+4 |
| | | | | | | | |||||
| * | | | | | | Updating kibana-proxy secret key for server-tls entry | ewolinetz | 2017-04-13 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Pick from issue3896 | ewolinetz | 2017-04-13 | 4 | -154/+197 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #3998 from openshift/revert-3955-fix_etcd_paths | Scott Dodson | 2017-04-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Revert "Add /etc/sysconfig/etcd to etcd_container" | ||||
| * | | | | | | | Revert "Add /etc/sysconfig/etcd to etcd_container" | Scott Dodson | 2017-04-25 | 1 | -1/+1 |
|/ / / / / / / | |||||
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.37-1]. | Jenkins CD Merge Bot | 2017-04-25 | 2 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog | ||||
* | | | | | | | Merge pull request #3990 from abutcher/custom-router-cert-replace-ng | Scott Dodson | 2017-04-25 | 1 | -1/+60 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Replace custom router certificate during redeploy | ||||
| * | | | | | | | Differentiate between service serving router certificate and custom ↵ | Andrew Butcher | 2017-04-24 | 1 | -1/+60 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | openshift_hosted_router_certificate when replacing the router certificate. | ||||
* | | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.36-1]. | Jenkins CD Merge Bot | 2017-04-25 | 2 | -2/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog | ||||
* | | | | | | | | Merge pull request #3976 from mtnbikenc/swap-update | OpenShift Bot | 2017-04-25 | 2 | -16/+26 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | | | Update swap disable tasks | Russell Teague | 2017-04-21 | 2 | -16/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Lines are commented out vice being removed * Comment is added indicating why the change happened * Variable openshift_disable_swap added to allow user control | ||||
* | | | | | | | | | Merge pull request #3932 from richm/mux | OpenShift Bot | 2017-04-24 | 14 | -0/+413 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | | | | cast openshift_logging_use_mux_client to bool | Rich Megginson | 2017-04-19 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | mux does not require privileged, only hostmount-anyuid | Rich Megginson | 2017-04-19 | 14 | -0/+413 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #3481 from jpkrohling/JPK-SwitchHeapsterToUseGeneratedCerts | OpenShift Bot | 2017-04-24 | 5 | -44/+31 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | | | | | Switched Heapster to use certificates generated by OpenShift | Juraci Paixão Kröhling | 2017-04-18 | 5 | -44/+31 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #3906 from sdodson/fix-logging-metrics-templates | OpenShift Bot | 2017-04-24 | 10 | -2049/+3 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | | | | | Use metrics and logging deployer tag v3.4 for enterprise | Scott Dodson | 2017-04-10 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This tag moves forward as new images are built | ||||
| * | | | | | | | | | | Remove v1.5 and v1.6 metrics/logging templates | Scott Dodson | 2017-04-10 | 8 | -2046/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They're no longer used by current roles | ||||
* | | | | | | | | | | | Merge pull request #3973 from kwoodson/remove_resource_version | OpenShift Bot | 2017-04-24 | 28 | -0/+196 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | | | | | Removing resource version to remove object conflicts caused by race conditions. | Kenny Woodson | 2017-04-21 | 28 | -0/+196 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.35-1]. | Jenkins CD Merge Bot | 2017-04-23 | 2 | -2/+5 |
| |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog | ||||
* | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.34-1]. | Jenkins CD Merge Bot | 2017-04-21 | 2 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog | ||||
* | | | | | | | | | | Merge pull request #3945 from jarrpa/glusterfs-fix-gce | OpenShift Bot | 2017-04-21 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | | | | | GlusterFS: provide default for groups.oo_glusterfs_to_config in with_items | Jose A. Rivera | 2017-04-18 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Workaround for the following "as intended"/"won't fix" bug: https://github.com/ansible/ansible/issues/13598 Signed-off-by: Jose A. Rivera <jarrpa@redhat.com> | ||||
* | | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.33-1]. | Jenkins CD Merge Bot | 2017-04-21 | 2 | -2/+9 |
| |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog | ||||
* | | | | | | | | | | Merge pull request #3944 from pilou-/add_missing_mock_for_oc_binary | OpenShift Bot | 2017-04-21 | 3 | -10/+35 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | | | | Use return_value when value is constant | Pierre-Louis Bonicoli | 2017-04-18 | 1 | -8/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Tim Bielawa for pointing it out. | ||||
| * | | | | | | | | | Add missing mock for locate_oc_binary method | Pierre-Louis Bonicoli | 2017-04-18 | 3 | -6/+37 |
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When locate_oc_binary has not been mocked, the test suite fails when oc executable is available. | ||||
* | | | | | | | | | Merge pull request #3904 from kwoodson/manageiq_idempotencey | Kenny Woodson | 2017-04-21 | 7 | -103/+81 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [openshift_manageiq] Adding module calls instead of command for idempotency. | ||||
| * | | | | | | | | | Adding module calls instead of command for idempotency. | Kenny Woodson | 2017-04-19 | 7 | -103/+81 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.32-1]. | Scott Dodson | 2017-04-21 | 2 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag | ||||
* | | | | | | | | | Merge pull request #3966 from sdodson/dont-check-disabled-excluders | Scott Dodson | 2017-04-21 | 1 | -6/+7 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Don't check excluder versions when they're not enabled |