diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2015-11-04 11:59:28 -0500 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2015-11-04 11:59:28 -0500 |
| commit | 7869fb8c26a96c1e0ee74b930fd0da8a9952cb52 (patch) | |
| tree | 37b83c517769c4730b680b602672ba3f9245137a /roles/openshift_master/tasks | |
| parent | a706860af853be6d8bc77ea38593467e827ed527 (diff) | |
| parent | f5e83fc2330d6f784df3859f5305d4b80cc0c469 (diff) | |
| download | openshift-7869fb8c26a96c1e0ee74b930fd0da8a9952cb52.tar.gz openshift-7869fb8c26a96c1e0ee74b930fd0da8a9952cb52.tar.bz2 openshift-7869fb8c26a96c1e0ee74b930fd0da8a9952cb52.tar.xz openshift-7869fb8c26a96c1e0ee74b930fd0da8a9952cb52.zip | |
Merge pull request #811 from openshift/master
master to prod
Diffstat (limited to 'roles/openshift_master/tasks')
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 1 |
1 files changed, 1 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 |