diff options
| author | OlegBravo <oleg.bravo.ru@gmail.com> | 2019-10-15 16:13:37 +0300 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2019-10-30 16:13:47 +0100 |
| commit | 12661e2f21e9c8c68d6d174f5ff5b952e394c8a2 (patch) | |
| tree | c3abfed2cb039540827e66ab322ece8a8dd58235 /Makefile.am | |
| parent | 5535dcf51ba759555a8e20504030dc59e526925e (diff) | |
| download | NetworkManager-contrail/vrouter.tar.gz | |
Vhost0 management integration.contrail/vrouter
Removing systemd networking configuration at RHEL8 jeopardized Contrail Virtual
Router deployment (https://github.com/Juniper/contrail-vrouter ) - multiple CNI
are based on this project.
Problem is in configuring vhost0 - layer3 interface , used between host OS and
Vrouter itself. It is being configured with systemd now , but for newest RHEL
major release this functionality should be moved to NetworkManager.
This will also benefit recent problems we had with OpenShift which also uses NM.
Documentation was added into README.md , for new functinality testing - just
follow it , creating of vhost0 interface is expted as successfull result.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index dde8a7b03c..4cebb0da45 100644 --- a/Makefile.am +++ b/Makefile.am @@ -547,6 +547,8 @@ introspection_sources = \ introspection/org.freedesktop.NetworkManager.Device.Bond.h \ introspection/org.freedesktop.NetworkManager.Device.Bridge.c \ introspection/org.freedesktop.NetworkManager.Device.Bridge.h \ + introspection/org.freedesktop.NetworkManager.Device.ContrailVrouter.c \ + introspection/org.freedesktop.NetworkManager.Device.ContrailVrouter.h \ introspection/org.freedesktop.NetworkManager.Device.Dummy.c \ introspection/org.freedesktop.NetworkManager.Device.Dummy.h \ introspection/org.freedesktop.NetworkManager.Device.Generic.c \ @@ -636,6 +638,7 @@ DBUS_INTERFACE_DOCS = \ docs/api/dbus-org.freedesktop.NetworkManager.Device.Bluetooth.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.Bond.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.Bridge.xml \ + docs/api/dbus-org.freedesktop.NetworkManager.Device.ContrailVrouter.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.Dummy.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.Generic.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml \ @@ -704,6 +707,7 @@ dbusinterfaces_DATA = \ introspection/org.freedesktop.NetworkManager.Device.Bond.xml \ introspection/org.freedesktop.NetworkManager.Device.Bridge.xml \ introspection/org.freedesktop.NetworkManager.Device.Dummy.xml \ + introspection/org.freedesktop.NetworkManager.Device.ContrailVrouter.xml \ introspection/org.freedesktop.NetworkManager.Device.Generic.xml \ introspection/org.freedesktop.NetworkManager.Device.IPTunnel.xml \ introspection/org.freedesktop.NetworkManager.Device.Infiniband.xml \ @@ -776,6 +780,7 @@ libnm_core_lib_h_pub_real = \ libnm-core/nm-setting-bridge-port.h \ libnm-core/nm-setting-bridge.h \ libnm-core/nm-setting-cdma.h \ + libnm-core/nm-setting-contrail-vrouter.h \ libnm-core/nm-setting-connection.h \ libnm-core/nm-setting-dcb.h \ libnm-core/nm-setting-dummy.h \ @@ -850,6 +855,7 @@ libnm_core_lib_c_settings_real = \ libnm-core/nm-setting-bridge-port.c \ libnm-core/nm-setting-bridge.c \ libnm-core/nm-setting-cdma.c \ + libnm-core/nm-setting-contrail-vrouter.c \ libnm-core/nm-setting-connection.c \ libnm-core/nm-setting-dcb.c \ libnm-core/nm-setting-dummy.c \ @@ -1189,6 +1195,7 @@ libnm_lib_h_pub_real = \ libnm/nm-autoptr.h \ libnm/nm-checkpoint.h \ libnm/nm-client.h \ + libnm/nm-device-contrail-vrouter.h \ libnm/nm-device-6lowpan.h \ libnm/nm-device-adsl.h \ libnm/nm-device-bond.h \ @@ -1255,6 +1262,7 @@ libnm_lib_c_real = \ libnm/nm-device-bond.c \ libnm/nm-device-bridge.c \ libnm/nm-device-bt.c \ + libnm/nm-device-contrail-vrouter.c \ libnm/nm-device-dummy.c \ libnm/nm-device-ethernet.c \ libnm/nm-device-generic.c \ @@ -3657,6 +3665,48 @@ EXTRA_DIST += \ src/devices/ovs/meson.build ############################################################################### +# src/devices/contrail +############################################################################### + +if WITH_CONTRAIL + +if HAVE_SYSTEMD + +systemdnmunitdir = $(systemdsystemunitdir)/NetworkManager.service.d +systemdnmunit_DATA = \ + data/NetworkManager-contrail.conf + +endif + +core_plugins += src/devices/contrail/libnm-device-plugin-contrail.la + +src_devices_contrail_libnm_device_plugin_contrail_la_SOURCES = \ + src/devices/contrail/nm-contrail-factory.c \ + src/devices/contrail/nm-device-contrail-vrouter.c \ + src/devices/contrail/nm-device-contrail-vrouter.h + +src_devices_contrail_libnm_device_plugin_contrail_la_CPPFLAGS = \ + $(src_cppflags_device_plugin) \ + $(NULL) + +src_devices_contrail_libnm_device_plugin_contrail_la_LDFLAGS = \ + -module -avoid-version \ + -Wl,--version-script="$(srcdir)/linker-script-devices.ver" + +src_devices_contrail_libnm_device_plugin_contrail_la_LIBADD = \ + $(GLIB_LIBS) + +check-local-devices-contrail: src/devices/contrail/libnm-device-plugin-contrail.la + $(srcdir)/tools/check-exports.sh $(builddir)/src/devices/contrail/.libs/libnm-device-plugin-contrail.so "$(srcdir)/linker-script-devices.ver" + $(call check_so_symbols,$(builddir)/src/devices/contrail/.libs/libnm-device-plugin-contrail.so) + +endif + +EXTRA_DIST += \ + data/NetworkManager-contrail.conf \ + src/devices/contrail/meson.build + +############################################################################### # src/dnsmasq/tests ############################################################################### @@ -4763,6 +4813,13 @@ EXTRA_DIST += man/nm-openvswitch.7 dist_dependencies += man/nm-openvswitch.7 endif +if WITH_CONTRAIL +man_pages += man/nm-contrail.7 +else +EXTRA_DIST += man/nm-contrail.7 +dist_dependencies += man/nm-contrail.7 +endif + if CONFIG_PLUGIN_IFCFG_RH man_pages_autogen += man/nm-settings-ifcfg-rh.5 else |
