diff options
| author | Troy Dawson <tdawson@redhat.com> | 2015-04-16 16:19:02 -0500 |
|---|---|---|
| committer | Troy Dawson <tdawson@redhat.com> | 2015-04-16 16:19:02 -0500 |
| commit | 7f7b582a7bc239e69c147b98c8c2512050f12851 (patch) | |
| tree | f0701e3ce7a42761e9dfb59218057a46e48a901b /roles/openshift_node/defaults | |
| parent | db9cf8ef4f030f30391e021f360fe0c3db1dce74 (diff) | |
| parent | 0722304b2f9c94a2f70054e0a3c7feceaedb195c (diff) | |
| download | openshift-7f7b582a7bc239e69c147b98c8c2512050f12851.tar.gz openshift-7f7b582a7bc239e69c147b98c8c2512050f12851.tar.bz2 openshift-7f7b582a7bc239e69c147b98c8c2512050f12851.tar.xz openshift-7f7b582a7bc239e69c147b98c8c2512050f12851.zip | |
Merge pull request #158 from openshift/master
Merge master into INT for first v3 INT deploy
Diffstat (limited to 'roles/openshift_node/defaults')
| -rw-r--r-- | roles/openshift_node/defaults/main.yml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/roles/openshift_node/defaults/main.yml b/roles/openshift_node/defaults/main.yml index c45524f16..df7ec41b6 100644 --- a/roles/openshift_node/defaults/main.yml +++ b/roles/openshift_node/defaults/main.yml @@ -1,10 +1,4 @@ --- -openshift_node_manage_service_externally: false -openshift_node_debug_level: "{{ openshift_debug_level | default(0) }}" os_firewall_allow: - service: OpenShift kubelet port: 10250/tcp -openshift_node_resources: - capacity: - cpu: - memory: |