summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible
diff options
context:
space:
mode:
authorzhichaozhu <zhichao.zhu8@gmail.com>2018-05-05 17:23:02 +0800
committerForrest Zhu <zhichao.zhu8@gmail.com>2018-06-05 07:58:25 +0000
commit09db9c1968ed9586078d193b16e226553754dd92 (patch)
tree4abcc54a0e802356adf92f528c8b9b1c222db685 /deploy/adapters/ansible
parentc9bd8b778c698a9fd39764fa0f4275614ecee5a8 (diff)
use contrail-ansible-deployer to integrate opencontrail into k8s
Change-Id: If78430a159e13cf9456b9985d923a8ec107dc7cc Signed-off-by: Forrest Zhu <zhichao.zhu8@gmail.com>
Diffstat (limited to 'deploy/adapters/ansible')
-rwxr-xr-xdeploy/adapters/ansible/kubernetes/ansible-kubernetes.yml5
1 files changed, 4 insertions, 1 deletions
diff --git a/deploy/adapters/ansible/kubernetes/ansible-kubernetes.yml b/deploy/adapters/ansible/kubernetes/ansible-kubernetes.yml
index 68dec5c2..094c6488 100755
--- a/deploy/adapters/ansible/kubernetes/ansible-kubernetes.yml
+++ b/deploy/adapters/ansible/kubernetes/ansible-kubernetes.yml
@@ -35,7 +35,10 @@
remote_user: root
max_fail_percentage: 0
roles:
- - kargo
+ - role: kargo
+ when: opencontrail is not defined
+ - role: install-k8s-opencontrail
+ when: opencontrail is defined and opencontrail == "Enable"
- hosts: kube_master
remote_user: root