diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-04-11 09:34:15 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-04-12 16:08:52 -0300 |
| commit | 79984668190f25310d907fb175f82c875387d30b (patch) | |
| tree | ac1b04cbae44f8d1333d805b164694a1502918ba /roles/openshift_master/templates | |
| parent | 51e390459d7eda90c44d9ffd7f1199a3590beac1 (diff) | |
| download | openshift-79984668190f25310d907fb175f82c875387d30b.tar.gz openshift-79984668190f25310d907fb175f82c875387d30b.tar.bz2 openshift-79984668190f25310d907fb175f82c875387d30b.tar.xz openshift-79984668190f25310d907fb175f82c875387d30b.zip | |
Support setting imagePolicyConfig JSON in inventory.
For flexibility this is another pure JSON field to translate directly to
yaml in the master config.
Also updated to more safely handle JSON inventory variables as this
uncovered a bug with booleans where you end up with a string containing
json in your yaml.
Diffstat (limited to 'roles/openshift_master/templates')
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index e89fdc0ce..1009aa318 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -89,6 +89,9 @@ etcdStorageConfig: imageConfig: format: {{ openshift.master.registry_url }} latest: false +{% if 'image_policy_config' in openshift.master %} +imagePolicyConfig:{{ openshift.master.image_policy_config | to_padded_yaml(level=1) }} +{% endif %} kind: MasterConfig kubeletClientInfo: {# TODO: allow user specified kubelet port #} |