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 --- .../ansible/roles/config-deployment/files/http.yml | 17 +++++++ .../files/os-flavor/tasks/main.yml | 17 +++++++ .../files/os-flavor/vars/main.yml | 45 ++++++++++++++++++ .../roles/config-deployment/files/setup-ovs.yml | 55 ++++++++++++++++++++++ 4 files changed, 134 insertions(+) create mode 100644 deploy/adapters/ansible/roles/config-deployment/files/http.yml create mode 100644 deploy/adapters/ansible/roles/config-deployment/files/os-flavor/tasks/main.yml create mode 100644 deploy/adapters/ansible/roles/config-deployment/files/os-flavor/vars/main.yml create mode 100644 deploy/adapters/ansible/roles/config-deployment/files/setup-ovs.yml (limited to 'deploy/adapters/ansible/roles/config-deployment/files') diff --git a/deploy/adapters/ansible/roles/config-deployment/files/http.yml b/deploy/adapters/ansible/roles/config-deployment/files/http.yml new file mode 100644 index 00000000..248fc06d --- /dev/null +++ b/deploy/adapters/ansible/roles/config-deployment/files/http.yml @@ -0,0 +1,17 @@ +--- +- name: change https to http in haproxy configuratio + hosts: network_hosts + gather_facts: "{{ gather_facts | default(True) }}" + max_fail_percentage: 20 + user: root + tasks: + - name: change the haproxy configuration + shell: "sed -i 's/ssl crt.*//g' /etc/haproxy/haproxy.cfg; + sed -i 's/https$/http/g' /etc/haproxy/haproxy.cfg" + when: openstack_service_publicuri_proto == "http" + + - name: restart haproxy service + service: + name: haproxy + state: restarted + when: openstack_service_publicuri_proto == "http" diff --git a/deploy/adapters/ansible/roles/config-deployment/files/os-flavor/tasks/main.yml b/deploy/adapters/ansible/roles/config-deployment/files/os-flavor/tasks/main.yml new file mode 100644 index 00000000..03b57120 --- /dev/null +++ b/deploy/adapters/ansible/roles/config-deployment/files/os-flavor/tasks/main.yml @@ -0,0 +1,17 @@ +############################################################################## +# 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 openstack flavors + shell: | + . /root/openrc; + openstack flavor create {{ item.name }} \ + --id {{ item.id }} --ram {{ item.ram }} \ + --disk {{ item.disk }} --vcpus {{ item.vcpus }} || true + with_items: "{{ flavors }}" diff --git a/deploy/adapters/ansible/roles/config-deployment/files/os-flavor/vars/main.yml b/deploy/adapters/ansible/roles/config-deployment/files/os-flavor/vars/main.yml new file mode 100644 index 00000000..d9c36d42 --- /dev/null +++ b/deploy/adapters/ansible/roles/config-deployment/files/os-flavor/vars/main.yml @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2017 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 +############################################################################## +--- +flavors: + - id: 0 + name: m1.nano + vcpus: 1 + ram: 64 + disk: 1 + + - id: 1 + name: m1.tiny + vcpus: 1 + ram: 512 + disk: 1 + + - id: 2 + name: m1.small + vcpus: 1 + ram: 2048 + disk: 20 + + - id: 3 + name: m1.medium + vcpus: 2 + ram: 4096 + disk: 40 + + - id: 4 + name: m1.large + vcpus: 4 + ram: 8192 + disk: 80 + + - id: 5 + name: m1.xlarge + vcpus: 8 + ram: 16384 + disk: 160 diff --git a/deploy/adapters/ansible/roles/config-deployment/files/setup-ovs.yml b/deploy/adapters/ansible/roles/config-deployment/files/setup-ovs.yml new file mode 100644 index 00000000..10972401 --- /dev/null +++ b/deploy/adapters/ansible/roles/config-deployment/files/setup-ovs.yml @@ -0,0 +1,55 @@ +--- +- name: Installation and setup of Neutron + hosts: neutron_openvswitch_agent + gather_facts: "{{ gather_facts | default(True) }}" + max_fail_percentage: 20 + user: root + tasks: + - name: stop neutron-openvswitch-agent + service: + name: neutron-openvswitch-agent + state: stopped + + - name: change the openvswitch_agent.ini + lineinfile: + dest: /etc/neutron/plugins/ml2/openvswitch_agent.ini + insertafter: '^bridge_mappings' + line: "local_ip = {{ hostvars[inventory_hostname]['container_networks']['tunnel_address']['address'] }}" + when: + - inventory_hostname not in groups['nova_compute'] + + - name: change the openvswitch_agent.ini + lineinfile: + dest: /etc/neutron/plugins/ml2/openvswitch_agent.ini + regexp: '^bridge_mappings' + insertafter: '^bridge_mappings' + line: "local_ip = {{hostvars[inventory_hostname]['ansible_br_vxlan']['ipv4']['address']}}" + notify: + - Restart neutron-openvswitch-agent + when: + - inventory_hostname in groups['nova_compute'] + + - name: Setup br-provider + openvswitch_bridge: + bridge: br-provider + state: present + notify: + - Restart neutron-openvswitch-agent + when: + - inventory_hostname not in groups['nova_compute'] + + - name: Add port to br-provider + openvswitch_port: + bridge: br-provider + port: "eth12" + state: present + notify: + - Restart neutron-openvswitch-agent + when: + - inventory_hostname not in groups['nova_compute'] + + handlers: + - name: Restart neutron-openvswitch-agent + service: + name: neutron-openvswitch-agent + state: restarted -- cgit 1.2.3-korg