summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master_facts
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-04-11 09:34:15 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-04-12 16:08:52 -0300
commit79984668190f25310d907fb175f82c875387d30b (patch)
treeac1b04cbae44f8d1333d805b164694a1502918ba /roles/openshift_master_facts
parent51e390459d7eda90c44d9ffd7f1199a3590beac1 (diff)
downloadopenshift-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_facts')
-rw-r--r--roles/openshift_master_facts/tasks/main.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/roles/openshift_master_facts/tasks/main.yml b/roles/openshift_master_facts/tasks/main.yml
index f43b8c59d..4d7c04065 100644
--- a/roles/openshift_master_facts/tasks/main.yml
+++ b/roles/openshift_master_facts/tasks/main.yml
@@ -72,3 +72,4 @@
oauth_template: "{{ openshift_master_oauth_template | default(None) }}" # deprecated in origin 1.2 / OSE 3.2
oauth_templates: "{{ openshift_master_oauth_templates | default(None) }}"
oauth_always_show_provider_selection: "{{ openshift_master_oauth_always_show_provider_selection | default(None) }}"
+ image_policy_config: "{{ openshift_master_image_policy_config | default(None) }}"