From f93fc4fc70694d21f136ae1599b13fd237018b74 Mon Sep 17 00:00:00 2001 From: chigang Date: Tue, 4 Jul 2017 13:21:12 +0800 Subject: Fix keepalived ping address JIRA:- Replace OSA default address with ntp_server address. OSA will use it to check internet connection. Rename some roles that make users confused. Change-Id: I4dd7e242e427e5bc3a611450a3bc436e44a8fefe Signed-off-by: chigang --- .../roles/config-deployment/files/cinder.yml | 13 ----- .../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 | 57 ---------------------- 5 files changed, 149 deletions(-) delete mode 100755 deploy/adapters/ansible/roles/config-deployment/files/cinder.yml delete mode 100644 deploy/adapters/ansible/roles/config-deployment/files/http.yml delete mode 100644 deploy/adapters/ansible/roles/config-deployment/files/os-flavor/tasks/main.yml delete mode 100644 deploy/adapters/ansible/roles/config-deployment/files/os-flavor/vars/main.yml delete 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/cinder.yml b/deploy/adapters/ansible/roles/config-deployment/files/cinder.yml deleted file mode 100755 index 3a39935a..00000000 --- a/deploy/adapters/ansible/roles/config-deployment/files/cinder.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# This file contains an example to show how to set -# the cinder-volume service to run in a container. -# -# Important note: -# When using LVM or any iSCSI-based cinder backends, such as NetApp with -# iSCSI protocol, the cinder-volume service *must* run on metal. -# Reference: https://bugs.launchpad.net/ubuntu/+source/lxc/+bug/1226855 - -container_skel: - cinder_volumes_container: - properties: - is_metal: true diff --git a/deploy/adapters/ansible/roles/config-deployment/files/http.yml b/deploy/adapters/ansible/roles/config-deployment/files/http.yml deleted file mode 100644 index 248fc06d..00000000 --- a/deploy/adapters/ansible/roles/config-deployment/files/http.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -- 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 deleted file mode 100644 index 03b57120..00000000 --- a/deploy/adapters/ansible/roles/config-deployment/files/os-flavor/tasks/main.yml +++ /dev/null @@ -1,17 +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: 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 deleted file mode 100644 index d9c36d42..00000000 --- a/deploy/adapters/ansible/roles/config-deployment/files/os-flavor/vars/main.yml +++ /dev/null @@ -1,45 +0,0 @@ -############################################################################## -# 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 deleted file mode 100644 index 57bc5ef1..00000000 --- a/deploy/adapters/ansible/roles/config-deployment/files/setup-ovs.yml +++ /dev/null @@ -1,57 +0,0 @@ ---- -- 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 - - # yamllint disable rule:line-length - - 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'] - # yamllint enable rule:line-length - - - 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