aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2017-10-29 12:53:55 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-10-29 12:53:55 +0000
commit93d66a8a89e0195bce06b88780a5800a1474142f (patch)
tree88840ee6f7c4ef15bc4eda16715b2e8be196abc4
parent697ef40111839d0003183976081a546affd534de (diff)
parent681c8b8329530910ed291b7e0f6520ce24a2309e (diff)
Merge " k8s support the helm."
-rw-r--r--deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml6
-rw-r--r--deploy/adapters/ansible/kubernetes/roles/kargo/vars/main.yml2
2 files changed, 8 insertions, 0 deletions
diff --git a/deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml b/deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml
index d3dcb878..16d0b2c0 100644
--- a/deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml
+++ b/deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml
@@ -83,6 +83,12 @@
tags:
- ansible
+- name: enable helm
+ lineinfile:
+ dest: /opt/kargo_k8s/inventory/group_vars/k8s-cluster.yml
+ regexp: '^helm_enabled:'
+ line: 'helm_enabled: {{ helm_flag }}'
+
- name: run kargo playbook
shell: |
cd /opt/kargo_k8s
diff --git a/deploy/adapters/ansible/kubernetes/roles/kargo/vars/main.yml b/deploy/adapters/ansible/kubernetes/roles/kargo/vars/main.yml
new file mode 100644
index 00000000..2d396d06
--- /dev/null
+++ b/deploy/adapters/ansible/kubernetes/roles/kargo/vars/main.yml
@@ -0,0 +1,2 @@
+---
+helm_flag: true