Remove the KVM_MIGRATION_PORT configure.ac param

Since this is easily configurable at run-time, we remove the
configure-time parameter. If anyone is building custom packages, then
the default can be tweaked by a one-line patch to constants.py.

Note that this also fixes the type of parameter, the default from
_autoconf.py is a string parameter. Shouldn't matter except if a cluster
run code between commit 78411c6 and this one.

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>

diff --git a/Makefile.am b/Makefile.am
index 8f41f80..f51024e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -417,7 +417,6 @@ lib/_autoconf.py: Makefile stamp-directories
          echo "FILE_STORAGE_DIR = '$(FILE_STORAGE_DIR)'"; \
          echo "IALLOCATOR_SEARCH_PATH = [$(IALLOCATOR_SEARCH_PATH)]"; \
          echo "KVM_PATH = '$(KVM_PATH)'"; \
-         echo "KVM_MIGRATION_PORT = '$(KVM_MIGRATION_PORT)'"; \
          echo "SOCAT_PATH = '$(SOCAT_PATH)'"; \
          echo "SOCAT_ESCAPE = '$(SOCAT_ESCAPE)'"; \
          echo "LVM_STRIPECOUNT = $(LVM_STRIPECOUNT)"; \

diff --git a/configure.ac b/configure.ac
index c681e03..06a24a9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -108,16 +108,6 @@ AC_ARG_WITH([kvm-path],
   [kvm_path="/usr/bin/kvm"])
 AC_SUBST(KVM_PATH, $kvm_path)
 
-# --with-kvm-migration-port=...
-AC_ARG_WITH([kvm-migration-port],
-  [AS_HELP_STRING([--with-kvm-migration-port=PORT],
-    [tcp port used for kvm instance live migration]
-    [ (default is 8102)]
-  )],
-  [kvm_migration_port="$withval"],
-  [kvm_migration_port="8102"])
-AC_SUBST(KVM_MIGRATION_PORT, $kvm_migration_port)
-
 # --with-socat-path=...
 AC_ARG_WITH([socat-path],
   [AS_HELP_STRING([--with-socat-path=PATH],

diff --git a/lib/constants.py b/lib/constants.py
index 8a47a9d..fa799a6 100644 (file)
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -641,7 +641,7 @@ HVC_DEFAULTS = {
     HV_NIC_TYPE: HT_NIC_PARAVIRTUAL,
     HV_DISK_TYPE: HT_DISK_PARAVIRTUAL,
     HV_USB_MOUSE: '',
-    HV_MIGRATION_PORT: _autoconf.KVM_MIGRATION_PORT,
+    HV_MIGRATION_PORT: 8102,
     },
   HT_FAKE: {
     },