From 819912d0379f6cd2b2693c2968576f7514a117c5 Mon Sep 17 00:00:00 2001 From: liyuenan Date: Mon, 19 Dec 2016 11:06:36 +0800 Subject: master only support newton JIRA: COMPASS-513 Remove other roles and ppa, master only support newton. Change-Id: I47ddb16baa25902c3e05cc7f9d0d6430f5dc7e00 Signed-off-by: liyuenan --- .../roles/neutron-compute/handlers/main.yml | 15 --- .../roles/neutron-compute/tasks/main.yml | 75 --------------- .../roles/neutron-compute/templates/neutron.conf | 105 --------------------- .../roles/neutron-compute/vars/Debian.yml | 19 ---- 4 files changed, 214 deletions(-) delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/neutron-compute/handlers/main.yml delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/neutron-compute/tasks/main.yml delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/neutron-compute/templates/neutron.conf delete mode 100644 deploy/adapters/ansible/openstack_newton_xenial/roles/neutron-compute/vars/Debian.yml (limited to 'deploy/adapters/ansible/openstack_newton_xenial/roles/neutron-compute') diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/neutron-compute/handlers/main.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/neutron-compute/handlers/main.yml deleted file mode 100644 index ca4e8088..00000000 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/neutron-compute/handlers/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 -############################################################################## ---- -- name: restart neutron compute service - service: name={{ item }} state=restarted enabled=yes - with_items: services | union(services_noarch) - -- name: restart nova-compute services - service: name=nova-compute state=restarted enabled=yes diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/neutron-compute/tasks/main.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/neutron-compute/tasks/main.yml deleted file mode 100644 index 375e325d..00000000 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/neutron-compute/tasks/main.yml +++ /dev/null @@ -1,75 +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: disable auto start - copy: - content: "#!/bin/sh\nexit 101" - dest: "/usr/sbin/policy-rc.d" - mode: 0755 - when: ansible_os_family == "Debian" - -- name: install compute-related neutron 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: 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.conf - sed -i 's,plugins/ml2/openvswitch_agent.ini,plugin.ini,g' /etc/init.d/neutron-openvswitch-agent - when: ansible_os_family == "Debian" - -- name: generate neutron compute service list - lineinfile: dest=/opt/service create=yes line='{{ item }}' - with_items: services | union(services_noarch) - -- 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=neutron.conf - dest=/etc/neutron/neutron.conf backup=yes - notify: - - restart neutron compute service - - restart nova-compute services - -- meta: flush_handlers - -- include: ../../neutron-network/tasks/odl.yml - when: "'opendaylight' in {{ NEUTRON_MECHANISM_DRIVERS }}" diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/neutron-compute/templates/neutron.conf b/deploy/adapters/ansible/openstack_newton_xenial/roles/neutron-compute/templates/neutron.conf deleted file mode 100644 index a676e951..00000000 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/neutron-compute/templates/neutron.conf +++ /dev/null @@ -1,105 +0,0 @@ -[DEFAULT] -verbose = {{ VERBOSE }} -debug = {{ VERBOSE }} -state_path = /var/lib/neutron -lock_path = $state_path/lock -notify_nova_on_port_status_changes = True -notify_nova_on_port_data_changes = True -log_dir = /var/log/neutron -bind_host = {{ network_server_host }} -bind_port = 9696 -core_plugin = ml2 -service_plugins = router -api_paste_config = api-paste.ini -auth_strategy = keystone -dhcp_lease_duration = 86400 -allow_overlapping_ips = True -rpc_backend = rabbit -rpc_thread_pool_size = 240 -rpc_conn_pool_size = 100 -rpc_response_timeout = 300 -rpc_cast_timeout = 300 -notification_driver = neutron.openstack.common.notifier.rpc_notifier -default_notification_level = INFO -notification_topics = notifications -agent_down_time = 75 -network_scheduler_driver = neutron.scheduler.dhcp_agent_scheduler.ChanceScheduler -router_scheduler_driver = neutron.scheduler.l3_agent_scheduler.ChanceScheduler -api_workers = 8 -rpc_workers = 8 -notify_nova_on_port_status_changes = True -notify_nova_on_port_data_changes = True -nova_url = http://{{ internal_vip.ip }}:8774/v3 -nova_region_name = RegionOne -nova_admin_username = nova -nova_admin_password = {{ NOVA_PASS }} -nova_admin_auth_url = http://{{ internal_vip.ip }}:35357/v3 -send_events_interval = 2 - -[quotas] -quota_driver = neutron.db.quota_db.DbQuotaDriver -quota_items = network,subnet,port -default_quota = -1 -quota_network = 100 -quota_subnet = 100 -quota_port = 8000 -quota_security_group = 1000 -quota_security_group_rule = 1000 - -[agent] -root_helper = "sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf" -report_interval = 30 - -[keystone_authtoken] -auth_uri = http://{{ internal_vip.ip }}:5000 -auth_url = http://{{ internal_vip.ip }}:35357 -auth_type = password -project_domain_name = default -user_domain_name = default -project_name = service -username = neutron -password = {{ NEUTRON_PASS }} - -identity_uri = http://{{ internal_vip.ip }}:35357 -admin_tenant_name = service -admin_user = neutron -admin_password = {{ NEUTRON_PASS }} -signing_dir = $state_path/keystone-signing - -[database] -connection = mysql://neutron:{{ NEUTRON_DBPASS }}@{{ db_host }}/neutron -slave_connection = -max_retries = 10 -retry_interval = 10 -min_pool_size = 1 -max_pool_size = 100 -idle_timeout = 30 -use_db_reconnect = True -max_overflow = 100 -connection_debug = 0 -connection_trace = False -pool_timeout = 10 - -[service_providers] -service_provider=FIREWALL:Iptables:neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewllDriver:default - -{% if enable_fwaas %} -[fwaas] -driver = neutron_fwaas.services.firewall.drivers.linux.iptables_fwaas.IptablesFwaasDriver -enabled = True -{% endif %} - -[nova] -auth_url = http://{{ internal_vip.ip }}:35357 -auth_type = password -project_domain_name = default -user_domain_name = default -project_name = service -username = nova -password = {{ NOVA_PASS }} - -[oslo_messaging_rabbit] -rabbit_host = {{ rabbit_host }} -rabbit_password = {{ RABBIT_PASS }} -rabbit_port = 5672 -rabbit_userid = {{ RABBIT_USER }} diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/neutron-compute/vars/Debian.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/neutron-compute/vars/Debian.yml deleted file mode 100644 index 83d7f323..00000000 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/neutron-compute/vars/Debian.yml +++ /dev/null @@ -1,19 +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-common - - neutron-plugin-ml2 - - openvswitch-switch-dpdk - - openvswitch-switch - - neutron-plugin-openvswitch-agent - -services: - - neutron-openvswitch-agent -- cgit 1.2.3-korg