[Et-mgmt-commits-list] [SCM] virt-factory branch, master now at fa01847c0b74d606efbe52bf144dfdee52f1bdfd

[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  fa01847c0b74d606efbe52bf144dfdee52f1bdfd (commit)
       via  cfa9ce52e9b252c38f251d135397bfb88d22faa7 (commit)
      from  3ad82e8243c9a1f53d81a8eae819740ffb602e4a (commit)

- Log -----------------------------------------------------------------
commit fa01847c0b74d606efbe52bf144dfdee52f1bdfd
Merge: cfa9ce5... 3ad82e8...
Author: Michael DeHaan <mdehaan at mdehaan.rdu.redhat.com>
Date:   Mon Apr 23 18:22:41 2007 -0400

    Merge with git+ssh://g-mdehaan@et.redhat.com/git/virt-factory

commit cfa9ce52e9b252c38f251d135397bfb88d22faa7
Author: Michael DeHaan <mdehaan at mdehaan.rdu.redhat.com>
Date:   Mon Apr 23 18:22:18 2007 -0400

    Use /var/log/virt-factory-nodes for logging and put config file in /etc.
-----------------------------------------------------------------------

Diffstat:
 build/build-it-all.sh         |    1 +
 build/test-it-all.sh          |    3 +--
 nodes/node-settings           |    2 +-
 nodes/nodes/config_data.py    |    2 +-
 nodes/setup.py                |    4 ++--
 nodes/virt-factory-nodes.spec |    5 ++---
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/build/build-it-all.sh b/build/build-it-all.sh
index 51645ed..f8c645c 100755
--- a/build/build-it-all.sh
+++ b/build/build-it-all.sh
@@ -63,6 +63,7 @@ build_profile()
     echo "Building the profile for $PROFILE" 
     pushd $PROFILE
     make
+    mkdir -p $BUILD/profiles
     cp *.tar.gz $BUILD/profiles/
     popd
 }
diff --git a/build/test-it-all.sh b/build/test-it-all.sh
index c70d496..6ce4f9d 100644
--- a/build/test-it-all.sh
+++ b/build/test-it-all.sh
@@ -98,7 +98,7 @@ show_config()
    
     echo "DEFAULT_PROFILE=$DEFAULT_PROFILE"
     echo "BUILD_PATH=$BUILD_PATH"
-    echo "VF_SERVER_URL=$VF_SERVER_URL"
+    echo "VF_SERVER=$VF_SERVER"
 
     echo "REBUILD=$REBUILD"
     echo "FRESH_CHECKOUT=$FRESH_CHECKOUT"
@@ -436,7 +436,6 @@ fi
 
 if [ "$VF_IMPORT" == "Y" ] ; then
     msg "importing profiles"
-    mkdir -p profiles
     cd profiles/
     for profile in `ls`
     do
diff --git a/nodes/node-settings b/nodes/node-settings
index 961218d..77928e3 100755
--- a/nodes/node-settings
+++ b/nodes/node-settings
@@ -1,4 +1,4 @@
 ---
 logs:
-    service: /var/log/virt-factory/log
+    service: /var/log/virt-factory-nodes/node-log
 
diff --git a/nodes/nodes/config_data.py b/nodes/nodes/config_data.py
index 7ce451e..e4e451f 100755
--- a/nodes/nodes/config_data.py
+++ b/nodes/nodes/config_data.py
@@ -20,7 +20,7 @@ from codes import *
 import os
 import yaml
 
-CONFIG_FILE = "/var/lib/virt-factory/node-settings"
+CONFIG_FILE = "/etc/virt-factory-nodes/node-settings"
 
 # from the comments in http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/66531
 class Singleton(object):
diff --git a/nodes/setup.py b/nodes/setup.py
index 2711245..8799afe 100644
--- a/nodes/setup.py
+++ b/nodes/setup.py
@@ -17,8 +17,8 @@ if __name__ == "__main__":
         etcpath  = "/etc/%s" % NAME
         wwwpath  = "/var/www/%s" % NAME
         initpath = "/etc/init.d/"
-        logpath  = "/var/log/%s/" % NAME
-	settingspath = "/var/lib/%s/" % NAME
+        logpath  = "/var/log/%s-nodes/" % NAME
+	settingspath = "/etc/%s-nodes/" % NAME
         setup(
                 name="%s-nodes" % NAME,
                 version = VERSION,
diff --git a/nodes/virt-factory-nodes.spec b/nodes/virt-factory-nodes.spec
index 734c4e3..8aee658 100644
--- a/nodes/virt-factory-nodes.spec
+++ b/nodes/virt-factory-nodes.spec
@@ -30,8 +30,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %files
 %{_bindir}/vf_node_server
 /etc/init.d/virt-factory-node-server
-%dir /var/lib/virt-factory
-%config(noreplace) /var/lib/virt-factory/node-settings
+%config(noreplace) /etc/virt-factory-nodes/node-settings
 %dir %{python_sitelib}/virt-factory
 %dir %{python_sitelib}/virt-factory/nodes
 #%{python_sitelib}/virt-factory/*.py*
@@ -40,7 +39,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %dir %{python_sitelib}/virt-factory/nodes/modules
 %dir %{python_sitelib}/virt-factory/nodes/yaml
 %{python_sitelib}/virt-factory/nodes/yaml/*.py*
-%dir /var/log/virt-factory
+%dir /var/log/virt-factory-nodes
 
 
 %changelog

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  3ad82e8243c9a1f53d81a8eae819740ffb602e4a \
  fa01847c0b74d606efbe52bf144dfdee52f1bdfd