diff options
| author |   Harry Huang <huangxiangyu5@huawei.com> | 2017-08-23 15:05:02 +0800 |
|---|---|---|
| committer | Harry Huang <huangxiangyu5@huawei.com> | 2017-09-01 16:31:01 +0800 |
| commit | 3bc3a8828c3ceefedd08e1767ae6e3bf2df9ac22 (patch) | |
| tree | 7413e99b2d9ddbadc782a5e9f68a6f1ba35570b1 /plugins/odl_cluster/roles/setup-opendaylight | |
| parent | 292985dab007c3ee1c3481c985871a3483d9f7bc (diff) | |
Support multiple physnet mapping
JIRA: COMPASS-559
1. support multiple mapping in provider_net_mappings
of network.yml and create corresponding ovs bridges
2. support seperate config in sys_intf_mappings
of network.yml
3. remove linux bridges in compute nodes for ovs
port binding convenience
4. support openstack vlan tenant network
5. modify odl and odl_sfc roles to use configurable
provider mapping
6. remove some hard coding
Change-Id: Ib57484ce60d029f89c647fd5baf2c7af37c85d0b
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
Diffstat (limited to 'plugins/odl_cluster/roles/setup-opendaylight')
| -rw-r--r-- | plugins/odl_cluster/roles/setup-opendaylight/tasks/main.yml | 25 | ||||
| -rw-r--r-- | plugins/odl_cluster/roles/setup-opendaylight/templates/setup-odl.yml.j2 | 12 |
2 files changed, 0 insertions, 37 deletions
diff --git a/plugins/odl_cluster/roles/setup-opendaylight/tasks/main.yml b/plugins/odl_cluster/roles/setup-opendaylight/tasks/main.yml deleted file mode 100644 index 3abca829..00000000 --- a/plugins/odl_cluster/roles/setup-opendaylight/tasks/main.yml +++ /dev/null @@ -1,25 +0,0 @@ -############################################################################## -# 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 -############################################################################## ---- - -- name: copy setup-odl.yml - template: - src: setup-odl.yml.j2 - dest: /opt/openstack-ansible/playbooks/setup-odl.yml - -- name: copy odl_cluster role - copy: - src: /var/ansible/run/openstack_ocata-opnfv2/roles/odl_cluster - dest: /etc/ansible/roles/ - -- 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" diff --git a/plugins/odl_cluster/roles/setup-opendaylight/templates/setup-odl.yml.j2 b/plugins/odl_cluster/roles/setup-opendaylight/templates/setup-odl.yml.j2 deleted file mode 100644 index 18446ce5..00000000 --- a/plugins/odl_cluster/roles/setup-opendaylight/templates/setup-odl.yml.j2 +++ /dev/null @@ -1,12 +0,0 @@ ---- - -- name: run opendaylight role - hosts: neutron_all | galera_container | network_hosts | repo_container - max_fail_percentage: 20 - user: root - roles: - - odl_cluster - vars: - - odl_l3_agent: "{{ odl_l3_agent }}" - tags: - - odl |