Change k8s version from 1.9.1 to 1.10.4

Change-Id: Ib471ca9c27a1ffea0d5017241f7602083d8f14df
Signed-off-by: hu xinhui <xinhui_hu@foxmail.com>

diff --git a/build/build.yaml b/build/build.yaml
index ef42ba9..dece7a7 100644 (file)
--- a/build/build.yaml
+++ b/build/build.yaml
@@ -34,7 +34,7 @@ packages:
   - name: compass-tasks-k8s
     description: "compass task container integrated with kubespray"
     get_method: docker
-    url: compass4nfv/compass-tasks-k8s:7.0.0
+    url: huxinhui/compass-tasks-k8s:7.0.0
 
   - 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 0e25312..861bbfa 100644 (file)
--- a/deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml
+++ b/deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml
@@ -91,63 +91,63 @@
 
 - name: enable helm
   lineinfile:
-    dest: /opt/kargo_k8s/inventory/group_vars/k8s-cluster.yml
+    dest: /opt/kargo_k8s/inventory/sample/group_vars/k8s-cluster.yml
     regexp: '^helm_enabled:'
     line: 'helm_enabled: {{ helm_flag }}'
 
 - name: enable external lb | set lb domain_nam
   lineinfile:
-    dest: /opt/kargo_k8s/inventory/group_vars/all.yml
+    dest: /opt/kargo_k8s/inventory/sample/group_vars/all.yml
     regexp: '^## apiserver_loadbalancer_domain_name:'
     line: 'apiserver_loadbalancer_domain_name: {{ apiserver_loadbalancer_domain_name }}'
 
 - name: enable external lb |
   lineinfile:
-    dest: /opt/kargo_k8s/inventory/group_vars/all.yml
+    dest: /opt/kargo_k8s/inventory/sample/group_vars/all.yml
     regexp: '^#loadbalancer_apiserver:'
     line: 'loadbalancer_apiserver:'
 
 - name: enable external lb | set vip address
   lineinfile:
-    dest: /opt/kargo_k8s/inventory/group_vars/all.yml
+    dest: /opt/kargo_k8s/inventory/sample/group_vars/all.yml
     regexp: '^#  address: 1.2.3.4'
     line: '  address: {{ vipaddress }}'
 
 - name: enable external lb | set vip port
   lineinfile:
-    dest: /opt/kargo_k8s/inventory/group_vars/all.yml
+    dest: /opt/kargo_k8s/inventory/sample/group_vars/all.yml
     regexp: '^#  port: 1234'
     line: '  port: {{ exlb_port }}'
 
 - name: enable internal lb
   lineinfile:
-    dest: /opt/kargo_k8s/inventory/group_vars/all.yml
+    dest: /opt/kargo_k8s/inventory/sample/group_vars/all.yml
     regexp: '^#loadbalancer_apiserver_localhost: true'
     line: 'loadbalancer_apiserver_localhost: true'
 
 - name: enable http proxy
   lineinfile:
-    dest: /opt/kargo_k8s/inventory/group_vars/all.yml
+    dest: /opt/kargo_k8s/inventory/sample/group_vars/all.yml
     regexp: '^#http_proxy:'
     line: 'http_proxy: {{ http_proxy }}'
   when: http_proxy != ''
 
 - name: enable https proxy
   lineinfile:
-    dest: /opt/kargo_k8s/inventory/group_vars/all.yml
+    dest: /opt/kargo_k8s/inventory/sample/group_vars/all.yml
     regexp: '^#https_proxy:'
     line: 'https_proxy: {{ https_proxy }}'
   when: https_proxy !=''
 
 - name: use the user name and password login the dashboard
   lineinfile:
-    dest: /opt/kargo_k8s/inventory/group_vars/k8s-cluster.yml
+    dest: /opt/kargo_k8s/inventory/sample/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
+    dest: /opt/kargo_k8s/inventory/sample/group_vars/k8s-cluster.yml
     line: 'supplementary_addresses_in_ssl_keys: [{{ vipaddress }}]'
 
 - name: rm openssl file