feat(appstore): показывать операции App Store в «Задачах» + IP из IPAM при установке
- AppOperation.to_task_dict(): операции install/update/delete/… приведены к общему формату и включены в /api/all-tasks, active-count и clear-completed - Установка приложения: опциональный выбор сети/пула IPAM — статический IP вместо DHCP (net0 ip=<addr>/<mask>,gw=…), освобождение адреса при удалении - Мастер установки: селекторы «Сеть IPAM»/«Пул IPAM» (ru/en), по умолчанию DHCP Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -39,6 +39,10 @@ class InstallRequest(BaseModel):
|
||||
storage: str = "local-lvm"
|
||||
bridge: str = "vmbr0"
|
||||
ostemplate: Optional[str] = None # переопределение золотого шаблона
|
||||
# IPAM (опционально): если задан network — IP выделяется из пула IPAM,
|
||||
# иначе контейнер получает адрес по DHCP.
|
||||
ipam_network_id: Optional[int] = None
|
||||
ipam_pool_id: Optional[int] = None
|
||||
|
||||
|
||||
def _can_admin(user: User) -> bool:
|
||||
@@ -67,6 +71,7 @@ def install_app(
|
||||
server_id=req.server_id, node=req.node, cores=req.cores,
|
||||
memory=req.memory, disk=req.disk, storage=req.storage,
|
||||
bridge=req.bridge, ostemplate=req.ostemplate,
|
||||
ipam_network_id=req.ipam_network_id, ipam_pool_id=req.ipam_pool_id,
|
||||
)
|
||||
except engine.EngineError as e:
|
||||
raise HTTPException(status_code=400, detail=str(e))
|
||||
|
||||
@@ -10,7 +10,7 @@ import httpx
|
||||
import websockets
|
||||
|
||||
from ...db import get_db
|
||||
from ...models import ProxmoxServer, VMInstance, User, IPAMAllocation, IPAMNetwork, VMSnapshotArchive, ProxmoxTask, DeployTask
|
||||
from ...models import ProxmoxServer, VMInstance, User, IPAMAllocation, IPAMNetwork, VMSnapshotArchive, ProxmoxTask, DeployTask, AppOperation, InstalledApp
|
||||
from ...schemas import ProxmoxServerCreate, ProxmoxServerUpdate, ProxmoxServerResponse
|
||||
from ...proxmox import ProxmoxClient, get_proxmox_resources
|
||||
from ...auth import get_current_user, PermissionChecker, require_permission, check_permission
|
||||
@@ -212,19 +212,41 @@ def get_all_tasks(
|
||||
bulk_q = db.query(TaskQueue).filter(TaskQueue.user_id == current_user.id)
|
||||
proxmox_q = db.query(ProxmoxTask).filter(ProxmoxTask.user_id == current_user.id)
|
||||
deploy_q = db.query(DeployTask).filter(DeployTask.user_id == current_user.id)
|
||||
appstore_q = db.query(AppOperation).filter(AppOperation.user_id == current_user.id)
|
||||
|
||||
if status_filter:
|
||||
# Normalise statuses: proxmox uses running/completed/failed; bulk uses the same + pending/cancelled
|
||||
bulk_q = bulk_q.filter(TaskQueue.status == status_filter)
|
||||
proxmox_q = proxmox_q.filter(ProxmoxTask.status == status_filter)
|
||||
deploy_q = deploy_q.filter(DeployTask.status == status_filter)
|
||||
appstore_q = appstore_q.filter(AppOperation.status == status_filter)
|
||||
|
||||
bulk_tasks = bulk_q.order_by(TaskQueue.created_at.desc()).limit(limit).all()
|
||||
proxmox_tasks = proxmox_q.order_by(ProxmoxTask.created_at.desc()).limit(limit).all()
|
||||
deploy_tasks = deploy_q.order_by(DeployTask.created_at.desc()).limit(limit).all()
|
||||
appstore_ops = appstore_q.order_by(AppOperation.started_at.desc()).limit(limit).all()
|
||||
|
||||
# Resolve server_id -> name once for enrichment (proxmox/deploy tasks carry server_id).
|
||||
server_ids = {t.server_id for t in proxmox_tasks if t.server_id} | {t.server_id for t in deploy_tasks if t.server_id}
|
||||
# App Store operations carry only installed_app_id; resolve app name/node/server.
|
||||
ia_ids = {o.installed_app_id for o in appstore_ops if o.installed_app_id}
|
||||
ia_map = {}
|
||||
if ia_ids:
|
||||
for ia in db.query(InstalledApp).filter(InstalledApp.id.in_(ia_ids)).all():
|
||||
ia_map[ia.id] = ia
|
||||
appstore_tasks = [
|
||||
o.to_task_dict(
|
||||
app_name=(ia_map.get(o.installed_app_id).name if ia_map.get(o.installed_app_id) else None),
|
||||
node=(ia_map.get(o.installed_app_id).node if ia_map.get(o.installed_app_id) else None),
|
||||
server_id=(ia_map.get(o.installed_app_id).server_id if ia_map.get(o.installed_app_id) else None),
|
||||
)
|
||||
for o in appstore_ops
|
||||
]
|
||||
|
||||
# Resolve server_id -> name once for enrichment (proxmox/deploy/appstore tasks carry server_id).
|
||||
server_ids = (
|
||||
{t.server_id for t in proxmox_tasks if t.server_id}
|
||||
| {t.server_id for t in deploy_tasks if t.server_id}
|
||||
| {t.get("server_id") for t in appstore_tasks if t.get("server_id")}
|
||||
)
|
||||
server_names = {}
|
||||
if server_ids:
|
||||
for sid, sname in db.query(ProxmoxServer.id, ProxmoxServer.name).filter(ProxmoxServer.id.in_(server_ids)).all():
|
||||
@@ -244,7 +266,8 @@ def get_all_tasks(
|
||||
all_tasks = sorted(
|
||||
[_enrich(t.to_dict()) for t in bulk_tasks]
|
||||
+ [_enrich(t.to_dict()) for t in proxmox_tasks]
|
||||
+ [_enrich(t.to_dict()) for t in deploy_tasks],
|
||||
+ [_enrich(t.to_dict()) for t in deploy_tasks]
|
||||
+ [_enrich(t) for t in appstore_tasks],
|
||||
key=lambda t: t.get("created_at") or "",
|
||||
reverse=True,
|
||||
)[:limit]
|
||||
@@ -273,7 +296,12 @@ def get_active_count(
|
||||
DeployTask.status.in_(["pending", "running"]),
|
||||
).scalar() or 0
|
||||
|
||||
return {"count": bulk_count + proxmox_count + deploy_count}
|
||||
appstore_count = db.query(func.count(AppOperation.id)).filter(
|
||||
AppOperation.user_id == current_user.id,
|
||||
AppOperation.status == "running",
|
||||
).scalar() or 0
|
||||
|
||||
return {"count": bulk_count + proxmox_count + deploy_count + appstore_count}
|
||||
|
||||
|
||||
# ─── Proxmox UPID task log from DB ──────────────────────────────────────────
|
||||
@@ -324,6 +352,11 @@ def clear_completed_tasks(
|
||||
DeployTask.user_id == current_user.id,
|
||||
DeployTask.status.in_(done_statuses),
|
||||
).delete(synchronize_session=False)
|
||||
# App Store: чистим только историю операций (installed_apps не трогаем).
|
||||
appstore_deleted = db.query(AppOperation).filter(
|
||||
AppOperation.user_id == current_user.id,
|
||||
AppOperation.status.in_(done_statuses),
|
||||
).delete(synchronize_session=False)
|
||||
db.commit()
|
||||
return {"deleted": bulk_deleted + proxmox_deleted + deploy_deleted}
|
||||
return {"deleted": bulk_deleted + proxmox_deleted + deploy_deleted + appstore_deleted}
|
||||
|
||||
|
||||
@@ -64,6 +64,11 @@ class InstallSpec:
|
||||
features: str = "nesting=1,keyctl=1" # обязательно для Docker в unprivileged LXC
|
||||
health_timeout: int = 300 # сек
|
||||
ip_timeout: int = 60 # сек ожидания IP после старта
|
||||
# IPAM: статическая конфигурация сети. Если ip_config задан — используется
|
||||
# вместо ip=dhcp при создании net0; static_ip — заранее известный адрес
|
||||
# (тогда не ждём выдачи по DHCP).
|
||||
ip_config: Optional[str] = None # напр. "ip=10.0.0.5/24,gw=10.0.0.1"
|
||||
static_ip: Optional[str] = None # напр. "10.0.0.5"
|
||||
|
||||
|
||||
@dataclass
|
||||
@@ -179,7 +184,8 @@ def poc_install(db: Session, spec: InstallSpec, on_step: StepCb = _noop) -> Inst
|
||||
on_step(f"Контейнер VMID {vmid} уже существует — повтор без пересоздания", 40)
|
||||
else:
|
||||
on_step(f"Создание LXC VMID {vmid} на ноде {node}...", 20)
|
||||
net0 = f"name=eth0,bridge={spec.bridge},ip=dhcp,firewall=1"
|
||||
ip_cfg = spec.ip_config or "ip=dhcp"
|
||||
net0 = f"name=eth0,bridge={spec.bridge},{ip_cfg},firewall=1"
|
||||
upid = client.create_lxc_container(
|
||||
node=node,
|
||||
vmid=vmid,
|
||||
@@ -211,7 +217,9 @@ def poc_install(db: Session, spec: InstallSpec, on_step: StepCb = _noop) -> Inst
|
||||
raise PocError("SSH к ноде не установлен (нужен root-доступ к ноде для pct exec/push)")
|
||||
try:
|
||||
on_step("Ожидание IP-адреса...", 55)
|
||||
ip = _wait_ip(ssh, vmid, spec.ip_timeout)
|
||||
# Статический IP из IPAM известен заранее — подтверждаем через контейнер,
|
||||
# но при таймауте всё равно используем выделенный адрес.
|
||||
ip = _wait_ip(ssh, vmid, spec.ip_timeout) or spec.static_ip
|
||||
if not ip:
|
||||
raise PocError(f"Контейнер не получил IP за {spec.ip_timeout}с")
|
||||
|
||||
|
||||
@@ -152,6 +152,18 @@ class InstalledApp(Base):
|
||||
return f"<InstalledApp(id={self.id}, name='{self.name}', vmid={self.vmid}, status='{self.status}')>"
|
||||
|
||||
|
||||
# Человекочитаемые названия операций для общего списка «Задачи».
|
||||
APP_OPERATION_LABELS = {
|
||||
"install": "Установка приложения",
|
||||
"update": "Обновление приложения",
|
||||
"rollback": "Откат приложения",
|
||||
"delete": "Удаление приложения",
|
||||
"start": "Запуск приложения",
|
||||
"stop": "Остановка приложения",
|
||||
"restart": "Перезапуск приложения",
|
||||
}
|
||||
|
||||
|
||||
class AppOperation(Base):
|
||||
"""Журнал операции над приложением (install/update/rollback/delete/...) — ТЗ 8."""
|
||||
__tablename__ = "app_operations"
|
||||
@@ -182,5 +194,35 @@ class AppOperation(Base):
|
||||
"finished_at": self.finished_at.isoformat() if self.finished_at else None,
|
||||
}
|
||||
|
||||
def to_task_dict(self, *, app_name: Optional[str] = None,
|
||||
node: Optional[str] = None,
|
||||
server_id: Optional[int] = None) -> dict:
|
||||
"""Представление операции для общего списка «Задачи» (/api/all-tasks).
|
||||
|
||||
Поля приведены к общему виду с TaskQueue/ProxmoxTask/DeployTask:
|
||||
description, step/current_step, error_message, created_at, progress.
|
||||
"""
|
||||
label = APP_OPERATION_LABELS.get(self.type, self.type)
|
||||
steps = self.steps_log or []
|
||||
last_step = steps[-1].get("step") if steps else None
|
||||
return {
|
||||
"id": self.id,
|
||||
"kind": "appstore",
|
||||
"type": self.type,
|
||||
"description": f"{label}: {app_name}" if app_name else label,
|
||||
"status": self.status,
|
||||
"progress": self.progress,
|
||||
"step": last_step,
|
||||
"current_step": last_step,
|
||||
"error_message": self.error_text,
|
||||
"installed_app_id": self.installed_app_id,
|
||||
"user_id": self.user_id,
|
||||
"node": node,
|
||||
"server_id": server_id,
|
||||
"created_at": self.started_at.isoformat() if self.started_at else None,
|
||||
"started_at": self.started_at.isoformat() if self.started_at else None,
|
||||
"completed_at": self.finished_at.isoformat() if self.finished_at else None,
|
||||
}
|
||||
|
||||
def __repr__(self):
|
||||
return f"<AppOperation(id={self.id}, type='{self.type}', status='{self.status}')>"
|
||||
|
||||
@@ -28,7 +28,8 @@ from ..appstore.pipeline import (
|
||||
from ..api.proxmox._helpers import _get_proxmox_client, get_next_vmid
|
||||
from ..config import settings
|
||||
from ..db import SessionLocal
|
||||
from ..models import AppOperation, CatalogApp, InstalledApp, ProxmoxServer
|
||||
from ..ipam_service import IPAMService
|
||||
from ..models import AppOperation, CatalogApp, InstalledApp, IPAMNetwork, ProxmoxServer
|
||||
from ..websocket_manager import broadcast_task_update
|
||||
|
||||
_engine_executor = ThreadPoolExecutor(max_workers=4, thread_name_prefix="appstore_engine")
|
||||
@@ -140,10 +141,42 @@ def build_env(app: CatalogApp, form_answers: dict) -> tuple[dict, dict]:
|
||||
|
||||
# ── Установка ─────────────────────────────────────────────────────────────────
|
||||
|
||||
def _allocate_ipam(db, *, network_id: int, pool_id: Optional[int], name: str,
|
||||
server_id: int, vmid: int, node: Optional[str],
|
||||
allocated_by: Optional[str]) -> tuple[str, str]:
|
||||
"""Выделить IP из IPAM для приложения. Возвращает (ip_config, static_ip).
|
||||
|
||||
ip_config — строка для net0 ("ip=<addr>/<mask>,gw=<gw>"). Бросает EngineError
|
||||
при отсутствии свободного адреса, чтобы ошибка сразу вернулась пользователю.
|
||||
"""
|
||||
ipam = IPAMService(db)
|
||||
allocation, error = ipam.auto_allocate_ip(
|
||||
network_id=network_id, pool_id=pool_id,
|
||||
resource_type="ct", resource_name=name,
|
||||
proxmox_server_id=server_id, proxmox_vmid=vmid, proxmox_node=node,
|
||||
allocated_by=allocated_by, notes=f"App Store: {name}",
|
||||
)
|
||||
if error or not allocation:
|
||||
raise EngineError(f"Не удалось выделить IP из IPAM: {error or 'нет свободных адресов'}")
|
||||
|
||||
ip = allocation.ip_address
|
||||
net = db.query(IPAMNetwork).filter(IPAMNetwork.id == network_id).first()
|
||||
mask = "24"
|
||||
gateway = None
|
||||
if net:
|
||||
if net.network and "/" in net.network:
|
||||
mask = net.network.split("/")[1]
|
||||
gateway = net.gateway or None
|
||||
ip_config = f"ip={ip}/{mask},gw={gateway}" if gateway else f"ip={ip}/{mask}"
|
||||
return ip_config, ip
|
||||
|
||||
|
||||
def install(db, user, *, app_id: str, name: str, form_answers: dict,
|
||||
server_id: int, node: Optional[str] = None, cores: int = 2,
|
||||
memory: int = 2048, disk: int = 8, storage: str = "local-lvm",
|
||||
bridge: str = "vmbr0", ostemplate: Optional[str] = None) -> dict:
|
||||
bridge: str = "vmbr0", ostemplate: Optional[str] = None,
|
||||
ipam_network_id: Optional[int] = None,
|
||||
ipam_pool_id: Optional[int] = None) -> dict:
|
||||
"""Синхронная часть: валидация + запись в БД. Пайплайн — в пуле потоков."""
|
||||
app = db.query(CatalogApp).filter(CatalogApp.app_id == app_id).first()
|
||||
if not app:
|
||||
@@ -166,11 +199,22 @@ def install(db, user, *, app_id: str, name: str, form_answers: dict,
|
||||
env, secrets_shown = build_env(app, form_answers)
|
||||
vmid = get_next_vmid(db, server_id)
|
||||
|
||||
# IPAM (опционально): выделяем адрес до старта пайплайна, чтобы ошибка
|
||||
# (нет свободных IP) вернулась пользователю синхронно.
|
||||
ip_config = None
|
||||
static_ip = None
|
||||
if ipam_network_id:
|
||||
ip_config, static_ip = _allocate_ipam(
|
||||
db, network_id=ipam_network_id, pool_id=ipam_pool_id, name=name,
|
||||
server_id=server_id, vmid=vmid, node=node,
|
||||
allocated_by=getattr(user, "username", None),
|
||||
)
|
||||
|
||||
ia = InstalledApp(
|
||||
app_id=app_id, server_id=server_id, vmid=vmid, node=node, name=name,
|
||||
version_installed=str(app.version) if app.version is not None else None,
|
||||
tipi_version_installed=app.tipi_version,
|
||||
env_encrypted=json.dumps(env), port=app.port, status="installing",
|
||||
env_encrypted=json.dumps(env), ip=static_ip, port=app.port, status="installing",
|
||||
owner_id=user.id,
|
||||
)
|
||||
db.add(ia)
|
||||
@@ -182,7 +226,7 @@ def install(db, user, *, app_id: str, name: str, form_answers: dict,
|
||||
_engine_executor.submit(
|
||||
_run_install, ia.id, op.id, user.id, app.compose_yaml, env, golden,
|
||||
cores, memory, disk, server_id, node, name, app.port, ia.version_installed, vmid,
|
||||
storage, bridge,
|
||||
storage, bridge, ip_config, static_ip,
|
||||
)
|
||||
return {"installed_app_id": ia.id, "operation_id": op.id, "vmid": vmid, "secrets": secrets_shown}
|
||||
|
||||
@@ -200,7 +244,7 @@ def _new_operation(db, installed_app_id: int, op_type: str, user_id: int) -> App
|
||||
|
||||
def _run_install(installed_app_id, operation_id, user_id, compose_yaml, env, ostemplate,
|
||||
cores, memory, disk, server_id, node, name, port, version, vmid,
|
||||
storage, bridge):
|
||||
storage, bridge, ip_config=None, static_ip=None):
|
||||
"""Тело установки в пуле потоков."""
|
||||
db = SessionLocal()
|
||||
try:
|
||||
@@ -208,7 +252,7 @@ def _run_install(installed_app_id, operation_id, user_id, compose_yaml, env, ost
|
||||
server_id=server_id, ostemplate=ostemplate, name=name,
|
||||
compose_yaml=compose_yaml, port=port or 80, env_vars=env,
|
||||
node=node, vmid=vmid, cores=cores, memory=memory, disk=disk,
|
||||
storage=storage, bridge=bridge,
|
||||
storage=storage, bridge=bridge, ip_config=ip_config, static_ip=static_ip,
|
||||
)
|
||||
|
||||
def on_step(step: str, progress: int) -> None:
|
||||
@@ -271,10 +315,13 @@ def retry_install(db, user, installed_app_id: int) -> dict:
|
||||
db.commit()
|
||||
|
||||
op = _new_operation(db, ia.id, "install", user.id)
|
||||
# Контейнер уже создан (идемпотентный повтор): net0 не применяется заново,
|
||||
# поэтому ip_config не нужен. Известный статический IP передаём, чтобы не
|
||||
# ждать выдачи впустую (для DHCP он None → ожидание по-старому).
|
||||
_engine_executor.submit(
|
||||
_run_install, ia.id, op.id, user.id, compose, env, golden,
|
||||
2, 2048, 8, ia.server_id, ia.node, ia.name, ia.port, ia.version_installed, ia.vmid,
|
||||
"local-lvm", "vmbr0",
|
||||
"local-lvm", "vmbr0", None, ia.ip,
|
||||
)
|
||||
return {"installed_app_id": ia.id, "operation_id": op.id}
|
||||
|
||||
@@ -305,6 +352,13 @@ def _run_delete(installed_app_id, operation_id, user_id, server_id, vmid, node):
|
||||
poc_teardown(db, server_id, vmid, node, on_step)
|
||||
except Exception as e:
|
||||
logger.warning(f"[appstore-engine] teardown vmid={vmid}: {e}")
|
||||
# Освобождаем IP в IPAM (no-op, если приложение ставилось по DHCP).
|
||||
try:
|
||||
IPAMService(db).release_ip_by_vmid(
|
||||
server_id, vmid, released_by="appstore",
|
||||
reason=f"App Store: удаление приложения #{installed_app_id}")
|
||||
except Exception as e:
|
||||
logger.warning(f"[appstore-engine] IPAM release vmid={vmid}: {e}")
|
||||
|
||||
# финальное событие ДО удаления записи (каскад удалит app_operations)
|
||||
_finish_op(operation_id, user_id, "completed")
|
||||
|
||||
@@ -14,6 +14,7 @@ import {
|
||||
Select, SelectTrigger, SelectValue, SelectContent, SelectItem,
|
||||
} from '@/components/ui/select';
|
||||
import { useServers } from '@/hooks/use-nodes';
|
||||
import { useIPAMNetworks, useIPAMPools } from '@/hooks/use-ipam';
|
||||
import { useInstallApp, useInstalledApp, useOperationProgress } from '@/hooks/use-appstore';
|
||||
import type { AppOperation, CatalogApp } from '@/types/appstore';
|
||||
|
||||
@@ -41,6 +42,11 @@ export default function InstallWizard({ app, open, onOpenChange }: Props) {
|
||||
const [disk, setDisk] = useState(8);
|
||||
const [storage, setStorage] = useState('local-lvm');
|
||||
const [bridge, setBridge] = useState('vmbr0');
|
||||
const [ipamNetworkId, setIpamNetworkId] = useState<string>('');
|
||||
const [ipamPoolId, setIpamPoolId] = useState<string>('');
|
||||
|
||||
const { data: ipamNetworks = [] } = useIPAMNetworks();
|
||||
const { data: ipamPools = [] } = useIPAMPools(ipamNetworkId ? Number(ipamNetworkId) : undefined);
|
||||
|
||||
const [phase, setPhase] = useState<Phase>('form');
|
||||
const [installedAppId, setInstalledAppId] = useState<number | null>(null);
|
||||
@@ -67,6 +73,7 @@ export default function InstallWizard({ app, open, onOpenChange }: Props) {
|
||||
setName(app.app_id); setServerId(''); setNode(''); setAnswers({});
|
||||
setAdvanced(false); setCores(2); setMemory(2048); setDisk(8);
|
||||
setStorage('local-lvm'); setBridge('vmbr0');
|
||||
setIpamNetworkId(''); setIpamPoolId('');
|
||||
};
|
||||
|
||||
const handleClose = (o: boolean) => {
|
||||
@@ -80,6 +87,8 @@ export default function InstallWizard({ app, open, onOpenChange }: Props) {
|
||||
{
|
||||
app_id: app.app_id, name, server_id: Number(serverId), node: node || undefined,
|
||||
form_answers: answers, cores, memory, disk, storage, bridge,
|
||||
ipam_network_id: ipamNetworkId ? Number(ipamNetworkId) : undefined,
|
||||
ipam_pool_id: ipamPoolId ? Number(ipamPoolId) : undefined,
|
||||
},
|
||||
{
|
||||
onSuccess: (r) => {
|
||||
@@ -191,6 +200,46 @@ export default function InstallWizard({ app, open, onOpenChange }: Props) {
|
||||
<Label>{t('appstore.bridge')}</Label>
|
||||
<Input value={bridge} onChange={(e) => setBridge(e.target.value)} />
|
||||
</div>
|
||||
<div className="col-span-2 space-y-1.5">
|
||||
<Label>{t('appstore.ipam_network')}</Label>
|
||||
<Select
|
||||
value={ipamNetworkId || 'dhcp'}
|
||||
onValueChange={(v) => {
|
||||
const nv = !v || v === 'dhcp' ? '' : v;
|
||||
setIpamNetworkId(nv);
|
||||
setIpamPoolId('');
|
||||
}}
|
||||
>
|
||||
<SelectTrigger><SelectValue /></SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value="dhcp">{t('appstore.ipam_dhcp')}</SelectItem>
|
||||
{ipamNetworks.map((n) => (
|
||||
<SelectItem key={n.id} value={String(n.id)}>
|
||||
{n.name} ({n.network})
|
||||
</SelectItem>
|
||||
))}
|
||||
</SelectContent>
|
||||
</Select>
|
||||
</div>
|
||||
{ipamNetworkId && ipamPools.length > 0 && (
|
||||
<div className="col-span-2 space-y-1.5">
|
||||
<Label>{t('appstore.ipam_pool')}</Label>
|
||||
<Select
|
||||
value={ipamPoolId || 'auto'}
|
||||
onValueChange={(v) => setIpamPoolId(!v || v === 'auto' ? '' : v)}
|
||||
>
|
||||
<SelectTrigger><SelectValue /></SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value="auto">{t('appstore.ipam_pool_auto')}</SelectItem>
|
||||
{ipamPools.map((p) => (
|
||||
<SelectItem key={p.id} value={String(p.id)}>
|
||||
{p.name} ({p.range_start}–{p.range_end})
|
||||
</SelectItem>
|
||||
))}
|
||||
</SelectContent>
|
||||
</Select>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
@@ -92,6 +92,8 @@ export interface InstallArgs {
|
||||
disk: number;
|
||||
storage: string;
|
||||
bridge: string;
|
||||
ipam_network_id?: number;
|
||||
ipam_pool_id?: number;
|
||||
}
|
||||
|
||||
export function useInstallApp() {
|
||||
|
||||
@@ -101,6 +101,10 @@
|
||||
"node": "Node (optional)",
|
||||
"storage": "Storage",
|
||||
"bridge": "Bridge",
|
||||
"ipam_network": "IPAM network (IP address)",
|
||||
"ipam_dhcp": "DHCP (default)",
|
||||
"ipam_pool": "IPAM pool",
|
||||
"ipam_pool_auto": "Auto (any pool)",
|
||||
"cores": "CPU cores",
|
||||
"memory": "RAM (MB)",
|
||||
"disk": "Disk (GB)",
|
||||
|
||||
@@ -101,6 +101,10 @@
|
||||
"node": "Нода (опционально)",
|
||||
"storage": "Хранилище",
|
||||
"bridge": "Мост",
|
||||
"ipam_network": "Сеть IPAM (IP-адрес)",
|
||||
"ipam_dhcp": "DHCP (по умолчанию)",
|
||||
"ipam_pool": "Пул IPAM",
|
||||
"ipam_pool_auto": "Авто (любой пул)",
|
||||
"cores": "Ядра CPU",
|
||||
"memory": "RAM (МБ)",
|
||||
"disk": "Диск (ГБ)",
|
||||
|
||||
Reference in New Issue
Block a user