diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2015-11-05 14:06:42 -0500 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2015-11-05 14:06:42 -0500 |
| commit | 11e7783d4b4177f100ecea8a8ffafbfb07ec47ee (patch) | |
| tree | 5dc6c7ae4909826593d0c9e8a979b73549f4da61 | |
| parent | ca9f4f08fbf14f9edfa7331e327cf92a25cd4401 (diff) | |
| download | openshift-11e7783d4b4177f100ecea8a8ffafbfb07ec47ee.tar.gz openshift-11e7783d4b4177f100ecea8a8ffafbfb07ec47ee.tar.bz2 openshift-11e7783d4b4177f100ecea8a8ffafbfb07ec47ee.tar.xz openshift-11e7783d4b4177f100ecea8a8ffafbfb07ec47ee.zip | |
Revert to defaults
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 6 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index 9145df479..d4a6590ea 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -89,12 +89,12 @@ kubernetesMasterConfig: controllerArguments: {{ controller_args if controller_args is defined else 'null' }} masterCount: {{ openshift.master.master_count }} masterIP: {{ openshift.common.ip }} - podEvictionTimeout: 5m + podEvictionTimeout: "" proxyClientInfo: certFile: master.proxy-client.crt keyFile: master.proxy-client.key schedulerConfigFile: {{ openshift_master_scheduler_conf }} - servicesNodePortRange: 30000-32767 + servicesNodePortRange: "" servicesSubnet: {{ openshift.master.portal_net }} staticNodeNames: {{ openshift_node_ips | default([], true) }} {% endif %} @@ -126,7 +126,7 @@ projectConfig: mcsLabelsPerProject: {{ openshift.master.mcs_labels_per_project }} uidAllocatorRange: "{{ openshift.master.uid_allocator_range }}" routingConfig: - subdomain: "{{ openshift.master.default_subdomain | default("router.default.svc.cluster.local") }}" + subdomain: "{{ openshift.master.default_subdomain | default("") }}" serviceAccountConfig: limitSecretReferences: false managedNames: diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 6f163f541..c455a09f1 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -68,7 +68,6 @@ dest: /etc/sysconfig/{{ openshift.common.service_type }}-node regexp: "{{ item.regex }}" line: "{{ item.line }}" - create: yes with_items: - regex: '^OPTIONS=' line: "OPTIONS=--loglevel={{ openshift.node.debug_level }}" |