From c997860e1ca1bbec1d4a4e8c4d419684e8cccd86 Mon Sep 17 00:00:00 2001
From: Smaine Kahlouch <smaine.kahlouch@arkena.com>
Date: Mon, 2 Nov 2015 13:46:08 +0100
Subject: [PATCH] move vars for api socket into group_vars
---
environments/dev/group_vars/k8s-cluster.yml | 4 ++++
environments/production/group_vars/k8s-cluster.yml | 4 ++++
roles/kubernetes/common/defaults/main.yml | 3 ---
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/environments/dev/group_vars/k8s-cluster.yml b/environments/dev/group_vars/k8s-cluster.yml
index a88e0402a..d18f4d873 100644
--- a/environments/dev/group_vars/k8s-cluster.yml
+++ b/environments/dev/group_vars/k8s-cluster.yml
@@ -35,6 +35,10 @@ peer_with_router: false
# Warning : enabling router peering will disable calico's default behavior ('node mesh').
# The subnets of each nodes will be distributed by the datacenter router
+# The port the API Server will be listening on.
+kube_master_port: 443 # (https)
+kube_master_insecure_port: 8080 # (http)
+
# Internal DNS configuration.
# Kubernetes can create and mainatain its own DNS server to resolve service names
# into appropriate IP addresses. It's highly advisable to run such DNS server,
diff --git a/environments/production/group_vars/k8s-cluster.yml b/environments/production/group_vars/k8s-cluster.yml
index 222f7613c..efaf3cca6 100644
--- a/environments/production/group_vars/k8s-cluster.yml
+++ b/environments/production/group_vars/k8s-cluster.yml
@@ -35,6 +35,10 @@
# Warning : enabling router peering will disable calico's default behavior ('node mesh').
# The subnets of each nodes will be distributed by the datacenter router
+# The port the API Server will be listening on.
+# kube_master_port: 443 # (https)
+# kube_master_insecure_port: 8080 # (http)
+
# Internal DNS configuration.
# Kubernetes can create and mainatain its own DNS server to resolve service names
# into appropriate IP addresses. It's highly advisable to run such DNS server,
diff --git a/roles/kubernetes/common/defaults/main.yml b/roles/kubernetes/common/defaults/main.yml
index f644baeab..f25f2b802 100644
--- a/roles/kubernetes/common/defaults/main.yml
+++ b/roles/kubernetes/common/defaults/main.yml
@@ -11,9 +11,6 @@ kube_script_dir: "{{ bin_dir }}/kubernetes-scripts"
# look in here. Don't do it.
kube_config_dir: /etc/kubernetes
-# The port the API Server will be listening on.
-kube_master_port: 443
-
# This is where all the cert scripts and certs will be located
kube_cert_dir: "{{ kube_config_dir }}/certs"
--
GitLab