summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed error handling when oc adm ca create-server-cert fails. Fixed a logic ↵Kenny Woodson2017-03-013-1/+7
| | | | error in secure.
* Merge pull request #3532 from sdodson/fis-templatesScott Dodson2017-03-0145-7/+14630
|\ | | | | Add FIS templates
| * Add v1.3 FIS templatesScott Dodson2017-03-0116-2/+5066
| |
| * v1.4 Add FIS templatesScott Dodson2017-03-0114-0/+4777
| |
| * Add FIS templatesScott Dodson2017-03-0115-5/+4787
| |
* | Merge pull request #3493 from kwoodson/registry_reencyrpt_routeScott Dodson2017-03-0125-145/+278
|\ \ | | | | | | Adding support for a route with reencrypt and certificates.
| * | removing extra when conditionKenny Woodson2017-03-011-1/+0
| | |
| * | Removing run_once.Kenny Woodson2017-03-011-4/+0
| | |
| * | Adding the activeDeadlineSeconds. Removed debug.Kenny Woodson2017-03-012-11/+3
| | |
| * | Separating routes so logic is simpler.Kenny Woodson2017-03-011-6/+30
| | |
| * | Defaulting variables properly to avoid undefined route in dict error.Kenny Woodson2017-03-012-17/+16
| | |
| * | Removed duplicate host param.Kenny Woodson2017-02-281-1/+0
| | |
| * | Fixed failures on create when objects exist.Kenny Woodson2017-02-284-95/+163
| | |
| * | Updating delete/recreate with replace --force.Kenny Woodson2017-02-283-18/+10
| | |
| * | Fixed logic error. Ensure both svc and dc exist.Kenny Woodson2017-02-282-2/+2
| | |
| * | Modified base debug statements. Fixed oc_secret debug/verbose flag. Added ↵Kenny Woodson2017-02-2824-62/+80
| | | | | | | | | | | | reencrypt for route.
| * | Adding support for a route with certs and reencrypt.Kenny Woodson2017-02-284-3/+49
| | |
* | | 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.