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>

4 files changed, 136 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; \
diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-sfc-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-sfc-ha.yml
new file mode 100644
index 00000000..8095fe03
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-sfc-ha.yml
@@ -0,0 +1,79 @@
+##############################################################################
+# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+---
+TYPE: baremetal
+FLAVOR: cluster
+POWER_TOOL: ipmitool
+
+ipmiUser: root
+ipmiVer: '2.0'
+
+odl_l3_agent: "Enable"
+plugins:
+  - opendaylight: "Enable"
+  - odl_sfc: "Enable"
+
+hosts:
+  - name: host1
+    mac: 'F8:4A:BF:55:A2:8D'
+    interfaces:
+      - eth1: 'F8:4A:BF:55:A2:8E'
+    ipmiIp: 172.16.130.26
+    ipmiPass: Opnfv@pod1
+    roles:
+      - controller
+      - ha
+      - odl
+      - ceph-adm
+      - ceph-mon
+
+  - name: host2
+    mac: 'D8:49:0B:DA:5A:B7'
+    interfaces:
+      - eth1: 'D8:49:0B:DA:5A:B8'
+    ipmiIp: 172.16.130.27
+    ipmiPass: Opnfv@pod1
+    roles:
+      - controller
+      - ha
+      - odl
+      - ceph-mon
+
+  - name: host3
+    mac: '78:D7:52:A0:B1:99'
+    interfaces:
+      - eth1: '78:D7:52:A0:B1:9A'
+    ipmiIp: 172.16.130.29
+    ipmiPass: Opnfv@pod1
+    roles:
+      - controller
+      - ha
+      - odl
+      - ceph-mon
+
+  - name: host4
+    mac: 'D8:49:0B:DA:5B:5D'
+    interfaces:
+      - eth1: 'D8:49:0B:DA:5B:5E'
+    ipmiIp: 172.16.130.30
+    ipmiPass: Opnfv@pod1
+    roles:
+      - compute
+      - ceph-osd
+
+  - name: host5
+    mac: 'D8:49:0B:DA:56:85'
+    interfaces:
+      - eth1: 'D8:49:0B:DA:56:86'
+    ipmiIp: 172.16.130.31
+    ipmiPass: Opnfv@pod1
+    roles:
+      - compute
+      - ceph-osd
diff --git a/deploy/conf/vm_environment/os-odl_l3-sfc-ha.yml b/deploy/conf/vm_environment/os-odl_l3-sfc-ha.yml
new file mode 100644
index 00000000..4673c58d
--- /dev/null
+++ b/deploy/conf/vm_environment/os-odl_l3-sfc-ha.yml
@@ -0,0 +1,50 @@
+##############################################################################
+# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+---
+TYPE: virtual
+FLAVOR: cluster
+
+odl_l3_agent: "Enable"
+plugins:
+  - opendaylight: "Enable"
+  - odl_sfc: "Enable"
+
+hosts:
+  - name: host1
+    roles:
+      - controller
+      - ha
+      - odl
+      - ceph-adm
+      - ceph-mon
+
+  - name: host2
+    roles:
+      - controller
+      - ha
+      - odl
+      - ceph-mon
+
+  - name: host3
+    roles:
+      - controller
+      - ha
+      - odl
+      - ceph-mon
+
+  - name: host4
+    roles:
+      - compute
+      - ceph-osd
+
+  - name: host5
+    roles:
+      - compute
+      - ceph-osd