Merge "change k8s version to v1.9.1"

6 files changed, 15 insertions, 2 deletions

diff --git a/build/build.yaml b/build/build.yaml
index 93cb796d..4f70f397 100644
--- a/build/build.yaml
+++ b/build/build.yaml
@@ -23,7 +23,7 @@ packages:
   - name: compass-tasks-k8s
     description: "compass task container integrated with kubespray"
     get_method: docker
-    url: huangxiangyu/compass-tasks-k8s:latest
+    url: compass4nfv/compass-tasks-k8s:latest
 
   - name: compass-cobbler
     description: "cobbler container for compass"
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
diff --git a/deploy/compass_conf/templates/ansible_installer/kubernetes/ansible_cfg/ansible-kubernetes.tmpl b/deploy/compass_conf/templates/ansible_installer/kubernetes/ansible_cfg/ansible-kubernetes.tmpl
index f09fa9c8..da4554e3 100644
--- a/deploy/compass_conf/templates/ansible_installer/kubernetes/ansible_cfg/ansible-kubernetes.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/kubernetes/ansible_cfg/ansible-kubernetes.tmpl
@@ -3,7 +3,7 @@
 log_path = /var/ansible/run/kubernetes-$cluster_name/ansible.log
 host_key_checking = False
 callback_whitelist = playbook_done, status_callback
-callback_plugins = /opt/ansible_callbacks
+callback_plugins = /opt/ansible_plugins/callback
 forks=100
 
 [ssh_connection]
diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf
index c7a708b9..0d947100 100644
--- a/deploy/conf/cluster.conf
+++ b/deploy/conf/cluster.conf
@@ -24,6 +24,7 @@ export ADAPTER_NAME="openstack_$OPENSTACK_VERSION"
 export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes-$OPENSTACK_VERSION"
 
 if [[ "x"$KUBERNETES_VERSION != "x" ]]; then
+    unset  OPENSTACK_VERSION
     export ADAPTER_NAME=kubernetes
     export ADAPTER_FLAVOR_PATTERN=ansible-kubernetes
     export ADAPTER_TARGET_SYSTEM_PATTERN='^kubernetes$'