diff options
| -rwxr-xr-x | cobbler/cobbler.py | 1 | ||||
| -rw-r--r-- | cobbler/settings.py | 1 | ||||
| -rw-r--r-- | config/settings | 1 | ||||
| -rw-r--r-- | tests/tests.py | 6 |
4 files changed, 4 insertions, 5 deletions
diff --git a/cobbler/cobbler.py b/cobbler/cobbler.py index 2921150..b0e5886 100755 --- a/cobbler/cobbler.py +++ b/cobbler/cobbler.py @@ -439,6 +439,7 @@ class BootCLI: '--kopts' : lambda(a) : profile.set_kernel_options(a), '--virt-file-size' : lambda(a) : profile.set_virt_file_size(a), '--virt-ram' : lambda(a) : profile.set_virt_ram(a), + '--virt-bridge' : lambda(a) : profile.set_virt_bridge(a), '--ksmeta' : lambda(a) : profile.set_ksmeta(a), '--repos' : lambda(a) : profile.set_repos(a), '--virt-path' : lambda(a) : profile.set_virt_path(a), diff --git a/cobbler/settings.py b/cobbler/settings.py index f36b654..53d85b3 100644 --- a/cobbler/settings.py +++ b/cobbler/settings.py @@ -27,6 +27,7 @@ DEFAULTS = { "ia64" : "/var/lib/cobbler/elilo-3.6-ia64.efi" }, "default_kickstart" : "/etc/cobbler/default.ks", + "default_virt_bridge" : "xenbr0", "default_virt_type" : "auto", "dhcpd_conf" : "/etc/dhcpd.conf", "dhcpd_bin" : "/usr/sbin/dhcpd", diff --git a/config/settings b/config/settings index b45e8f2..ac0f7b0 100644 --- a/config/settings +++ b/config/settings @@ -3,6 +3,7 @@ bootloaders: ia64: /var/lib/cobbler/elilo-3.6-ia64.efi standard: /usr/lib/syslinux/pxelinux.0 default_kickstart: /etc/cobbler/default.ks +default_virt_bridge: xenbr0 default_virt_type: auto dhcpd_bin: /usr/sbin/dhcpd dhcpd_conf: /etc/dhcpd.conf diff --git a/tests/tests.py b/tests/tests.py index 64dd4df..b8870ae 100644 --- a/tests/tests.py +++ b/tests/tests.py @@ -19,11 +19,6 @@ import subprocess import tempfile import shutil -#sys.path.append('../cobbler') -#sys.path.append('../cobbler/modules') -#sys.path.append('./cobbler') -#sys.path.append('./cobbler/modules') - from cobbler import settings from cobbler import collection_distros from cobbler import collection_profiles @@ -250,6 +245,7 @@ class Utilities(BootTest): self.assertTrue(profile.set_name("testprofile12b")) self.assertTrue(profile.set_distro("testdistro0")) self.assertTrue(profile.set_kickstart("http://127.0.0.1/foo")) + self.assertTrue(profile.set_virt_bridge("xenbr1")) # no slashes or wildcards in name # sizes must be integers self.assertTrue(profile.set_virt_file_size("54321")) |