aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHU Xinhui <xinhui_hu@foxmail.com>2018-10-15 12:46:15 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-10-15 12:46:15 +0000
commit436552456ebd857fa1564ba7f15e08ac118fe548 (patch)
tree83c9b74052c25bf5c9f009bb37c1f10c05cfcbe1
parent96e153b7981b0bcd9c8cae9db6d86804ce366ceb (diff)
parent7f1e18319e7f4a4dc53e61b10b0655609a56d3d9 (diff)
Merge "Change k8s version from 1.9.1 to 1.10.4"
-rw-r--r--build/build.yaml2
-rw-r--r--deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml20
2 files changed, 11 insertions, 11 deletions
diff --git a/build/build.yaml b/build/build.yaml
index a2bd4d29..a44026c2 100644
--- 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 338f2574..89d8db87 100644
--- 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