Build cleanups

- moved patch files into patches dir
- python-etcd is packaged upstream

Change-Id: I2ad33460e1a8b3e57d30976d92c7423a30a68fc9
Signed-off-by: Dan Radez <dradez@redhat.com>

1 files changed, 0 insertions, 47 deletions

diff --git a/build/puppet-neutron-add-odl-settings.patch b/build/puppet-neutron-add-odl-settings.patch
deleted file mode 100644
index aa0b35a1..00000000
--- a/build/puppet-neutron-add-odl-settings.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/manifests/plugins/ml2/opendaylight.pp b/manifests/plugins/ml2/opendaylight.pp
-index a27c4d6..13b56c4 100644
---- a/manifests/plugins/ml2/opendaylight.pp
-+++ b/manifests/plugins/ml2/opendaylight.pp
-@@ -29,12 +29,22 @@
- # (optional) The URI used to connect to the local OVSDB server
- # Defaults to 'tcp:127.0.0.1:6639'
- #
-+# [*port_binding_controller*]
-+# (optional) Name of the controller to be used for port binding.
-+# Defaults to $::os_service_default
-+#
-+# [*odl_hostconf_uri*]
-+# (optional) Path for ODL host configuration REST interface.
-+# Defaults to $::os_service_default
-+#
- class neutron::plugins::ml2::opendaylight (
--  $package_ensure     = 'present',
--  $odl_username       = $::os_service_default,
--  $odl_password       = $::os_service_default,
--  $odl_url            = $::os_service_default,
--  $ovsdb_connection   = 'tcp:127.0.0.1:6639',
-+  $package_ensure          = 'present',
-+  $odl_username            = $::os_service_default,
-+  $odl_password            = $::os_service_default,
-+  $odl_url                 = $::os_service_default,
-+  $ovsdb_connection        = 'tcp:127.0.0.1:6639',
-+  $port_binding_controller = $::os_service_default,
-+  $odl_hostconf_uri        = $::os_service_default,
- ) {
- 
-   include ::neutron::deps
-@@ -48,9 +58,11 @@ class neutron::plugins::ml2::opendaylight (
-   )
- 
-   neutron_plugin_ml2 {
--    'ml2_odl/username': value => $odl_username;
--    'ml2_odl/password': value => $odl_password;
--    'ml2_odl/url':      value => $odl_url;
-+    'ml2_odl/username':                value => $odl_username;
-+    'ml2_odl/password':                value => $odl_password;
-+    'ml2_odl/url':                     value => $odl_url;
-+    'ml2_odl/port_binding_controller': value => $port_binding_controller;
-+    'ml2_odl/odl_hostconf_uri':        value => $odl_hostconf_uri;
-   }
- 
-   neutron_config {