summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2018-06-13 06:28:34 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-06-13 06:28:34 +0000
commit85eda35624cacbd473c097bc2638c2d874c01c07 (patch)
tree349bf36c490a9ed7c3dea83d9b5ded3d18c6e2fa /deploy/adapters/ansible
parentc3f43c48a7f8de5855749b922f97e2185c04ad5c (diff)
parent09db9c1968ed9586078d193b16e226553754dd92 (diff)
Merge "use contrail-ansible-deployer to integrate opencontrail into k8s"
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