From 04612cd0b3ee0ef6764a1a99299da52348b49e35 Mon Sep 17 00:00:00 2001 From: hu xinhui Date: Tue, 6 Feb 2018 10:20:40 +0800 Subject: change k8s version to v1.9.1 JIRA: - 1. compass4nfv can deploy v1.9.1 kubernetes 2. end user can use the kubernetes dashboard Change-Id: I274dda38599da95f382dfcb4159b530da8422fd8 Signed-off-by: hu xinhui --- deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml | 7 +++++++ deploy/adapters/ansible/kubernetes/roles/kargo/vars/main.yml | 1 + deploy/adapters/ansible/kubernetes/roles/pre-k8s/tasks/main.yml | 4 ++++ 3 files changed, 12 insertions(+) (limited to 'deploy/adapters') diff --git a/deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml b/deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml index af52ad04..f68eec43 100644 --- a/deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml +++ b/deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml @@ -126,6 +126,13 @@ regexp: '^#loadbalancer_apiserver_localhost: true' line: 'loadbalancer_apiserver_localhost: true' +- name: use the user name and password login the dashboard + lineinfile: + dest: /opt/kargo_k8s/inventory/group_vars/k8s-cluster.yml + regexp: '^#kube_basic_auth: false' + line: 'kube_basic_auth: true' + + - name: add vip to ssl keys lineinfile: dest: /opt/kargo_k8s/inventory/group_vars/k8s-cluster.yml diff --git a/deploy/adapters/ansible/kubernetes/roles/kargo/vars/main.yml b/deploy/adapters/ansible/kubernetes/roles/kargo/vars/main.yml index b73056e5..21287b02 100644 --- a/deploy/adapters/ansible/kubernetes/roles/kargo/vars/main.yml +++ b/deploy/adapters/ansible/kubernetes/roles/kargo/vars/main.yml @@ -3,3 +3,4 @@ helm_flag: true apiserver_loadbalancer_domain_name: "{{ public_vip.ip }}" vipaddress: "{{ public_vip.ip }}" exlb_port: 8383 +kubelet_fail_swap_on: false diff --git a/deploy/adapters/ansible/kubernetes/roles/pre-k8s/tasks/main.yml b/deploy/adapters/ansible/kubernetes/roles/pre-k8s/tasks/main.yml index 76203440..c915ec09 100644 --- a/deploy/adapters/ansible/kubernetes/roles/pre-k8s/tasks/main.yml +++ b/deploy/adapters/ansible/kubernetes/roles/pre-k8s/tasks/main.yml @@ -12,3 +12,7 @@ - include: "{{ ansible_os_family }}.yml" when: ansible_os_family == 'RedHat' and ansible_distribution_major_version == '7' + +- name: close the swap partition + shell: | + swapoff -a -- cgit 1.2.3-korg