Merge "fix user param appear at first problem" into dev/experimental

compass/actions/util.py

@@ -256,7 +256,7 @@ class ActionHelper(object):
         if delete_underlying_host:
             for host_id in host_id_list:
                 host_db.del_host(
-                    user, host_id, True, True
+                    host_id, True, True, user=user
                 )
         cluster_db.del_cluster(
             cluster_id, True, True, user=user
@@ -305,5 +305,5 @@ class ActionHelper(object):
 
     @staticmethod
     def get_machine_IPMI(machine_id, user):
-        machine_info = machine_db.get_machine(user, machine_id)
+        machine_info = machine_db.get_machine(machine_id, user=user)
         return machine_info[const.IPMI_CREDS]

install/chef.sh

@@ -49,6 +49,16 @@ fi
 
 sudo mkdir -p ~/.chef
 
+if [ ! -f /etc/chef-server/admin.pem ]; then
+    echo "/etc/chef-server/admin.pem does not exist"
+    exit 1
+fi
+
+if [ ! -f /etc/chef-server/chef-validator.pem ]; then
+    echo "/etc/chef-server/chef-validator.pem does not exist"
+    exit 1
+fi
+
 sudo knife configure -y -i --defaults -r ~/chef-repo -s https://$IPADDR:443 -u $USER --admin-client-name admin --admin-client-key /etc/chef-server/admin.pem --validation-client-name chef-validator --validation-key /etc/chef-server/chef-validator.pem <<EOF
 $CHEF_PASSWORD
 EOF

install/cobbler.sh

@@ -143,6 +143,8 @@ sudo sed -i 's/disable\([ \t]\+\)=\([ \t]\+\)yes/disable\1=\2no/g' /etc/xinetd.d
 sudo sed -i 's/^@dists=/# @dists=/g' /etc/debmirror.conf
 sudo sed -i 's/^@arches=/# @arches=/g' /etc/debmirror.conf
 
+sudo rm -rf /var/lib/cobbler/config/systems.d/*
+
 echo "disable iptables"
 sudo service iptables stop
 sudo sleep 10