diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-11-16 00:13:48 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-16 00:13:48 -0800 |
| commit | 4011df52c4ab9418a2261ce20f01c00c4e7a40b6 (patch) | |
| tree | 3289c1bee817ccaa3acfe514611a0f97b2128138 /playbooks | |
| parent | 9f6bc3afc950d4f6622e3dfb048158db9b06677c (diff) | |
| parent | 6039b8928ba8b172d95f10c9d0ae7880f393f2f7 (diff) | |
| download | openshift-4011df52c4ab9418a2261ce20f01c00c4e7a40b6.tar.gz openshift-4011df52c4ab9418a2261ce20f01c00c4e7a40b6.tar.bz2 openshift-4011df52c4ab9418a2261ce20f01c00c4e7a40b6.tar.xz openshift-4011df52c4ab9418a2261ce20f01c00c4e7a40b6.zip | |
Merge pull request #5500 from vshn/projtmpl1
Automatic merge from submit-queue.
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.
We need to configure custom services and endpoints in every project. The project request template enables us to do that automatically in every project and we'd like to manage the template using Ansible.
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/post_control_plane.yml | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/additional_config.yml | 2 |
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 9f93777b4..c634e0ab8 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 4fef5b923..32f638d42 100644 --- a/playbooks/common/openshift-master/additional_config.yml +++ b/playbooks/common/openshift-master/additional_config.yml @@ -21,6 +21,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 }}" |