[PATCH 1/2] systemd-remote-journal: fix bridge ip for guestsfs

[Luis Chamberlain <mcgrof@kernel.org>]

The IP address for the default network must be used for
the systemd-remote-journal. This can vary distro-to-distro
and so provide an easy way to describe this.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
 kconfigs/Kconfig.ansible_provisioning | 3 ++-
 kconfigs/Kconfig.guestfs              | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/kconfigs/Kconfig.ansible_provisioning b/kconfigs/Kconfig.ansible_provisioning
index 2775ddff22ae..0cddf220d2f7 100644
--- a/kconfigs/Kconfig.ansible_provisioning
+++ b/kconfigs/Kconfig.ansible_provisioning
@@ -195,7 +195,8 @@ config DEVCONFIG_SYSTEMD_JOURNAL_USE_HTTP
 
 config DEVCONFIG_SYSTEMD_JOURNAL_REMOTE_URL
 	string "systemd-remote URL"
-	default "http://192.168.124.1"
+	default "http://192.168.124.1" if VAGRANT
+	default GUESTFS_DEFAULT_BRIDGE_IP if GUESTFS
 	help
           This is used for the client /etc/systemd/journal-upload.conf URL line.
           By default we won't use SSL for now. If you should make sure the
diff --git a/kconfigs/Kconfig.guestfs b/kconfigs/Kconfig.guestfs
index 03e0fb865a66..377f3434a892 100644
--- a/kconfigs/Kconfig.guestfs
+++ b/kconfigs/Kconfig.guestfs
@@ -1,5 +1,11 @@
 if GUESTFS
 
+config GUESTFS_DEFAULT_BRIDGE_IP
+       string
+       default "http://192.168.122.1" if DISTRO_FEDORA || DISTRO_REDHAT
+       default "http://192.168.122.1" if DISTRO_OPENSUSE || DISTRO_SUSE
+       default "http://192.168.122.1" if DISTRO_DEBIAN || DISTRO_UBUNTU
+
 choice
 	prompt "Guestfs Linux distribution to use"
 	default GUESTFS_FEDORA if DISTRO_FEDORA || DISTRO_REDHAT
-- 
2.43.0