diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-05-30 12:55:50 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-05-30 12:55:50 -0300 |
| commit | f24cc239bcd10d51427a751044b73d1c6470b9b2 (patch) | |
| tree | ee5beb65f650c1c76466acb1da11f999504e958b /inventory/byo/hosts.aep.example | |
| parent | 265daf6b65206fc17ad35e682640477d08efbc43 (diff) | |
| parent | 4b734695abf9ca112c9ad3be33f03fcd1a1e7abf (diff) | |
| download | openshift-f24cc239bcd10d51427a751044b73d1c6470b9b2.tar.gz openshift-f24cc239bcd10d51427a751044b73d1c6470b9b2.tar.bz2 openshift-f24cc239bcd10d51427a751044b73d1c6470b9b2.tar.xz openshift-f24cc239bcd10d51427a751044b73d1c6470b9b2.zip | |
Merge remote-tracking branch 'upstream/master' into upgrade33
Diffstat (limited to 'inventory/byo/hosts.aep.example')
| -rw-r--r-- | inventory/byo/hosts.aep.example | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/inventory/byo/hosts.aep.example b/inventory/byo/hosts.aep.example index 5376dd353..defd53d43 100644 --- a/inventory/byo/hosts.aep.example +++ b/inventory/byo/hosts.aep.example @@ -409,6 +409,8 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # masterConfig.volumeConfig.dynamicProvisioningEnabled, configurable as of 1.2/3.2, enabled by default #openshift_master_dynamic_provisioning_enabled=False +# Configure usage of openshift_clock role. +#openshift_clock_enabled=true # host group for masters [masters] |