From 95ecdb773c9fa90f9e4f1f792f5cc5dc8328fd6a Mon Sep 17 00:00:00 2001 From: chigang Date: Fri, 30 Jun 2017 20:24:25 +0800 Subject: Remove obsoleted code JIRA:- use OpenStack-ansible deploy openstack, so remove obsoleted code. Some of the enhanced features will be added in later versions Change-Id: Ie92b92b5de234a7d7d03b578b0bc15fd0218b3b3 Signed-off-by: chigang --- .../roles/neutron-network/files/vpnaas.filters | 7 -- .../ansible/roles/neutron-network/files/xorp | 23 ---- .../roles/neutron-network/handlers/main.yml | 31 ------ .../roles/neutron-network/tasks/firewall.yml | 31 ------ .../roles/neutron-network/tasks/igmp-router.yml | 32 ------ .../ansible/roles/neutron-network/tasks/main.yml | 123 --------------------- .../ansible/roles/neutron-network/tasks/odl.yml | 25 ----- .../ansible/roles/neutron-network/tasks/vpn.yml | 49 -------- .../roles/neutron-network/templates/dhcp_agent.ini | 90 --------------- .../neutron-network/templates/etc/xorp/config.boot | 25 ----- .../roles/neutron-network/templates/l3_agent.ini | 81 -------------- .../neutron-network/templates/metadata_agent.ini | 46 -------- .../ansible/roles/neutron-network/vars/Debian.yml | 29 ----- .../ansible/roles/neutron-network/vars/RedHat.yml | 28 ----- .../ansible/roles/neutron-network/vars/main.yml | 15 --- 15 files changed, 635 deletions(-) delete mode 100644 deploy/adapters/ansible/roles/neutron-network/files/vpnaas.filters delete mode 100644 deploy/adapters/ansible/roles/neutron-network/files/xorp delete mode 100644 deploy/adapters/ansible/roles/neutron-network/handlers/main.yml delete mode 100755 deploy/adapters/ansible/roles/neutron-network/tasks/firewall.yml delete mode 100644 deploy/adapters/ansible/roles/neutron-network/tasks/igmp-router.yml delete mode 100644 deploy/adapters/ansible/roles/neutron-network/tasks/main.yml delete mode 100644 deploy/adapters/ansible/roles/neutron-network/tasks/odl.yml delete mode 100755 deploy/adapters/ansible/roles/neutron-network/tasks/vpn.yml delete mode 100644 deploy/adapters/ansible/roles/neutron-network/templates/dhcp_agent.ini delete mode 100644 deploy/adapters/ansible/roles/neutron-network/templates/etc/xorp/config.boot delete mode 100644 deploy/adapters/ansible/roles/neutron-network/templates/l3_agent.ini delete mode 100644 deploy/adapters/ansible/roles/neutron-network/templates/metadata_agent.ini delete mode 100644 deploy/adapters/ansible/roles/neutron-network/vars/Debian.yml delete mode 100644 deploy/adapters/ansible/roles/neutron-network/vars/RedHat.yml delete mode 100644 deploy/adapters/ansible/roles/neutron-network/vars/main.yml (limited to 'deploy/adapters/ansible/roles/neutron-network') diff --git a/deploy/adapters/ansible/roles/neutron-network/files/vpnaas.filters b/deploy/adapters/ansible/roles/neutron-network/files/vpnaas.filters deleted file mode 100644 index c5eaa80c..00000000 --- a/deploy/adapters/ansible/roles/neutron-network/files/vpnaas.filters +++ /dev/null @@ -1,7 +0,0 @@ -[Filters] -ip: IpFilter, ip, root -ip_exec: IpNetnsExecFilter, ip, root -ipsec: CommandFilter, ipsec, root -strongswan: CommandFilter, strongswan, root -neutron_netns_wrapper: CommandFilter, neutron-vpn-netns-wrapper, root -neutron_netns_wrapper_local: CommandFilter, /usr/local/bin/neutron-vpn-netns-wrapper, root diff --git a/deploy/adapters/ansible/roles/neutron-network/files/xorp b/deploy/adapters/ansible/roles/neutron-network/files/xorp deleted file mode 100644 index 5a486107..00000000 --- a/deploy/adapters/ansible/roles/neutron-network/files/xorp +++ /dev/null @@ -1,23 +0,0 @@ -# Defaults for xorp initscript -# sourced by /etc/init.d/xorp -# installed at /etc/default/xorp by the maintainer scripts - -# -# This is a POSIX shell fragment -# - -# Master system-wide xorp switch. The initscript -# will not run if it is not set to yes. - -RUN="yes" - - -# Additional options that are passed to the rtrmgr Daemon. -# e.g. : -# -a Host allowed by the finder -# -n Subnet allowed by the finder -# -v Print verbose information -# -b Specify boot file -# -d Run as a daemon, detach from tty - -DAEMON_OPTS="-b /etc/xorp/config.boot " diff --git a/deploy/adapters/ansible/roles/neutron-network/handlers/main.yml b/deploy/adapters/ansible/roles/neutron-network/handlers/main.yml deleted file mode 100644 index cd98581a..00000000 --- a/deploy/adapters/ansible/roles/neutron-network/handlers/main.yml +++ /dev/null @@ -1,31 +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: restart neutron network relation service - service: name={{ item }} state=restarted enabled=yes - with_flattened: - - "{{ services_noarch }}" - - "{{ services }}" - -- name: restart openvswitch agent service - service: name=neutron-openvswitch-agent state=restarted enabled=yes - -- name: restart vpn agent service - service: name={{ item }} state=restarted enabled=yes - with_items: - - neutron-vpn-agent - - strongswan - -- name: kill dnsmasq - command: killall dnsmasq - ignore_errors: "True" - -- name: restart xorp - service: name=xorp state=restarted enabled=yes sleep=10 - ignore_errors: "True" diff --git a/deploy/adapters/ansible/roles/neutron-network/tasks/firewall.yml b/deploy/adapters/ansible/roles/neutron-network/tasks/firewall.yml deleted file mode 100755 index 9aa24045..00000000 --- a/deploy/adapters/ansible/roles/neutron-network/tasks/firewall.yml +++ /dev/null @@ -1,31 +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 -############################################################################## ---- -- include_vars: "{{ ansible_os_family }}.yml" - -- name: disable auto start - copy: - content: "#!/bin/sh\nexit 101" - dest: "/usr/sbin/policy-rc.d" - mode: 0755 - when: ansible_os_family == "Debian" - -- name: install firewall packages - action: "{{ ansible_pkg_mgr }} name={{ item }} state=present" - with_items: "{{ firewall_packages }}" - -- name: enable auto start - file: - path=/usr/sbin/policy-rc.d - state=absent - when: ansible_os_family == "Debian" - -- name: update firewall related conf - shell: | - crudini --set --list /etc/neutron/neutron.conf DEFAULT service_plugins firewall diff --git a/deploy/adapters/ansible/roles/neutron-network/tasks/igmp-router.yml b/deploy/adapters/ansible/roles/neutron-network/tasks/igmp-router.yml deleted file mode 100644 index ec12b318..00000000 --- a/deploy/adapters/ansible/roles/neutron-network/tasks/igmp-router.yml +++ /dev/null @@ -1,32 +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: Install XORP to provide IGMP router functionality - action: "{{ ansible_pkg_mgr }} name={{ item }} state=present" - with_items: "{{ xorp_packages }}" - -- name: create xorp directory - file: path=/etc/xorp state=directory - -- name: configure xorp - template: src=etc/xorp/config.boot dest=/etc/xorp/config.boot - notify: - - restart xorp - -- name: set xorp defaults - copy: src=xorp dest=/etc/default/xorp - notify: - - restart xorp - -- meta: flush_handlers - -- name: start and enable xorp service - service: name=xorp state=started enabled=yes - retries: 2 - delay: 10 diff --git a/deploy/adapters/ansible/roles/neutron-network/tasks/main.yml b/deploy/adapters/ansible/roles/neutron-network/tasks/main.yml deleted file mode 100644 index 1e204405..00000000 --- a/deploy/adapters/ansible/roles/neutron-network/tasks/main.yml +++ /dev/null @@ -1,123 +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 -############################################################################## ---- -- include_vars: "{{ ansible_os_family }}.yml" - -- name: activate ipv4 forwarding - sysctl: name=net.ipv4.ip_forward value=1 - state=present reload=yes - -- name: deactivate ipv4 rp filter - sysctl: name=net.ipv4.conf.all.rp_filter value=0 - state=present reload=yes - -- name: deactivate ipv4 default rp filter - sysctl: name=net.ipv4.conf.default.rp_filter - value=0 state=present reload=yes - -- name: assert kernel support for vxlan - command: modinfo -F version vxlan - when: "'vxlan' in {{ NEUTRON_TUNNEL_TYPES | to_json }}" - -- name: assert iproute2 suppport for vxlan - command: ip link add type vxlan help - register: iproute_out - failed_when: iproute_out.rc == 255 - when: "'vxlan' in {{ NEUTRON_TUNNEL_TYPES | to_json }}" - -- name: disable auto start - copy: - content: "#!/bin/sh\nexit 101" - dest: "/usr/sbin/policy-rc.d" - mode: 0755 - when: ansible_os_family == "Debian" - -- name: install neutron network related packages - action: "{{ ansible_pkg_mgr }} name={{ item }} state=present" - with_items: "{{ packages | union(packages_noarch) }}" - -- name: enable auto start - file: - path=/usr/sbin/policy-rc.d - state=absent - when: ansible_os_family == "Debian" - -- name: generate neutron network service list - lineinfile: dest=/opt/service create=yes line='{{ item }}' - with_items: "{{ services | union(services_noarch) }}" - -- name: fix openstack neutron plugin config file - shell: | - sed -i 's,plugins/ml2/openvswitch_agent.ini,plugin.ini,g' \ - /usr/lib/systemd/system/neutron-openvswitch-agent.service; - systemctl daemon-reload - when: ansible_os_family == 'RedHat' - -- name: fix openstack neutron plugin config file ubuntu - shell: | - sed -i 's,plugins/ml2/openvswitch_agent.ini,plugin.ini,g' \ - /etc/init/neutron-openvswitch-agent.con; - sed -i 's,plugins/ml2/openvswitch_agent.ini,plugin.ini,g' \ - /etc/init.d/neutron-openvswitch-agent; - when: ansible_os_family == "Debian" - -- name: config l3 agent - template: src=l3_agent.ini dest=/etc/neutron/l3_agent.ini - backup=yes - -- name: config dhcp agent - template: src=dhcp_agent.ini dest=/etc/neutron/dhcp_agent.ini - backup=yes - -- name: update dnsmasq-neutron.conf - template: src=templates/dnsmasq-neutron.conf - dest=/etc/neutron/dnsmasq-neutron.conf - -- name: config metadata agent - template: src=metadata_agent.ini - dest=/etc/neutron/metadata_agent.ini backup=yes - -- name: config ml2 plugin - template: src=templates/ml2_conf.ini - dest=/etc/neutron/plugins/ml2/ml2_conf.ini - backup=yes - -- name: ln plugin.ini - file: - src: /etc/neutron/plugins/ml2/ml2_conf.ini - dest: /etc/neutron/plugin.ini - state: link - -- name: config neutron - template: src=templates/neutron.conf - dest=/etc/neutron/neutron.conf backup=yes - -- name: force mtu to 1450 for vxlan - lineinfile: - dest: /etc/neutron/dnsmasq-neutron.conf - regexp: '^dhcp-option-force' - line: 'dhcp-option-force=26,1450' - when: "'vxlan' in {{ NEUTRON_TUNNEL_TYPES | to_json }}" - -- include: firewall.yml - when: enable_fwaas == True - -- include: vpn.yml - when: enable_vpnaas == True - -- include: odl.yml - when: "'opendaylight' in {{ NEUTRON_MECHANISM_DRIVERS | to_json }}" - -- name: restart neutron network relation service - service: name={{ item }} state=restarted enabled=yes - with_flattened: - - "{{ services_noarch }}" - - "{{ services }}" - -- meta: flush_handlers diff --git a/deploy/adapters/ansible/roles/neutron-network/tasks/odl.yml b/deploy/adapters/ansible/roles/neutron-network/tasks/odl.yml deleted file mode 100644 index 1105b45d..00000000 --- a/deploy/adapters/ansible/roles/neutron-network/tasks/odl.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: ovs set manager - command: ovs-vsctl set-manager tcp:{{ controller }}:6640 - -- name: get ovs uuid - shell: ovs-vsctl get Open_vSwitch . _uuid - register: ovs_uuid - -- name: set bridge_mappings - command: | - ovs-vsctl set Open_vSwitch {{ ovs_uuid.stdout }} \ - other_config:bridge_mappings=physnet1:{{ INTERFACE_NAME }} - -- name: set local ip - command: | - ovs-vsctl set Open_vSwitch {{ ovs_uuid.stdout }} \ - other_config:local_ip={{ internal_ip }} diff --git a/deploy/adapters/ansible/roles/neutron-network/tasks/vpn.yml b/deploy/adapters/ansible/roles/neutron-network/tasks/vpn.yml deleted file mode 100755 index 22f4411a..00000000 --- a/deploy/adapters/ansible/roles/neutron-network/tasks/vpn.yml +++ /dev/null @@ -1,49 +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 -############################################################################## ---- -- include_vars: "{{ ansible_os_family }}.yml" - -- name: disable auto start - copy: - content: "#!/bin/sh\nexit 101" - dest: "/usr/sbin/policy-rc.d" - mode: 0755 - when: ansible_os_family == "Debian" - -- name: install vpn packages - action: "{{ ansible_pkg_mgr }} name={{ item }} state=present" - with_items: "{{ vpn_packages }}" - -- name: enable auto start - file: - path=/usr/sbin/policy-rc.d - state=absent - when: ansible_os_family == "Debian" - -- name: update vpn related conf - shell: | - crudini --set /etc/neutron/l3_agent.ini vpnagent vpn_device_driver \ - neutron_vpnaas.services.vpn.device_drivers.strongswan_ipsec.StrongSwanDriver; - crudini --set --list /etc/neutron/neutron.conf DEFAULT service_plugins vpnaas; - crudini --set /etc/neutron/neutron_vpnaas.conf service_providers service_provider \ - 'VPN:strongswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default' - -- name: make sure rootwrap.d dir exist - file: path=/etc/neutron/rootwrap.d state=directory mode=0755 - -- name: update rootwrap - copy: src=vpnaas.filters dest=/etc/neutron/rootwrap.d/vpnaas.filters - -- name: enable vpn service - service: name={{ item }} state=started enabled=yes - with_items: - - neutron-vpn-agent - - strongswan - notify: - - restart vpn agent service diff --git a/deploy/adapters/ansible/roles/neutron-network/templates/dhcp_agent.ini b/deploy/adapters/ansible/roles/neutron-network/templates/dhcp_agent.ini deleted file mode 100644 index 4340c39c..00000000 --- a/deploy/adapters/ansible/roles/neutron-network/templates/dhcp_agent.ini +++ /dev/null @@ -1,90 +0,0 @@ -[DEFAULT] -# Show debugging output in log (sets DEBUG log level output) -# debug = False -verbose = True - -# The DHCP agent will resync its state with Neutron to recover from any -# transient notification or rpc errors. The interval is number of -# seconds between attempts. -resync_interval = 5 - -# The DHCP agent requires an interface driver be set. Choose the one that best -# matches your plugin. -# interface_driver = - -# Example of interface_driver option for OVS based plugins(OVS, Ryu, NEC, NVP, -# BigSwitch/Floodlight) -interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver - -# Name of Open vSwitch bridge to use -# ovs_integration_bridge = br-int - -# Use veth for an OVS interface or not. -# Support kernels with limited namespace support -# (e.g. RHEL 6.5) so long as ovs_use_veth is set to True. -ovs_use_veth = False - -# Example of interface_driver option for LinuxBridge -# interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver - -# The agent can use other DHCP drivers. Dnsmasq is the simplest and requires -# no additional setup of the DHCP server. -dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq - -# Allow overlapping IP (Must have kernel build with CONFIG_NET_NS=y and -# iproute2 package that supports namespaces). -use_namespaces = True - -# The DHCP server can assist with providing metadata support on isolated -# networks. Setting this value to True will cause the DHCP server to append -# specific host routes to the DHCP request. The metadata service will only -# be activated when the subnet does not contain any router port. The guest -# instance must be configured to request host routes via DHCP (Option 121). -enable_isolated_metadata = True - -# Allows for serving metadata requests coming from a dedicated metadata -# access network whose cidr is 169.254.169.254/16 (or larger prefix), and -# is connected to a Neutron router from which the VMs send metadata -# request. In this case DHCP Option 121 will not be injected in VMs, as -# they will be able to reach 169.254.169.254 through a router. -# This option requires enable_isolated_metadata = True -enable_metadata_network = False - -# Number of threads to use during sync process. Should not exceed connection -# pool size configured on server. -# num_sync_threads = 4 - -# Location to store DHCP server config files -# dhcp_confs = $state_path/dhcp - -# Domain to use for building the hostnames -dhcp_domain = openstacklocal - -# Override the default dnsmasq settings with this file -# dnsmasq_config_file = -dnsmasq_config_file = /etc/neutron/dnsmasq-neutron.conf - -# Comma-separated list of DNS servers which will be used by dnsmasq -# as forwarders. -# dnsmasq_dns_servers = - -# Limit number of leases to prevent a denial-of-service. -dnsmasq_lease_max = 16777216 - -# Location to DHCP lease relay UNIX domain socket -# dhcp_lease_relay_socket = $state_path/dhcp/lease_relay - -# Location of Metadata Proxy UNIX domain socket -# metadata_proxy_socket = $state_path/metadata_proxy - -# dhcp_delete_namespaces, which is false by default, can be set to True if -# namespaces can be deleted cleanly on the host running the dhcp agent. -# Do not enable this until you understand the problem with the Linux iproute -# utility mentioned in https://bugs.launchpad.net/neutron/+bug/1052535 and -# you are sure that your version of iproute does not suffer from the problem. -# If True, namespaces will be deleted when a dhcp server is disabled. -# dhcp_delete_namespaces = False - -# Timeout for ovs-vsctl commands. -# If the timeout expires, ovs commands will fail with ALARMCLOCK error. -# ovs_vsctl_timeout = 10 diff --git a/deploy/adapters/ansible/roles/neutron-network/templates/etc/xorp/config.boot b/deploy/adapters/ansible/roles/neutron-network/templates/etc/xorp/config.boot deleted file mode 100644 index 426a8fd1..00000000 --- a/deploy/adapters/ansible/roles/neutron-network/templates/etc/xorp/config.boot +++ /dev/null @@ -1,25 +0,0 @@ -interfaces { - restore-original-config-on-shutdown: false - interface {{ internal_nic }} { - description: "Internal pNodes interface" - disable: false - default-system-config - } -} - -protocols { - igmp { - disable: false - interface {{ internal_nic }} { - vif {{ internal_nic }} { - disable: false - version: 3 - } - } - traceoptions { - flag all { - disable: false - } - } - } -} diff --git a/deploy/adapters/ansible/roles/neutron-network/templates/l3_agent.ini b/deploy/adapters/ansible/roles/neutron-network/templates/l3_agent.ini deleted file mode 100644 index 5f499348..00000000 --- a/deploy/adapters/ansible/roles/neutron-network/templates/l3_agent.ini +++ /dev/null @@ -1,81 +0,0 @@ -[DEFAULT] -# Show debugging output in log (sets DEBUG log level output) -# debug = False -verbose = True - -# L3 requires that an interface driver be set. Choose the one that best -# matches your plugin. -# interface_driver = - -# Example of interface_driver option for OVS based plugins (OVS, Ryu, NEC) -# that supports L3 agent -# interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver -interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver - -# Use veth for an OVS interface or not. -# Support kernels with limited namespace support -# (e.g. RHEL 6.5) so long as ovs_use_veth is set to True. -# ovs_use_veth = False - -# Example of interface_driver option for LinuxBridge -# interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver - -# Allow overlapping IP (Must have kernel build with CONFIG_NET_NS=y and -# iproute2 package that supports namespaces). -use_namespaces = True - -# If use_namespaces is set as False then the agent can only configure one router. - -# This is done by setting the specific router_id. -# router_id = - -# When external_network_bridge is set, each L3 agent can be associated -# with no more than one external network. This value should be set to the UUID -# of that external network. To allow L3 agent support multiple external -# networks, both the external_network_bridge and gateway_external_network_id -# must be left empty. -# gateway_external_network_id = - -# Indicates that this L3 agent should also handle routers that do not have -# an external network gateway configured. This option should be True only -# for a single agent in a Neutron deployment, and may be False for all agents -# if all routers must have an external network gateway -handle_internal_only_routers = True - -# Name of bridge used for external network traffic. This should be set to -# empty value for the linux bridge. when this parameter is set, each L3 agent -# can be associated with no more than one external network. -external_network_bridge = - -# TCP Port used by Neutron metadata server -metadata_port = 9697 - -# Send this many gratuitous ARPs for HA setup. Set it below or equal to 0 -# to disable this feature. -send_arp_for_ha = 3 - -# seconds between re-sync routers' data if needed -periodic_interval = 40 - -# seconds to start to sync routers' data after -# starting agent -periodic_fuzzy_delay = 5 - -# enable_metadata_proxy, which is true by default, can be set to False -# if the Nova metadata server is not available -# enable_metadata_proxy = True - -# Location of Metadata Proxy UNIX domain socket -# metadata_proxy_socket = $state_path/metadata_proxy - -# router_delete_namespaces, which is false by default, can be set to True if -# namespaces can be deleted cleanly on the host running the L3 agent. -# Do not enable this until you understand the problem with the Linux iproute -# utility mentioned in https://bugs.launchpad.net/neutron/+bug/1052535 and -# you are sure that your version of iproute does not suffer from the problem. -# If True, namespaces will be deleted when a router is destroyed. -# router_delete_namespaces = False - -# Timeout for ovs-vsctl commands. -# If the timeout expires, ovs commands will fail with ALARMCLOCK error. -# ovs_vsctl_timeout = 10 diff --git a/deploy/adapters/ansible/roles/neutron-network/templates/metadata_agent.ini b/deploy/adapters/ansible/roles/neutron-network/templates/metadata_agent.ini deleted file mode 100644 index 994f0a63..00000000 --- a/deploy/adapters/ansible/roles/neutron-network/templates/metadata_agent.ini +++ /dev/null @@ -1,46 +0,0 @@ -[DEFAULT] -# Show debugging output in log (sets DEBUG log level output) -debug = True - -# The Neutron user information for accessing the Neutron API. -auth_url = http://{{ internal_vip.ip }}:5000/v3 -auth_region = RegionOne -# Turn off verification of the certificate for ssl -# auth_insecure = False -# Certificate Authority public key (CA cert) file for ssl -# auth_ca_cert = -admin_tenant_name = service -admin_user = neutron -admin_password = {{ NEUTRON_PASS }} - -# Network service endpoint type to pull from the keystone catalog -# endpoint_type = adminURL - -# IP address used by Nova metadata server -nova_metadata_ip = {{ internal_vip.ip }} - -# TCP Port used by Nova metadata server -nova_metadata_port = 8775 - -# When proxying metadata requests, Neutron signs the Instance-ID header with a -# shared secret to prevent spoofing. You may select any string for a secret, -# but it must match here and in the configuration used by the Nova Metadata -# Server. NOTE: Nova uses a different key: neutron_metadata_proxy_shared_secret -metadata_proxy_shared_secret = {{ METADATA_SECRET }} - -# Location of Metadata Proxy UNIX domain socket -# metadata_proxy_socket = $state_path/metadata_proxy - -# Number of separate worker processes for metadata server -# metadata_workers = 0 - -# Number of backlog requests to configure the metadata server socket with -# metadata_backlog = 128 - -# URL to connect to the cache backend. -# Example of URL using memory caching backend -# with ttl set to 5 seconds: cache_url = memory://?default_ttl=5 -# default_ttl=0 parameter will cause cache entries to never expire. -# Otherwise default_ttl specifies time in seconds a cache entry is valid for. -# No cache is used in case no value is passed. -# cache_url = diff --git a/deploy/adapters/ansible/roles/neutron-network/vars/Debian.yml b/deploy/adapters/ansible/roles/neutron-network/vars/Debian.yml deleted file mode 100644 index 3597f587..00000000 --- a/deploy/adapters/ansible/roles/neutron-network/vars/Debian.yml +++ /dev/null @@ -1,29 +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 -############################################################################## ---- -packages: - - neutron-plugin-ml2 - - openvswitch-switch-dpdk - - openvswitch-switch - - neutron-l3-agent - - neutron-dhcp-agent - - neutron-plugin-openvswitch-agent - -services: - - openvswitch-switch - - neutron-openvswitch-agent - -openvswitch_agent: neutron-plugin-openvswitch-agent - -firewall_packages: - -vpn_packages: - -xorp_packages: - - xorp diff --git a/deploy/adapters/ansible/roles/neutron-network/vars/RedHat.yml b/deploy/adapters/ansible/roles/neutron-network/vars/RedHat.yml deleted file mode 100644 index 1d0243a4..00000000 --- a/deploy/adapters/ansible/roles/neutron-network/vars/RedHat.yml +++ /dev/null @@ -1,28 +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 -############################################################################## ---- -packages: - - openstack-neutron-ml2 - - openstack-neutron-openvswitch - -vpn_packages: - - openstack-neutron-vpn-agent - - strongswan - -firewall_packages: - - openstack-neutron-fwaas - -services: - - openvswitch - - neutron-openvswitch-agent - -openvswitch_agent: neutron-openvswitch-agent - -xorp_packages: - - openssl098e diff --git a/deploy/adapters/ansible/roles/neutron-network/vars/main.yml b/deploy/adapters/ansible/roles/neutron-network/vars/main.yml deleted file mode 100644 index ddd983e2..00000000 --- a/deploy/adapters/ansible/roles/neutron-network/vars/main.yml +++ /dev/null @@ -1,15 +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 -############################################################################## ---- -packages_noarch: [] - -services_noarch: - - neutron-l3-agent - - neutron-dhcp-agent - - neutron-metadata-agent -- cgit 1.2.3-korg