diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-13 12:27:47 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-13 12:27:47 -0400 |
| commit | 40d95679b7b789e404d39c5642753a1ad2307adf (patch) | |
| tree | e7c82ce5217796e38b1923e043b6406190632ed4 /roles/openshift_master | |
| parent | 9c75f11cf8e71178f0356fafe7f558ec15fe4e15 (diff) | |
| parent | 79984668190f25310d907fb175f82c875387d30b (diff) | |
| download | openshift-40d95679b7b789e404d39c5642753a1ad2307adf.tar.gz openshift-40d95679b7b789e404d39c5642753a1ad2307adf.tar.bz2 openshift-40d95679b7b789e404d39c5642753a1ad2307adf.tar.xz openshift-40d95679b7b789e404d39c5642753a1ad2307adf.zip | |
Merge pull request #1738 from dgoodwin/image-policy-config
Support setting imagePolicyConfig JSON in inventory.
Diffstat (limited to 'roles/openshift_master')
| -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 #} |