From 7035459d20dd2d278b0a0e6ff96421639f6e0e34 Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Wed, 18 Mar 2015 00:05:51 -0400
Subject: Register node fixes
- Set --hostname flag in node config in openshift_node role
- Support some additional node attributes in openshift_node role
- podCIDR
- labels
- annotations
- Support both output types for openshift ex config view in
openshift_register_node module
- Support multiple api versions in openshift_register_node module
- Support additional attributes in openshift_register_node module
- annotations
- labels
- pod_cidr
- external_ips (v1beta3, will be available after next kube rebase)
- internal_ips (v1beta3, will be available after next kube rebase)
- hostnames (v1beta3, will be available after next kube rebase)
- external_id (v1beta3, will be available after next kube rebase)
---
roles/openshift_node/defaults/main.yml | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
(limited to 'roles/openshift_node/defaults')
diff --git a/roles/openshift_node/defaults/main.yml b/roles/openshift_node/defaults/main.yml
index c45524f16..e4d5ebfee 100644
--- a/roles/openshift_node/defaults/main.yml
+++ b/roles/openshift_node/defaults/main.yml
@@ -5,6 +5,8 @@ os_firewall_allow:
- service: OpenShift kubelet
port: 10250/tcp
openshift_node_resources:
- capacity:
- cpu:
- memory:
+ cpu:
+ memory:
+ cidr:
+openshift_node_labels: {}
+openshift_node_annotations: {}
--
cgit v1.2.3