Fixes reference issues in pixie. Fixes view crash on puck when no ip …

…assigned.
masom · Feb 28, 2012 · 4610449 · 4610449
1 parent 8068752
commit 4610449
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/client/pixie/lib/puck.py b/client/pixie/lib/puck.py
@@ -223,7 +223,7 @@ def updateStatus(self):
                 'id': self._vm.id,
                 'status': self._vm.status
         }
-        self._client.put('status', self.vm.id, data)
+        self._client.put('status', self._vm.id, data)
 
     def updateConfig(self):
         '''

diff --git a/server/views/virtual_machines/running.html b/server/views/virtual_machines/running.html
@@ -26,16 +26,18 @@ <h2>My Current Virtual Machines</h2>
         <tr>
             <td>${i.name}</td>
             <td>
-                <ul>
-                    % for addr in i.addresses['private']:
-                        % if not addr['fixed']:
-                            <%
-                                public_ip = addr['addr']
-                            %>
-                            <li>${addr['addr']}</li>
-                        % endif
-                    % endfor
-                </ul>
+                % if i.addresses:
+                    <ul>
+                        % for addr in i.addresses['private']:
+                            % if not addr['fixed']:
+                                <%
+                                    public_ip = addr['addr']
+                                %>
+                                <li>${addr['addr']}</li>
+                            % endif
+                        % endfor
+                    </ul>
+                % endif
             </td>
             <td>${i.status}</td>
             <td>

diff --git a/setup/setup.sh b/setup/setup.sh
@@ -27,7 +27,7 @@ while read file; do
 done < index
 rm index
 
-rpm --initdb
+/usr/local/bin/rpm --initdb
 ########################
 #
 #    RPM REGISTRATION
@@ -56,10 +56,7 @@ pkg_info | /usr/local/bin/python registerports.py
 #    RPM INSTALLATION
 #
 ########################
-rpm -ivh *.rpm
-
-tar -xzf pixie.tar.gz -C /usr/local/
-cp pixie.conf /usr/local/etc/pixie.conf
+/usr/local/bin/rpm -ivh *.rpm
 
 cd $START
 rm -rf $DEST