Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3526 from richm/fluentd-filter-renamed-to-viaq | Jeff Cantrill | 2017-03-01 | 1 | -1/+1 |
|\ | | | | | logging fluentd filter was renamed to viaq | ||||
| * | logging fluentd filter was renamed to viaq | Rich Megginson | 2017-02-28 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #3502 from ↵ | Jan Chaloupka | 2017-03-01 | 1 | -0/+2 |
|\ \ | | | | | | | | | | | | | ingvagabund/when-installing-excluder-install-the-latest install the latest excluders | ||||
| * | | install the latest excluders | Jan Chaloupka | 2017-02-27 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #3522 from mtnbikenc/pvc-type-fix | Russell Teague | 2017-02-28 | 2 | -8/+10 |
|\ \ \ | |_|/ |/| | | Add 'persistentVolumeClaim' to volume_info type | ||||
| * | | Add 'persistentVolumeClaim' to volume_info type | Russell Teague | 2017-02-28 | 2 | -8/+10 |
| | | | |||||
* | | | Merge pull request #3434 from giuseppe/system-containers-module | Giuseppe Scrivano | 2017-02-28 | 10 | -164/+448 |
|\ \ \ | |/ / |/| | | System containers module | ||||
| * | | node: use the new oc_atomic_container module | Giuseppe Scrivano | 2017-02-28 | 3 | -60/+18 |
| | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> | ||||
| * | | master: use the new oc_atomic_container module | Giuseppe Scrivano | 2017-02-28 | 2 | -57/+23 |
| | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> | ||||
| * | | etcd: use the new oc_atomic_container module | Giuseppe Scrivano | 2017-02-28 | 1 | -47/+25 |
| | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> | ||||
| * | | lib_openshift: new module atomic_container | Giuseppe Scrivano | 2017-02-28 | 4 | -0/+382 |
| | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> | ||||
* | | | Merge pull request #3515 from mtnbikenc/registry-pvc-fix | Russell Teague | 2017-02-28 | 1 | -2/+3 |
|\ \ \ | |/ / |/| | | BZ1427009: Correct fact creation for pvc | ||||
| * | | Correct fact creation for pvc | Russell Teague | 2017-02-27 | 1 | -2/+3 |
| | | | |||||
* | | | Merge pull request #3520 from sdodson/regen | Scott Dodson | 2017-02-27 | 1 | -40/+92 |
|\ \ \ | | | | | | | | | Re-generate lib_openshift | ||||
| * | | | Re-generate lib_openshift | Scott Dodson | 2017-02-27 | 1 | -40/+92 |
|/ / / | |||||
* | | | Merge pull request #3387 from enj/enj/f/sdn_module | Scott Dodson | 2017-02-27 | 6 | -0/+1935 |
|\ \ \ | | | | | | | | | Add SDNValidator Module | ||||
| * | | | Add SDNValidator Module | Monis Khan | 2017-02-21 | 6 | -0/+1935 |
| | | | | | | | | | | | | | | | | Signed-off-by: Monis Khan <mkhan@redhat.com> | ||||
* | | | | Merge pull request #3512 from mtnbikenc/hosted-registry-service | Scott Dodson | 2017-02-27 | 1 | -0/+13 |
|\ \ \ \ | | | | | | | | | | | BZ1427040: Create hosted registry service | ||||
| * | | | | Create hosted registry service | Russell Teague | 2017-02-27 | 1 | -0/+13 |
| | |/ / | |/| | | |||||
* | | | | Make s3_volume_mount available to set_fact call | Steve Milner | 2017-02-27 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | 7cf5cc14 cleaned up how the registry was being created. However the s3 cloudfront calls ended up setting and using a fact in the same block. This change makes s3_volume_mount available to the set_fact. | ||||
* | | | | Merge pull request #3510 from abutcher/router-upgrade | Andrew Butcher | 2017-02-27 | 23 | -54/+54 |
|\ \ \ \ | |/ / / |/| | | | Bug 1427080: The router wasn't upgraded to current ose-haproxy-router image version | ||||
| * | | | [oc_obj] Move namespace argument to end of command. | Andrew Butcher | 2017-02-27 | 22 | -53/+53 |
| | | | | |||||
| * | | | Correct typo in haproxy router collection. | Andrew Butcher | 2017-02-27 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #3503 from kwoodson/openshift_hosted_replicas | Scott Dodson | 2017-02-27 | 2 | -1/+36 |
|\ \ \ \ | | | | | | | | | | | Moving replica logic to filter_plugin to fix skipped task variable behavior. | ||||
| * | | | | Moving replica logic to filter_plugin to fix skipped task variable behavior. | Kenny Woodson | 2017-02-27 | 2 | -1/+36 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #3506 from harobed/issue_3505 | Scott Dodson | 2017-02-27 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | Fix issue #3505, add notes about origin upgrade versions support in BYO upgrade README file | ||||
| * | | | Fix issue #3505, add notes about origin upgrade versions support in BYO ↵ | Stéphane Klein | 2017-02-27 | 1 | -2/+2 |
|/ / / | | | | | | | | | | upgrade README file | ||||
* | | | Merge pull request #3358 from jpkrohling/JPK-JGroups-ASYM-Password | Scott Dodson | 2017-02-27 | 4 | -43/+12 |
|\ \ \ | | | | | | | | | Removed JGroups cert and password generation. | ||||
| * | | | Removed JGroups cert and password generation. | Juraci Paixão Kröhling | 2017-02-24 | 4 | -43/+12 |
| | | | | |||||
* | | | | Merge pull request #3468 from jcantrill/logging_expand_replicas | Scott Dodson | 2017-02-27 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | openshift_logging default to 2 replicas of primary shards | ||||
| * | | | | openshift_logging default to 2 replicas of primary shards | Jeff Cantrill | 2017-02-23 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #3448 from smarterclayton/version | Scott Dodson | 2017-02-24 | 5 | -20/+22 |
|\ \ \ \ | | | | | | | | | | | Prepare for origin moving to OCP version scheme | ||||
| * | | | | Prepare for origin moving to OCP version scheme | Clayton Coleman | 2017-02-23 | 5 | -20/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Origin 1.6 and future releases will be versioned as Origin 3.6+. This unifies a point of inconsistency and brings Origin in line with the full release history. Update version numbers to match that 3.x is preferred. | ||||
* | | | | | Merge pull request #3423 from mtnbikenc/openshift-hosted | Scott Dodson | 2017-02-24 | 9 | -414/+274 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | [openshift_hosted] Router/Registry | ||||
| * | | | | openshift_hosted: Update tasks to use oc_ modules | Russell Teague | 2017-02-24 | 9 | -414/+274 |
|/ / / / | |||||
* | | | | Merge pull request #3467 from kwoodson/registry_updates | Kenny Woodson | 2017-02-24 | 7 | -4/+80 |
|\ \ \ \ | | | | | | | | | | | Fixed default variables. Added a fix to generated secret in env var. | ||||
| * | | | | Rebased. | Kenny Woodson | 2017-02-24 | 4 | -4/+4 |
| | | | | | |||||
| * | | | | Fixed indentation | Kenny Woodson | 2017-02-24 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Adding get_env_var to deploymentconfig. | Kenny Woodson | 2017-02-24 | 6 | -66/+68 |
| | | | | | |||||
| * | | | | Fixed default variables. Added a fix to generated secret in env var. | Kenny Woodson | 2017-02-24 | 7 | -4/+78 |
| | | | | | |||||
* | | | | | Merge pull request #3486 from tbielawa/bz1421053 | Andrew Butcher | 2017-02-24 | 1 | -1/+6 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix Quick Installer failed due to a Python method failure | ||||
| * | | | | Fix Quick Installer failed due to a Python method failure | Tim Bielawa | 2017-02-24 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issues dumping various objects to YAML. This change updates the quick installer fact caching callback to use the improved AnsibleDumper when writing out the facts to storage. * https://bugzilla.redhat.com/show_bug.cgi?id=1421053 * https://bugzilla.redhat.com/show_bug.cgi?id=1421061 * https://bugzilla.redhat.com/show_bug.cgi?id=1421059 | ||||
* | | | | | Merge pull request #3487 from sdodson/drop-centos-paas-sig-common | Scott Dodson | 2017-02-24 | 1 | -7/+0 |
|\ \ \ \ \ | |/ / / / |/| | | | | Revert "Add centos paas sig common" | ||||
| * | | | | Revert "Add centos paas sig common" | Scott Dodson | 2017-02-24 | 1 | -7/+0 |
|/ / / / | | | | | | | | | | | | | This reverts commit 7a16f20b936546f47df87662c78f7fe12e75fe85. | ||||
* | | | | Merge pull request #3457 from sdodson/1414276 | Scott Dodson | 2017-02-24 | 2 | -2/+2 |
|\ \ \ \ | |_|_|/ |/| | | | BZ1414276 - Quote ansible_ssh_user when determining group id | ||||
| * | | | BZ1414276 - Quote ansible_ssh_user when determining group id | Scott Dodson | 2017-02-22 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | So that domain users of the format 'dom\user' may be used for ansible_ssh_user | ||||
* | | | | Merge pull request #3430 from jcantrill/bz_1417261_quote_secret | Scott Dodson | 2017-02-24 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | bug 1417261. Quote name and secrets in logging templates | ||||
| * | | | | bug 1417261. Quote name and secrets in logging templates | Jeff Cantrill | 2017-02-20 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #3483 from ingvagabund/fix-symlink-to-lookups-in-spec-file | Scott Dodson | 2017-02-24 | 1 | -0/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix symlink to lookup_plugins/oo_option.py | ||||
| * | | | | | Fix symlink to lookup_plugins/oo_option.py | Jan Chaloupka | 2017-02-24 | 1 | -0/+4 |
|/ / / / / | | | | | | | | | | | | | | | | Bug 1426030 |