Merge "Use contrail-compute-setup to provision vrouter"

Juniper · Apr 27, 2017 · a5c573e · a5c573e
2 parents 3cb6a85 + 404f6dd
commit a5c573e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 92 deletions.
diff --git a/playbooks/roles/contrail/agent/tasks/configure.yml b/playbooks/roles/contrail/agent/tasks/configure.yml
@@ -33,13 +33,9 @@
 - include_role: name=contrail/common tasks_from=vncapi
   tags: [contrail.vncapi, contrail.vncapi.configure, test]
 
-- name: Configure vorouter agent
-  include: vrouter_agent.yml
-  tags: [contrail.agent.vrouter_agent.configure, contrail.agent.vrouter_agent]
-
-- name: Configure vrouter nodemanager
-  include: nodemanager.yml
-  tags: [contrail.agent.nodemanager.configure, contrail.agent.nodemanager, test]
+- name: Configure vrouter agent and nodemgr using contrail-compute-setup
+  shell: contrail-compute-setup --self_ip {{ vhost_address }} --cfgm_ip {{ api_server_ip }}
+  tags: [contrail.agent.vrouter.configure, contrail.agent.vrouter]
 
 - name: setup cni
   include: cni.yml

diff --git a/playbooks/roles/contrail/agent/tasks/nodemanager.yml b/playbooks/roles/contrail/agent/tasks/nodemanager.yml
diff --git a/playbooks/roles/contrail/agent/tasks/vrouter_agent.yml b/playbooks/roles/contrail/agent/tasks/vrouter_agent.yml