From 5371004738b1430e56a3e7679284a5e822255d2e Mon Sep 17 00:00:00 2001 From: wutianwei Date: Tue, 27 Jun 2017 19:49:07 +0800 Subject: setup ovs create network flavor 1. replace the linuxbridge with openvswitch 2. create the network and flavors 3. fix the haproxy when public endpoint using http Change-Id: I6fe93d0c4d5305e5dcab8d2e6c628eb5fa23ab56 Signed-off-by: wutianwei --- .../templates/create-flavor.yml.j2 | 15 ++++++++ .../templates/create-network.yml.j2 | 41 ++++++++++++++++++++++ .../templates/openstack_user_config.yml.j2 | 14 +++++++- .../config-deployment/templates/user_variables.yml | 20 +++++++++++ 4 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 deploy/adapters/ansible/roles/config-deployment/templates/create-flavor.yml.j2 create mode 100644 deploy/adapters/ansible/roles/config-deployment/templates/create-network.yml.j2 (limited to 'deploy/adapters/ansible/roles/config-deployment/templates') diff --git a/deploy/adapters/ansible/roles/config-deployment/templates/create-flavor.yml.j2 b/deploy/adapters/ansible/roles/config-deployment/templates/create-flavor.yml.j2 new file mode 100644 index 00000000..b33cd414 --- /dev/null +++ b/deploy/adapters/ansible/roles/config-deployment/templates/create-flavor.yml.j2 @@ -0,0 +1,15 @@ +############################################################################## +# 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: Create flavor + hosts: utility_container[0] + max_fail_percentage: 20 + user: root + roles: + - os-flavor diff --git a/deploy/adapters/ansible/roles/config-deployment/templates/create-network.yml.j2 b/deploy/adapters/ansible/roles/config-deployment/templates/create-network.yml.j2 new file mode 100644 index 00000000..419b9b18 --- /dev/null +++ b/deploy/adapters/ansible/roles/config-deployment/templates/create-network.yml.j2 @@ -0,0 +1,41 @@ +############################################################################## +# 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: Create external network + hosts: utility_container[0] + max_fail_percentage: 20 + user: root + tasks: + - name: create external net + shell: | + . /root/openrc; + openstack network create --share --external \ + --provider-physical-network {{ public_net_info.provider_network }} \ + --provider-network-type {{ public_net_info.type }} {{ public_net_info.network }}; + when: {{ public_net_info.enable }} == True + and "{{ public_net_info.type }}" == "flat" + + - name: create external net + shell: | + . /root/openrc; + openstack network create --share --external \ + --network-segment {{ public_net_info.segment_id }} \ + --provider-network-type {{ public_net_info.type }} {{ public_net_info.network }}; + when: {{public_net_info.enable}} == True + and "{{ public_net_info.type }}" != "flat" + + - name: create external subnet + shell: | + . /root/openrc; + openstack subnet create --network "{{ public_net_info.network }}" \ + --allocation-pool \ + start={{ public_net_info.floating_ip_start }},end={{ public_net_info.floating_ip_end }} \ + --gateway "{{ public_net_info.external_gw }}" \ + --subnet-range "{{ public_net_info.floating_ip_cidr }}" \ + "{{ public_net_info.subnet }}" diff --git a/deploy/adapters/ansible/roles/config-deployment/templates/openstack_user_config.yml.j2 b/deploy/adapters/ansible/roles/config-deployment/templates/openstack_user_config.yml.j2 index 38e14784..2a24113b 100644 --- a/deploy/adapters/ansible/roles/config-deployment/templates/openstack_user_config.yml.j2 +++ b/deploy/adapters/ansible/roles/config-deployment/templates/openstack_user_config.yml.j2 @@ -37,16 +37,24 @@ global_overrides: range: "1:1000" net_name: "vxlan" group_binds: +{% if "linuxbridge" == NEUTRON_MECHANISM_DRIVERS[0] %} - neutron_linuxbridge_agent +{% else %} + - neutron_openvswitch_agent +{% endif %} - network: container_bridge: "br-vlan" container_type: "veth" container_interface: "eth12" host_bind_override: "eth12" type: "flat" - net_name: "flat" + net_name: "{{ public_net_info.provider_network }}" group_binds: +{% if "linuxbridge" == NEUTRON_MECHANISM_DRIVERS[0] %} - neutron_linuxbridge_agent +{% else %} + - neutron_openvswitch_agent +{% endif %} - network: container_bridge: "br-vlan" container_type: "veth" @@ -55,7 +63,11 @@ global_overrides: range: "1:1" net_name: "vlan" group_binds: +{% if "linuxbridge" == NEUTRON_MECHANISM_DRIVERS[0] %} - neutron_linuxbridge_agent +{% else %} + - neutron_openvswitch_agent +{% endif %} - network: container_bridge: "br-storage" container_type: "veth" diff --git a/deploy/adapters/ansible/roles/config-deployment/templates/user_variables.yml b/deploy/adapters/ansible/roles/config-deployment/templates/user_variables.yml index 30b2c6b2..16f78ff8 100644 --- a/deploy/adapters/ansible/roles/config-deployment/templates/user_variables.yml +++ b/deploy/adapters/ansible/roles/config-deployment/templates/user_variables.yml @@ -21,7 +21,27 @@ # # Debug and Verbose options. debug: false +openstack_service_publicuri_proto: http haproxy_keepalived_external_vip_cidr: "{{ public_vip.ip }}/32" haproxy_keepalived_internal_vip_cidr: "10.1.0.22/32" haproxy_keepalived_external_interface: br-vlan haproxy_keepalived_internal_interface: br-mgmt + +{% if "openvswitch" == NEUTRON_MECHANISM_DRIVERS[0] or + "opendaylight" == NEUTRON_MECHANISM_DRIVERS[0] + %} +openstack_host_specific_kernel_modules: + - name: "openvswitch" + pattern: "CONFIG_OPENVSWITCH=" + group: "network_hosts" + +neutron_plugin_type: ml2.ovs + +neutron_ml2_drivers_type: "local,flat,vlan,vxlan" + +neutron_provider_networks: + network_flat_networks: "*" + network_types: "vxlan" + network_vxlan_ranges: "1:1000" + network_mappings: "physnet:br-provider" +{% endif %} -- cgit 1.2.3-korg