Support multiple physnet mapping 55/39955/11
authorHarry Huang <huangxiangyu5@huawei.com>
Wed, 23 Aug 2017 07:05:02 +0000 (15:05 +0800)
committerHarry Huang <huangxiangyu5@huawei.com>
Fri, 1 Sep 2017 08:31:01 +0000 (16:31 +0800)
commit3bc3a8828c3ceefedd08e1767ae6e3bf2df9ac22
tree7413e99b2d9ddbadc782a5e9f68a6f1ba35570b1
parent292985dab007c3ee1c3481c985871a3483d9f7bc
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>
81 files changed:
deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
deploy/adapters/ansible/roles/config-compute/templates/compute.j2
deploy/adapters/ansible/roles/config-controller/templates/controller.j2
deploy/adapters/ansible/roles/config-osa/files/fetch-files.yml [deleted file]
deploy/adapters/ansible/roles/config-osa/files/os-flavor/tasks/main.yml [deleted file]
deploy/adapters/ansible/roles/config-osa/files/setup-ovs.yml [deleted file]
deploy/adapters/ansible/roles/config-osa/tasks/main.yml
deploy/adapters/ansible/roles/config-osa/templates/create-network.yml.j2 [deleted file]
deploy/adapters/ansible/roles/config-osa/templates/openstack_user_config.yml.j2
deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2
deploy/adapters/ansible/roles/post-openstack/tasks/main.yml
deploy/adapters/ansible/roles/post-osa/handlers/main.yml [new file with mode: 0755]
deploy/adapters/ansible/roles/post-osa/tasks/main.yml [new file with mode: 0644]
deploy/adapters/ansible/roles/post-osa/templates/compute.j2 [new file with mode: 0755]
deploy/adapters/ansible/roles/process-openrc/tasks/main.yml [moved from deploy/adapters/ansible/roles/config-osa/files/os-flavor/vars/main.yml with 52% similarity]
deploy/adapters/ansible/roles/setup-openvswitch/handlers/main.yml [moved from deploy/adapters/ansible/roles/config-osa/templates/create-flavor.yml.j2 with 64% similarity]
deploy/adapters/ansible/roles/setup-openvswitch/tasks/compute.yml [new file with mode: 0644]
deploy/adapters/ansible/roles/setup-openvswitch/tasks/controller.yml [new file with mode: 0644]
deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml
deploy/adapters/ansible/roles/setup-openvswitch/vars/main.yml [new file with mode: 0644]
deploy/compass_conf/package_metadata/openstack.conf
deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/HA-ansible-multinodes.tmpl
deploy/conf/hardware_environment/huawei-pod1/network.yml
deploy/conf/vm_environment/huawei-virtual1/network.yml
deploy/conf/vm_environment/huawei-virtual2/network.yml
deploy/conf/vm_environment/huawei-virtual8/network.yml
deploy/conf/vm_environment/huawei-virtual9/network.yml
deploy/conf/vm_environment/network.yml
plugins/moon/roles/moon/templates/compute.j2
plugins/odl_cluster/roles/setup-odl/files/opendaylight.service [moved from plugins/odl_cluster/roles/odl_cluster/files/opendaylight.service with 100% similarity, mode: 0755]
plugins/odl_cluster/roles/setup-odl/handlers/main.yml [moved from plugins/odl_cluster/roles/odl_cluster/handlers/main.yml with 100% similarity]
plugins/odl_cluster/roles/setup-odl/tasks/control-agents-1.yml [moved from plugins/odl_cluster/roles/odl_cluster/tasks/control-agents-1.yml with 100% similarity, mode: 0755]
plugins/odl_cluster/roles/setup-odl/tasks/control-agents-2.yml [moved from plugins/odl_cluster/roles/odl_cluster/tasks/control-agents-2.yml with 65% similarity, mode: 0755]
plugins/odl_cluster/roles/setup-odl/tasks/control-agents-3.yml [moved from plugins/odl_sfc/roles/odl_cluster_sfc/tasks/control-agents-3.yml with 57% similarity, mode: 0755]
plugins/odl_cluster/roles/setup-odl/tasks/control-db-1.yml [moved from plugins/odl_cluster/roles/odl_cluster/tasks/control-db-1.yml with 100% similarity, mode: 0755]
plugins/odl_cluster/roles/setup-odl/tasks/control-hosts-1.yml [moved from plugins/odl_cluster/roles/odl_cluster/tasks/control-hosts-1.yml with 100% similarity, mode: 0755]
plugins/odl_cluster/roles/setup-odl/tasks/control-hosts-2.yml [moved from plugins/odl_cluster/roles/odl_cluster/tasks/control-hosts-2.yml with 100% similarity, mode: 0755]
plugins/odl_cluster/roles/setup-odl/tasks/control-repos-1.yml [moved from plugins/odl_cluster/roles/odl_cluster/tasks/control-repos-1.yml with 100% similarity, mode: 0755]
plugins/odl_cluster/roles/setup-odl/tasks/control-servers-1.yml [moved from plugins/odl_cluster/roles/odl_cluster/tasks/control-servers-1.yml with 100% similarity, mode: 0755]
plugins/odl_cluster/roles/setup-odl/tasks/control-servers-2.yml [moved from plugins/odl_cluster/roles/odl_cluster/tasks/control-servers-2.yml with 93% similarity, mode: 0755]
plugins/odl_cluster/roles/setup-odl/tasks/control-servers-3.yml [moved from plugins/odl_cluster/roles/odl_cluster/tasks/control-servers-3.yml with 100% similarity, mode: 0755]
plugins/odl_cluster/roles/setup-odl/tasks/main.yml [new file with mode: 0755]
plugins/odl_cluster/roles/setup-odl/tasks/odl-cluster.yml [moved from plugins/odl_cluster/roles/odl_cluster/tasks/main.yml with 88% similarity, mode: 0755]
plugins/odl_cluster/roles/setup-odl/tasks/odl-post.yml [moved from plugins/odl_cluster/roles/odl_cluster/tasks/odl-post.yml with 100% similarity, mode: 0755]
plugins/odl_cluster/roles/setup-odl/tasks/odl-pre.yml [new file with mode: 0755]
plugins/odl_cluster/roles/setup-odl/templates/acl_conf.sh [moved from plugins/odl_cluster/roles/odl_cluster/templates/acl_conf.sh with 100% similarity]
plugins/odl_cluster/roles/setup-odl/templates/custom.properties [moved from plugins/odl_cluster/roles/odl_cluster/templates/custom.properties with 100% similarity]
plugins/odl_cluster/roles/setup-odl/templates/ml2_conf.sh [moved from plugins/odl_cluster/roles/odl_cluster/templates/ml2_conf.sh with 100% similarity]
plugins/odl_cluster/roles/setup-odl/templates/org.apache.karaf.features.cfg [moved from plugins/odl_cluster/roles/odl_cluster/templates/org.apache.karaf.features.cfg with 100% similarity]
plugins/odl_cluster/roles/setup-odl/vars/Debian.yml [moved from plugins/odl_cluster/roles/odl_cluster/vars/Debian.yml with 100% similarity]
plugins/odl_cluster/roles/setup-odl/vars/RedHat.yml [moved from plugins/odl_cluster/roles/odl_cluster/vars/RedHat.yml with 100% similarity]
plugins/odl_cluster/roles/setup-odl/vars/main.yml [moved from plugins/odl_cluster/roles/odl_cluster/vars/main.yml with 96% similarity]
plugins/odl_cluster/roles/setup-opendaylight/tasks/main.yml [deleted file]
plugins/odl_cluster/roles/setup-opendaylight/templates/setup-odl.yml.j2 [deleted file]
plugins/odl_sfc/roles/setup-odl-sfc/files/opendaylight.service [moved from plugins/odl_sfc/roles/odl_cluster_sfc/files/opendaylight.service with 100% similarity, mode: 0755]
plugins/odl_sfc/roles/setup-odl-sfc/files/sfc.conf [moved from plugins/odl_sfc/roles/odl_cluster_sfc/files/sfc.conf with 100% similarity, mode: 0755]
plugins/odl_sfc/roles/setup-odl-sfc/handlers/main.yml [moved from plugins/odl_sfc/roles/odl_cluster_sfc/handlers/main.yml with 100% similarity, mode: 0755]
plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-agents-1.yml [moved from plugins/odl_sfc/roles/odl_cluster_sfc/tasks/control-agents-1.yml with 100% similarity, mode: 0755]
plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-agents-2.yml [moved from plugins/odl_sfc/roles/odl_cluster_sfc/tasks/control-agents-2.yml with 65% similarity, mode: 0755]
plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-agents-3.yml [moved from plugins/odl_cluster/roles/odl_cluster/tasks/control-agents-3.yml with 57% similarity, mode: 0755]
plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-db-1.yml [moved from plugins/odl_sfc/roles/odl_cluster_sfc/tasks/control-db-1.yml with 100% similarity, mode: 0755]
plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-hosts-1.yml [moved from plugins/odl_sfc/roles/odl_cluster_sfc/tasks/control-hosts-1.yml with 100% similarity, mode: 0755]
plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-hosts-2.yml [moved from plugins/odl_sfc/roles/odl_cluster_sfc/tasks/control-hosts-2.yml with 100% similarity, mode: 0755]
plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-repos-1.yml [moved from plugins/odl_sfc/roles/odl_cluster_sfc/tasks/control-repos-1.yml with 100% similarity, mode: 0755]
plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-1.yml [moved from plugins/odl_sfc/roles/odl_cluster_sfc/tasks/control-servers-1.yml with 100% similarity, mode: 0755]
plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-2.yml [moved from plugins/odl_sfc/roles/odl_cluster_sfc/tasks/control-servers-2.yml with 94% similarity, mode: 0755]
plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-3.yml [moved from plugins/odl_sfc/roles/odl_cluster_sfc/tasks/control-servers-3.yml with 100% similarity, mode: 0755]
plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-utility-1.yml [moved from plugins/odl_sfc/roles/odl_cluster_sfc/tasks/control-utility-1.yml with 100% similarity, mode: 0755]
plugins/odl_sfc/roles/setup-odl-sfc/tasks/main.yml [new file with mode: 0755]
plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-cluster.yml [moved from plugins/odl_sfc/roles/odl_cluster_sfc/tasks/main.yml with 88% similarity, mode: 0755]
plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-post.yml [moved from plugins/odl_sfc/roles/odl_cluster_sfc/tasks/odl-post.yml with 100% similarity, mode: 0755]
plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-pre.yml [new file with mode: 0755]
plugins/odl_sfc/roles/setup-odl-sfc/templates/acl_conf.sh [moved from plugins/odl_sfc/roles/odl_cluster_sfc/templates/acl_conf.sh with 100% similarity, mode: 0755]
plugins/odl_sfc/roles/setup-odl-sfc/templates/custom.properties [moved from plugins/odl_sfc/roles/odl_cluster_sfc/templates/custom.properties with 100% similarity, mode: 0755]
plugins/odl_sfc/roles/setup-odl-sfc/templates/ml2_conf.sh [moved from plugins/odl_sfc/roles/odl_cluster_sfc/templates/ml2_conf.sh with 100% similarity, mode: 0755]
plugins/odl_sfc/roles/setup-odl-sfc/templates/org.apache.karaf.features.cfg [moved from plugins/odl_sfc/roles/odl_cluster_sfc/templates/org.apache.karaf.features.cfg with 100% similarity]
plugins/odl_sfc/roles/setup-odl-sfc/vars/Debian.yml [moved from plugins/odl_sfc/roles/odl_cluster_sfc/vars/Debian.yml with 100% similarity, mode: 0755]
plugins/odl_sfc/roles/setup-odl-sfc/vars/RedHat.yml [moved from plugins/odl_sfc/roles/odl_cluster_sfc/vars/RedHat.yml with 100% similarity, mode: 0755]
plugins/odl_sfc/roles/setup-odl-sfc/vars/main.yml [moved from plugins/odl_sfc/roles/odl_cluster_sfc/vars/main.yml with 100% similarity, mode: 0755]
plugins/odl_sfc/roles/setup-sfc/files/setup-odl.yml.j2 [deleted file]
plugins/odl_sfc/roles/setup-sfc/tasks/setup_sfc.yml