diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-11-02 12:44:05 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-11-02 12:44:05 -0500 |
| commit | 719ab11adadbcd2b608bef09f11512d746debb4c (patch) | |
| tree | 41cdccd5d27241f0b82234349aadea9c636eae84 /roles/openshift_master | |
| parent | 63b19e964fcc09e60562fd253d725edcc2ec4aef (diff) | |
| parent | a9143d5d0e7245e12e0597fa5105fdcbb85e0846 (diff) | |
| download | openshift-719ab11adadbcd2b608bef09f11512d746debb4c.tar.gz openshift-719ab11adadbcd2b608bef09f11512d746debb4c.tar.bz2 openshift-719ab11adadbcd2b608bef09f11512d746debb4c.tar.xz openshift-719ab11adadbcd2b608bef09f11512d746debb4c.zip | |
Merge pull request #772 from detiber/aep
Disable OpenShift features if installing Atomic Enterprise
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 94eb73346..3a886935f 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -62,6 +62,7 @@ api_server_args: "{{ osm_api_server_args | default(None) }}" controller_args: "{{ osm_controller_args | default(None) }}" infra_nodes: "{{ num_infra | default(None) }}" + disabled_features: "{{ osm_disabled_features | default(None) }}" - name: Install Master package yum: pkg={{ openshift.common.service_type }}-master{{ openshift_version }} state=present diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index 527c5231a..73a0bc6cc 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -22,6 +22,9 @@ corsAllowedOrigins: {% for custom_origin in openshift.master.custom_cors_origins | default("") %} - {{ custom_origin }} {% endfor %} +{% if 'disabled_features' in openshift.master %} +disabledFeatures: {{ openshift.master.disabled_features | to_json }} +{% endif %} {% if openshift.master.embedded_dns | bool %} dnsConfig: bindAddress: {{ openshift.master.bind_addr }}:{{ openshift.master.dns_port }} |