summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorMichael Hanselmann <hansmi@vshn.ch>2017-09-22 15:36:51 +0200
committerMichael Hanselmann <hansmi@vshn.ch>2017-10-23 14:59:53 +0200
commit6039b8928ba8b172d95f10c9d0ae7880f393f2f7 (patch)
tree152afc6e60bbafcc49b2ea4187690d9ce4103fd1 /playbooks
parentcd53b726430977bdd5cab772765bae3aed149727 (diff)
downloadopenshift-6039b8928ba8b172d95f10c9d0ae7880f393f2f7.tar.gz
openshift-6039b8928ba8b172d95f10c9d0ae7880f393f2f7.tar.bz2
openshift-6039b8928ba8b172d95f10c9d0ae7880f393f2f7.tar.xz
openshift-6039b8928ba8b172d95f10c9d0ae7880f393f2f7.zip
Add role to configure project request template
The OpenShift master role already supports changing the master configuration to refer to a project template, but there's no way to manage that template directly. This role adds the necessary code to generate a default template and to apply customizations using the "yedit" module.
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/post_control_plane.yml2
-rw-r--r--playbooks/common/openshift-master/additional_config.yml2
2 files changed, 4 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml
index 122066955..e2d74065a 100644
--- a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml
@@ -85,6 +85,8 @@
roles:
- openshift_manageiq
+ - role: openshift_project_request_template
+ when: openshift_project_request_template_manage
# Create the new templates shipped in 3.2, existing templates are left
# unmodified. This prevents the subsequent role definition for
# openshift_examples from failing when trying to replace templates that do
diff --git a/playbooks/common/openshift-master/additional_config.yml b/playbooks/common/openshift-master/additional_config.yml
index e1472ce38..e423d6ce9 100644
--- a/playbooks/common/openshift-master/additional_config.yml
+++ b/playbooks/common/openshift-master/additional_config.yml
@@ -19,6 +19,8 @@
roles:
- role: openshift_master_cluster
when: openshift_master_ha | bool and openshift.master.cluster_method == "pacemaker"
+ - role: openshift_project_request_template
+ when: openshift_project_request_template_manage
- role: openshift_examples
when: openshift_install_examples | default(true, true) | bool
registry_url: "{{ openshift.master.registry_url }}"