From: Thomas Goirand Date: Thu, 1 Aug 2013 01:38:32 +0000 (+0800) Subject: Removed config scripts for removed OVS and metaplugin plugin package X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=90ced7bbd44d808a93628cf82025bf5245166193;p=openstack-build%2Fneutron-build.git Removed config scripts for removed OVS and metaplugin plugin package Rewritten-From: cd3a1c12ca8603ac67362911ac495f90b74aa355 --- diff --git a/trusty/debian/rules b/trusty/debian/rules index 4c4fe693b..4045c9532 100755 --- a/trusty/debian/rules +++ b/trusty/debian/rules @@ -20,11 +20,7 @@ export OSLO_PACKAGE_VERSION=$(VERSION) override_dh_install: dh_install --fail-missing -X/usr/etc -X/usr/bin - install -D -m 0640 etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini $(CURDIR)/debian/neutron-plugin-openvswitch/usr/share/neutron-plugin-openvswitch/ovs_neutron_plugin.ini - sed -i -e 's|^# Example: tenant_network_type = gre|tenant_network_type = gre|' $(CURDIR)/debian/neutron-plugin-openvswitch/usr/share/neutron-plugin-openvswitch/ovs_neutron_plugin.ini - sed -i -e 's|^# Default: enable_tunneling = False|enable_tunneling = True|' $(CURDIR)/debian/neutron-plugin-openvswitch/usr/share/neutron-plugin-openvswitch/ovs_neutron_plugin.ini - sed -i -e 's|^# Example: tunnel_id_ranges = 1:1000|tunnel_id_ranges = 1:1000|' $(CURDIR)/debian/neutron-plugin-openvswitch/usr/share/neutron-plugin-openvswitch/ovs_neutron_plugin.ini - sed -i -e 's|^# Default: local_ip = 10.0.0.3|local_ip = 192.168.1.10|' $(CURDIR)/debian/neutron-plugin-openvswitch/usr/share/neutron-plugin-openvswitch/ovs_neutron_plugin.ini + install -D -m 0640 etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini $(CURDIR)/debian/neutron-common/usr/share/neutron-common/ovs_neutron_plugin.ini install -D -m 0640 etc/metadata_agent.ini $(CURDIR)/debian/neutron-metadata-agent/usr/share/neutron-metadata-agent/metadata_agent.ini sed -i -e 's|^# nova_metadata_ip = 127.0.0.1|nova_metadata_ip = 127.0.0.1|' $(CURDIR)/debian/neutron-metadata-agent/usr/share/neutron-metadata-agent/metadata_agent.ini @@ -44,12 +40,8 @@ override_dh_auto_clean: rm -rf setuptools_git-*-py*.egg/ rm -f debian/neutron-common.config \ debian/neutron-common.postinst \ - debian/neutron-plugin-openvswitch.config \ - debian/neutron-plugin-openvswitch.postinst \ debian/neutron-server.config \ debian/neutron-server.postinst \ - debian/neutron-plugin-metaplugin.config \ - debian/neutron-plugin-metaplugin.postinst \ debian/neutron-dhcp-agent.postinst \ debian/neutron-metadata-agent.config \ debian/neutron-metadata-agent.postinst @@ -64,12 +56,8 @@ override_dh_auto_build: /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func neutron-common.config /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func neutron-common.postinst - /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func neutron-plugin-openvswitch.config - /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func neutron-plugin-openvswitch.postinst /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func neutron-server.config /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func neutron-server.postinst - /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func neutron-plugin-metaplugin.config - /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func neutron-plugin-metaplugin.postinst /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func neutron-dhcp-agent.postinst /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func neutron-metadata-agent.postinst /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func neutron-metadata-agent.config