aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/adapters
diff options
context:
space:
mode:
Diffstat (limited to 'deploy/adapters')
-rw-r--r--deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml2
-rw-r--r--deploy/adapters/ansible/roles/odl_cluster/tasks/01_04_install_pip_packages.yml4
-rw-r--r--deploy/adapters/ansible/roles/odl_cluster/tasks/01_08_configure_neutron.yml7
-rw-r--r--deploy/adapters/ansible/roles/odl_cluster/tasks/03_02_openvswitch_connect_opendaylight.yml28
-rwxr-xr-xdeploy/adapters/ansible/roles/odl_cluster/templates/org.apache.karaf.features.cfg.Debian2
-rwxr-xr-xdeploy/adapters/ansible/roles/odl_cluster/vars/main.yml16
-rwxr-xr-xdeploy/adapters/ansible/roles/tacker/vars/RedHat.yml2
7 files changed, 56 insertions, 5 deletions
diff --git a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
index 9b196007..d6a7d7a0 100644
--- a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
+++ b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
@@ -232,7 +232,7 @@
remote_user: root
max_fail_percentage: 0
roles:
-# - tacker
+ - tacker
- hosts: controller
remote_user: root
diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_04_install_pip_packages.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_04_install_pip_packages.yml
index fa418c6c..cc4ae992 100644
--- a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_04_install_pip_packages.yml
+++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_04_install_pip_packages.yml
@@ -23,3 +23,7 @@
pip install {{ networking_odl_pkg_name }}
rm -rf {{ networking_odl_pkg_name }}
cd -
+
+- name: install networking-sfc
+ pip: name=networking-sfc state=present version=3.0.0
+ when: odl_sfc == "Enable"
diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_08_configure_neutron.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_08_configure_neutron.yml
index 80443f1b..49396e35 100644
--- a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_08_configure_neutron.yml
+++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_08_configure_neutron.yml
@@ -38,6 +38,13 @@
force_metadata "True";
when: odl_l3_agent == "Enable"
+- name: configure sfc
+ shell: |
+ crudini --set /etc/neutron/neutron.conf sfc drivers \
+ odl;
+ crudini --set /etc/neutron/neutron.conf flowclassifier drivers \
+ odl;
+ when: odl_sfc == "Enable"
- name: drop and recreate neutron database
shell: |
diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/03_02_openvswitch_connect_opendaylight.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/03_02_openvswitch_connect_opendaylight.yml
index 2a9622f9..56326563 100644
--- a/deploy/adapters/ansible/roles/odl_cluster/tasks/03_02_openvswitch_connect_opendaylight.yml
+++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/03_02_openvswitch_connect_opendaylight.yml
@@ -21,6 +21,34 @@
when: inventory_hostname in groups['odl']
ignore_errors: "True"
+- name: table configuration for netvirt
+ uri:
+ url: "{{ item.url }}"
+ method: PUT
+ user: "{{ odl_username }}"
+ password: "{{ odl_password }}"
+ body: "{{ item.body }}"
+ force_basic_auth: "yes"
+ body_format: json
+ status_code: 200, 201
+ with_items: "{{ conf_netvirt }}"
+ when: inventory_hostname == haproxy_hosts.keys()[0]
+ and odl_sfc == "Enable"
+
+- name: table configuration for sfc
+ uri:
+ url: "{{ item.url }}"
+ method: PUT
+ user: "{{ odl_username }}"
+ password: "{{ odl_password }}"
+ body: "{{ item.body }}"
+ force_basic_auth: "yes"
+ body_format: json
+ status_code: 200, 201
+ with_items: "{{ conf_sfc }}"
+ when: inventory_hostname == haproxy_hosts.keys()[0]
+ and odl_sfc == "Enable"
+
- name: set opendaylight as the manager
command: |
su -s /bin/sh -c "ovs-vsctl set-manager ptcp:6639:127.0.0.1 tcp:{{ internal_vip.ip }}:6640;"
diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/org.apache.karaf.features.cfg.Debian b/deploy/adapters/ansible/roles/odl_cluster/templates/org.apache.karaf.features.cfg.Debian
index eebd47a6..743e7123 100755
--- a/deploy/adapters/ansible/roles/odl_cluster/templates/org.apache.karaf.features.cfg.Debian
+++ b/deploy/adapters/ansible/roles/odl_cluster/templates/org.apache.karaf.features.cfg.Debian
@@ -41,7 +41,7 @@ featuresRepositories = mvn:org.apache.karaf.features/standard/3.0.7/xml/features
#
# Comma separated list of features to install at startup
#
-featuresBoot=config,standard,region,package,kar,ssh,management,odl-restconf-all,odl-aaa-authn,odl-dlux-all,odl-ovsdb-openstack,odl-mdsal-apidocs,odl-dlux-core,odl-openflowplugin-nxm-extensions
+featuresBoot=config,standard,region,package,kar,ssh,management,odl-restconf-all,odl-aaa-authn,odl-dlux-all,odl-ovsdb-openstack,odl-mdsal-apidocs,odl-dlux-core,odl-openflowplugin-nxm-extensions,odl-ovsdb-sfc,odl-netvirt-openstack-sfc-translator-rest
#
# Defines if the boot features are started in asynchronous mode (in a dedicated thread)
diff --git a/deploy/adapters/ansible/roles/odl_cluster/vars/main.yml b/deploy/adapters/ansible/roles/odl_cluster/vars/main.yml
index a968e3ec..365247ef 100755
--- a/deploy/adapters/ansible/roles/odl_cluster/vars/main.yml
+++ b/deploy/adapters/ansible/roles/odl_cluster/vars/main.yml
@@ -11,9 +11,19 @@ odl_username: admin
odl_password: admin
odl_api_port: 8181
-# odl_pkg_url: https://nexus.opendaylight.org/content/groups/public/org/
-# opendaylight/integration/distribution-karaf/0.3.0-Lithium/
-# distribution-karaf-0.3.0-Lithium.tar.gz
+netvirt_table: netvirt-providers-config:netvirt-providers-config
+sfc_table: sfc-of-renderer:sfc-of-renderer-config
+
+conf_netvirt:
+ - url: http://{{ internal_vip.ip }}:{{ odl_api_port }}/restconf/config/{{ netvirt_table }}
+ body: {"netvirt-providers-config":{"table-offset":1}}
+
+# yamllint disable rule:line-length
+conf_sfc:
+ - url: http://{{ internal_vip.ip }}:{{ odl_api_port }}/restconf/config/{{ sfc_table }}
+ body: {"sfc-of-renderer-config":{"sfc-of-table-offset":"150", "sfc-of-app-egress-table-offset":"11"}}
+# yamllint enable rule:line-length
+
odl_pkg_url: distribution-karaf-0.5.2-Boron-SR2.tar.gz
odl_pkg_name: distribution-karaf-0.5.2-Boron-SR2.tar.gz
odl_home: "/opt/opendaylight/"
diff --git a/deploy/adapters/ansible/roles/tacker/vars/RedHat.yml b/deploy/adapters/ansible/roles/tacker/vars/RedHat.yml
index 59a4dbd9..fc944f1b 100755
--- a/deploy/adapters/ansible/roles/tacker/vars/RedHat.yml
+++ b/deploy/adapters/ansible/roles/tacker/vars/RedHat.yml
@@ -12,3 +12,5 @@ packages:
- crudini
services: []
+
+heat_services: []