summaryrefslogtreecommitdiffstats
path: root/deploy/adapters
diff options
context:
space:
mode:
authorYifei Xue <xueyifei@huawei.com>2017-07-27 20:34:52 +0800
committerJustin chi <chigang@huawei.com>2017-07-28 11:26:55 +0000
commit5388c0cfd7aaee3a877906fd66a519e60bf5fc87 (patch)
tree04f6ffda3efaa9b1d3af82bd6854dbd22966b565 /deploy/adapters
parent0a652316917f1e7632e2c3e54d508989a2c754fa (diff)
Add ODL SFC support
Add SFC support for Ocata and Carbon. 1. Add ovs-nsh package for sfc scenario 2. Add sfc configuration and tasks 3. Add sfc DHA files Change-Id: Icf8f20220a2c5ac38a5b92d3ca0e24cbb0e89a52 Signed-off-by: Yifei Xue <xueyifei@huawei.com>
Diffstat (limited to 'deploy/adapters')
-rw-r--r--deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml7
-rw-r--r--deploy/adapters/ansible/roles/post-openstack/tasks/main.yml6
2 files changed, 7 insertions, 6 deletions
diff --git a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
index 40c70ac3..f253afcc 100644
--- a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
+++ b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
@@ -24,15 +24,22 @@
- storage
- rt_kvm
+- hosts: all
+ remote_user: root
+ roles:
+ - sfc-pre
+
- hosts: localhost
remote_user: root
roles:
+ - sfc-pre-2
- config-osa
- setup-host
- setup-infrastructure
- setup-openstack
- sync-inventory
- setup-openvswitch
+ - setup-sfc
- setup-opendaylight
- post-openstack
diff --git a/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml b/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml
index 6c84532d..2ea325e6 100644
--- a/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml
@@ -7,12 +7,6 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
---
-- name: setup odl
- shell: "export ANSIBLE_LOG_PATH=/var/ansible/run/openstack_ocata-opnfv2/ansible.log; \
- cd /opt/openstack-ansible/playbooks; \
- openstack-ansible setup-odl.yml > /dev/null"
- when: opendaylight is defined and opendaylight == "Enable"
-
- name: create network
shell: "export ANSIBLE_LOG_PATH=/var/ansible/run/openstack_ocata-opnfv2/ansible.log; \
cd /opt/openstack-ansible/playbooks; \