From d3862b5ea2bd710ab036ffa1b47584b9d9ea2e9e Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Fri, 3 Apr 2015 12:39:03 -0400 Subject: [PATCH] Just put all vars in all.yml The distinction between all/etcd/masters wouldn't make sense for a non-developer --- contrib/ansible/group_vars/all.yml | 6 ++++++ contrib/ansible/group_vars/masters.yml | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 contrib/ansible/group_vars/masters.yml diff --git a/contrib/ansible/group_vars/all.yml b/contrib/ansible/group_vars/all.yml index 19047befdd6..ae9d7dc2fb0 100644 --- a/contrib/ansible/group_vars/all.yml +++ b/contrib/ansible/group_vars/all.yml @@ -9,3 +9,9 @@ ansible_ssh_user: root # If a password is needed to sudo to root that password must be set here #ansible_sudo_pass: password + +# Kubernetes internal network for services. +# Kubernetes services will get fake IP addresses from this range. +# This range must not conflict with anything in your infrastructure. These +# addresses do not need to be routable and must just be an unused block of space. +kube_service_addresses: 10.254.0.0/16 diff --git a/contrib/ansible/group_vars/masters.yml b/contrib/ansible/group_vars/masters.yml deleted file mode 100644 index afc9ff04b42..00000000000 --- a/contrib/ansible/group_vars/masters.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Kubernetes internal network for services. -# Kubernetes services will get fake IP addresses from this range. -# This range must not conflict with anything in your infrastructure. These -# addresses do not need to be routable and must just be an unused block of space. -kube_service_addresses: 10.254.0.0/16