summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--playbooks/common/openshift-cfme/config.yml14
-rw-r--r--roles/openshift_cfme/tasks/main.yml16
2 files changed, 14 insertions, 16 deletions
diff --git a/playbooks/common/openshift-cfme/config.yml b/playbooks/common/openshift-cfme/config.yml
index 1c3400bd1..5887c05ec 100644
--- a/playbooks/common/openshift-cfme/config.yml
+++ b/playbooks/common/openshift-cfme/config.yml
@@ -14,6 +14,20 @@
# # F-a-f, never check on this. True 'background' task.
# poll: 0
+- name: Configure Masters for CFME Bulk Image Imports
+ hosts: oo_masters_to_config
+ serial: 1
+ tasks:
+ - name: Run master cfme tuning playbook
+ include_role:
+ name: openshift_cfme
+ tasks_from: tune_masters
+
+ - name: hold up
+ pause:
+ prompt: You just reconfigured that max param bro
+
+
- name: Setup CFME
hosts: oo_first_master
vars:
diff --git a/roles/openshift_cfme/tasks/main.yml b/roles/openshift_cfme/tasks/main.yml
index a19442a4e..acbce7232 100644
--- a/roles/openshift_cfme/tasks/main.yml
+++ b/roles/openshift_cfme/tasks/main.yml
@@ -23,22 +23,6 @@
state: present
######################################################################
-# Service settings
-
-- name: Ensure bulk image import limit is tuned
- yedit:
- src: /etc/origin/master/master-config.yaml
- key: 'imagePolicyConfig.maxImagesBulkImportedPerRepository'
- value: "{{ openshift_cfme_maxImagesBulkImportedPerRepository | int() }}"
- state: present
- backup: True
- register: master_config_updated
- notify:
- - restart master
-
-- meta: flush_handlers
-
-######################################################################
# NFS
- name: Ensure the /exports/ directory exists