From 09db9c1968ed9586078d193b16e226553754dd92 Mon Sep 17 00:00:00 2001 From: zhichaozhu Date: Sat, 5 May 2018 17:23:02 +0800 Subject: use contrail-ansible-deployer to integrate opencontrail into k8s Change-Id: If78430a159e13cf9456b9985d923a8ec107dc7cc Signed-off-by: Forrest Zhu --- deploy/adapters/ansible/kubernetes/ansible-kubernetes.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'deploy/adapters') 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 -- cgit 1.2.3-korg