summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3526 from richm/fluentd-filter-renamed-to-viaqJeff Cantrill2017-03-011-1/+1
|\ | | | | logging fluentd filter was renamed to viaq
| * logging fluentd filter was renamed to viaqRich Megginson2017-02-281-1/+1
| |
* | Merge pull request #3502 from ↵Jan Chaloupka2017-03-011-0/+2
|\ \ | | | | | | | | | | | | ingvagabund/when-installing-excluder-install-the-latest install the latest excluders
| * | install the latest excludersJan Chaloupka2017-02-271-0/+2
| | |
* | | Merge pull request #3522 from mtnbikenc/pvc-type-fixRussell Teague2017-02-282-8/+10
|\ \ \ | |_|/ |/| | Add 'persistentVolumeClaim' to volume_info type
| * | Add 'persistentVolumeClaim' to volume_info typeRussell Teague2017-02-282-8/+10
| | |
* | | Merge pull request #3434 from giuseppe/system-containers-moduleGiuseppe Scrivano2017-02-2810-164/+448
|\ \ \ | |/ / |/| | System containers module
| * | node: use the new oc_atomic_container moduleGiuseppe Scrivano2017-02-283-60/+18
| | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | master: use the new oc_atomic_container moduleGiuseppe Scrivano2017-02-282-57/+23
| | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | etcd: use the new oc_atomic_container moduleGiuseppe Scrivano2017-02-281-47/+25
| | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | lib_openshift: new module atomic_containerGiuseppe Scrivano2017-02-284-0/+382
| | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #3515 from mtnbikenc/registry-pvc-fixRussell Teague2017-02-281-2/+3
|\ \ \ | |/ / |/| | BZ1427009: Correct fact creation for pvc
| * | Correct fact creation for pvcRussell Teague2017-02-271-2/+3
| | |
* | | Merge pull request #3520 from sdodson/regenScott Dodson2017-02-271-40/+92
|\ \ \ | | | | | | | | Re-generate lib_openshift
| * | | Re-generate lib_openshiftScott Dodson2017-02-271-40/+92
|/ / /
* | | Merge pull request #3387 from enj/enj/f/sdn_moduleScott Dodson2017-02-276-0/+1935
|\ \ \ | | | | | | | | Add SDNValidator Module
| * | | Add SDNValidator ModuleMonis Khan2017-02-216-0/+1935
| | | | | | | | | | | | | | | | Signed-off-by: Monis Khan <mkhan@redhat.com>
* | | | Merge pull request #3512 from mtnbikenc/hosted-registry-serviceScott Dodson2017-02-271-0/+13
|\ \ \ \ | | | | | | | | | | BZ1427040: Create hosted registry service
| * | | | Create hosted registry serviceRussell Teague2017-02-271-0/+13
| | |/ / | |/| |
* | | | Make s3_volume_mount available to set_fact callSteve Milner2017-02-271-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-upgradeAndrew Butcher2017-02-2723-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 Butcher2017-02-2722-53/+53
| | | |
| * | | Correct typo in haproxy router collection.Andrew Butcher2017-02-271-1/+1
| | | |
* | | | Merge pull request #3503 from kwoodson/openshift_hosted_replicasScott Dodson2017-02-272-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 Woodson2017-02-272-1/+36
| | |_|/ | |/| |
* | | | Merge pull request #3506 from harobed/issue_3505Scott Dodson2017-02-271-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 Klein2017-02-271-2/+2
|/ / / | | | | | | | | | upgrade README file
* | | Merge pull request #3358 from jpkrohling/JPK-JGroups-ASYM-PasswordScott Dodson2017-02-274-43/+12
|\ \ \ | | | | | | | | Removed JGroups cert and password generation.
| * | | Removed JGroups cert and password generation.Juraci Paixão Kröhling2017-02-244-43/+12
| | | |
* | | | Merge pull request #3468 from jcantrill/logging_expand_replicasScott Dodson2017-02-271-1/+1
|\ \ \ \ | | | | | | | | | | openshift_logging default to 2 replicas of primary shards
| * | | | openshift_logging default to 2 replicas of primary shardsJeff Cantrill2017-02-231-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #3448 from smarterclayton/versionScott Dodson2017-02-245-20/+22
|\ \ \ \ | | | | | | | | | | Prepare for origin moving to OCP version scheme
| * | | | Prepare for origin moving to OCP version schemeClayton Coleman2017-02-235-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-hostedScott Dodson2017-02-249-414/+274
|\ \ \ \ \ | |_|_|_|/ |/| | | | [openshift_hosted] Router/Registry
| * | | | openshift_hosted: Update tasks to use oc_ modulesRussell Teague2017-02-249-414/+274
|/ / / /
* | | | Merge pull request #3467 from kwoodson/registry_updatesKenny Woodson2017-02-247-4/+80
|\ \ \ \ | | | | | | | | | | Fixed default variables. Added a fix to generated secret in env var.
| * | | | Rebased.Kenny Woodson2017-02-244-4/+4
| | | | |
| * | | | Fixed indentationKenny Woodson2017-02-241-1/+1
| | | | |
| * | | | Adding get_env_var to deploymentconfig.Kenny Woodson2017-02-246-66/+68
| | | | |
| * | | | Fixed default variables. Added a fix to generated secret in env var.Kenny Woodson2017-02-247-4/+78
| | | | |
* | | | | Merge pull request #3486 from tbielawa/bz1421053Andrew Butcher2017-02-241-1/+6
|\ \ \ \ \ | |/ / / / |/| | | | Fix Quick Installer failed due to a Python method failure
| * | | | Fix Quick Installer failed due to a Python method failureTim Bielawa2017-02-241-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-commonScott Dodson2017-02-241-7/+0
|\ \ \ \ \ | |/ / / / |/| | | | Revert "Add centos paas sig common"
| * | | | Revert "Add centos paas sig common"Scott Dodson2017-02-241-7/+0
|/ / / / | | | | | | | | | | | | This reverts commit 7a16f20b936546f47df87662c78f7fe12e75fe85.
* | | | Merge pull request #3457 from sdodson/1414276Scott Dodson2017-02-242-2/+2
|\ \ \ \ | |_|_|/ |/| | | BZ1414276 - Quote ansible_ssh_user when determining group id
| * | | BZ1414276 - Quote ansible_ssh_user when determining group idScott Dodson2017-02-222-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_secretScott Dodson2017-02-241-2/+2
|\ \ \ \ | | | | | | | | | | bug 1417261. Quote name and secrets in logging templates
| * | | | bug 1417261. Quote name and secrets in logging templatesJeff Cantrill2017-02-201-2/+2
| | | | |
* | | | | Merge pull request #3483 from ingvagabund/fix-symlink-to-lookups-in-spec-fileScott Dodson2017-02-241-0/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix symlink to lookup_plugins/oo_option.py
| * | | | | Fix symlink to lookup_plugins/oo_option.pyJan Chaloupka2017-02-241-0/+4
|/ / / / / | | | | | | | | | | | | | | | Bug 1426030