[Et-mgmt-commits-list] [SCM] virt-factory branch, master now at v0.0.3-331-g9c9648f

[Michael DeHaan]

Hello,

This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.

Updating branch, master,
       via  9c9648fe6f05292525705683fc3f5c3d1b921c0c (commit)
       via  79cabfe877bb3c461bef9b4c848d0cb971f3c22e (commit)
       via  a1543377694954e32fc7a7fa6fffd27e159c72ec (commit)
       via  8cedd55907a1f71aa4c2d91ae88717be7524efd5 (commit)
      from  20f8589a1d96c59acd290b6268a53491eebb379b (commit)

- Log -----------------------------------------------------------------
commit 9c9648fe6f05292525705683fc3f5c3d1b921c0c
Merge: 79cabfe... 20f8589...
Author: Michael DeHaan <mdehaan at redhat.com>
Date:   Mon Oct 15 17:09:09 2007 -0400

    Merge branch 'master' of git+ssh://g-mdehaan@et.redhat.com/git/virt-factory

commit 79cabfe877bb3c461bef9b4c848d0cb971f3c22e
Author: Michael DeHaan <mdehaan at redhat.com>
Date:   Mon Oct 15 17:08:34 2007 -0400

    Add setting for default virt bridge.

commit a1543377694954e32fc7a7fa6fffd27e159c72ec
Merge: 8cedd55... 5d74f0d...
Author: Michael DeHaan <mdehaan at mdehaan.rdu.redhat.com>
Date:   Thu Sep 20 19:01:31 2007 -0400

    Merge branch 'master' of git+ssh://g-mdehaan@et.redhat.com/git/virt-factory

commit 8cedd55907a1f71aa4c2d91ae88717be7524efd5
Author: Michael DeHaan <mdehaan at mdehaan.rdu.redhat.com>
Date:   Thu Sep 20 19:01:13 2007 -0400

    First round at adding virtualization control module.  Probably need
    to be able to specify hypervisor connection and some other things, but
    this includes the basics.
-----------------------------------------------------------------------

Diffstat:
 service/modules/authentication.py |    2 +-
 service/modules/provisioning.py   |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/service/modules/authentication.py b/service/modules/authentication.py
index 2e10e10..c849143 100755
--- a/service/modules/authentication.py
+++ b/service/modules/authentication.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#/usr/bin/python
 
 
 ## Virt-factory backend code.
diff --git a/service/modules/provisioning.py b/service/modules/provisioning.py
index 91bc868..09bcb28 100755
--- a/service/modules/provisioning.py
+++ b/service/modules/provisioning.py
@@ -582,6 +582,8 @@ class Provisioning(web_svc.AuthWebSvc):
 
         settings["server"] = vf_config["this_server"]["address"]
         settings["next_server"] = vf_config["this_server"]["address"]
+        settings["default_virt_bridge"] = "virbr0"
+
         # FIXME: load other defaults that the user might want to configure in cobbler
 
         print NOW_SAVING

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  20f8589a1d96c59acd290b6268a53491eebb379b \
  9c9648fe6f05292525705683fc3f5c3d1b921c0c