|
5 | 5 | from proxstar.db import get_vm_expire |
6 | 6 | from proxstar.util import lazy_property |
7 | 7 | from proxstar.starrs import get_ip_for_mac |
8 | | -from proxstar.proxmox import connect_proxmox, get_node_least_mem, get_free_vmid, get_vm_node |
| 8 | +from proxstar.proxmox import connect_proxmox, connect_proxmox_ssh, get_node_least_mem, get_free_vmid, get_vm_node |
9 | 9 | from flask import current_app as app |
10 | 10 |
|
11 | 11 |
|
@@ -204,16 +204,16 @@ def expire(self): |
204 | 204 | return get_vm_expire(db, self.id, app.config['VM_EXPIRE_MONTHS']) |
205 | 205 |
|
206 | 206 | def set_ci_user(self, user): |
207 | | - proxmox = connect_proxmox() |
| 207 | + proxmox = connect_proxmox_ssh() |
208 | 208 | proxmox.nodes(self.node).qemu(self.id).config.put(ciuser=user) |
209 | 209 |
|
210 | 210 | def set_ci_ssh_key(self, ssh_key): |
211 | | - proxmox = connect_proxmox() |
| 211 | + proxmox = connect_proxmox_ssh() |
212 | 212 | escaped_key = urllib.parse.quote(ssh_key, safe='') |
213 | 213 | proxmox.nodes(self.node).qemu(self.id).config.put(sshkey=escaped_key) |
214 | 214 |
|
215 | 215 | def set_ci_network(self): |
216 | | - proxmox = connect_proxmox() |
| 216 | + proxmox = connect_proxmox_ssh() |
217 | 217 | proxmox.nodes(self.node).qemu(self.id).config.put(ipconfig0='ip=dhcp') |
218 | 218 |
|
219 | 219 |
|
|
0 commit comments