Commit 9a7df64e authored by Alexey Shabalin's avatar Alexey Shabalin Committed by Anton Midyukov

server-v.mk, {groups,profiles}/server-v: renumbering groups and profiles

parent 18898db5
...@@ -46,11 +46,11 @@ distro/server-v: logging = $(addprefix server-v/,\ ...@@ -46,11 +46,11 @@ distro/server-v: logging = $(addprefix server-v/,\
rsyslog-classic systemd-journal-remote) rsyslog-classic systemd-journal-remote)
distro/server-v: profiles = $(addprefix server-v/,\ distro/server-v: profiles = $(addprefix server-v/,\
110-basic 131-opennebula-node 132-opennebula-server 141-openstack-node 142-openstack-controller 201-docker) 111-opennebula-node 112-opennebula-server 121-openstack-node 122-openstack-controller 140-basic 201-docker 999-minimal)
ifeq (,$(filter-out x86_64,$(ARCH))) ifeq (,$(filter-out x86_64,$(ARCH)))
distro/server-v: profiles_arch = $(addprefix server-v/,\ distro/server-v: profiles_arch = $(addprefix server-v/,\
120-pve) 130-pve)
endif endif
distro/.server-v-base: distro/.installer use/syslinux/ui/menu use/memtest distro/.server-v-base: distro/.installer use/syslinux/ui/menu use/memtest
...@@ -91,12 +91,12 @@ distro/server-v: distro/.server-v-base +installer \ ...@@ -91,12 +91,12 @@ distro/server-v: distro/.server-v-base +installer \
@$(call add,SYSTEM_PACKAGES,mdadm-tool lvm2 multipath-tools vdo) @$(call add,SYSTEM_PACKAGES,mdadm-tool lvm2 multipath-tools vdo)
@$(call add,BASE_LISTS,virt/base.pkgs) @$(call add,BASE_LISTS,virt/base.pkgs)
@$(call add,MAIN_LISTS,virt/extra.pkgs) @$(call add,MAIN_LISTS,virt/extra.pkgs)
@$(call add,MAIN_GROUPS,server-v/110-basic server-v/kvm) @$(call add,MAIN_GROUPS,server-v/110-opennebula $(opennebula))
@$(call add,MAIN_GROUPS,server-v/120-openstack $(openstack))
ifeq (,$(filter-out x86_64,$(ARCH))) ifeq (,$(filter-out x86_64,$(ARCH)))
@$(call add,MAIN_GROUPS,server-v/120-pve server-v/pve) @$(call add,MAIN_GROUPS,server-v/130-pve server-v/pve)
endif endif
@$(call add,MAIN_GROUPS,server-v/130-opennebula $(opennebula)) @$(call add,MAIN_GROUPS,server-v/140-basic server-v/kvm)
@$(call add,MAIN_GROUPS,server-v/140-openstack $(openstack))
@$(call add,MAIN_GROUPS,server-v/200-container $(container)) @$(call add,MAIN_GROUPS,server-v/200-container $(container))
@$(call add,MAIN_GROUPS,server-v/300-cluster server-v/corosync_pacemaker) @$(call add,MAIN_GROUPS,server-v/300-cluster server-v/corosync_pacemaker)
@$(call add,MAIN_GROUPS,server-v/400-storage) @$(call add,MAIN_GROUPS,server-v/400-storage)
...@@ -110,7 +110,7 @@ endif ...@@ -110,7 +110,7 @@ endif
@$(call add,MAIN_GROUPS,server-v/600-monitoring $(monitoring)) @$(call add,MAIN_GROUPS,server-v/600-monitoring $(monitoring))
@$(call add,MAIN_GROUPS,server-v/700-backup $(backup)) @$(call add,MAIN_GROUPS,server-v/700-backup $(backup))
@$(call add,MAIN_GROUPS,server-v/800-logging $(logging)) @$(call add,MAIN_GROUPS,server-v/800-logging $(logging))
@$(call add,THE_PROFILES,$(profiles) $(profiles_arch) minimal) @$(call add,THE_PROFILES,$(profiles) $(profiles_arch))
@$(call add,DEFAULT_SERVICES_ENABLE,getty@tty1 getty@ttyS0) @$(call add,DEFAULT_SERVICES_ENABLE,getty@tty1 getty@ttyS0)
@$(call add,DEFAULT_SERVICES_ENABLE,fstrim.timer) @$(call add,DEFAULT_SERVICES_ENABLE,fstrim.timer)
@$(call add,DEFAULT_SERVICES_ENABLE,libvirtd) @$(call add,DEFAULT_SERVICES_ENABLE,libvirtd)
...@@ -122,5 +122,5 @@ endif ...@@ -122,5 +122,5 @@ endif
@$(call add,DEFAULT_SERVICES_DISABLE,ahttpd alteratord) @$(call add,DEFAULT_SERVICES_DISABLE,ahttpd alteratord)
@$(call add,DEFAULT_SERVICES_DISABLE,systemd-networkd systemd-resolved) @$(call add,DEFAULT_SERVICES_DISABLE,systemd-networkd systemd-resolved)
# @$(call add,MAIN_GROUPS,server-v/111-cockpit $(cockpit)) # @$(call add,MAIN_GROUPS,server-v/141-cockpit $(cockpit))
endif endif
...@@ -4,6 +4,6 @@ Type=Directory ...@@ -4,6 +4,6 @@ Type=Directory
Name=OpenNebula Name=OpenNebula
Name[ru_RU]=OpenNebula Name[ru_RU]=OpenNebula
X-Alterator-Required=no X-Alterator-Required=no
X-Alterator-Conflicts=server-v/120-pve server-virt/140-openstack X-Alterator-Conflicts=server-virt/120-openstack server-v/130-pve
Comment=OpenNebula solution to build Private Clouds and manage Data Center virtualization Comment=OpenNebula solution to build Private Clouds and manage Data Center virtualization
Comment[ru_RU]=Opennebula это решение для построения частного облака и управления виртуальным центром обработки данных Comment[ru_RU]=Opennebula это решение для построения частного облака и управления виртуальным центром обработки данных
...@@ -4,6 +4,6 @@ Type=Directory ...@@ -4,6 +4,6 @@ Type=Directory
Name=OpenStack Name=OpenStack
Name[ru_RU]=OpenStack Name[ru_RU]=OpenStack
X-Alterator-Required=no X-Alterator-Required=no
X-Alterator-Conflicts=server-v/120-pve server-virt/130-opennebula X-Alterator-Conflicts=server-virt/110-opennebula server-v/130-pve
Comment=OpenStack is a cloud operating system Comment=OpenStack is a cloud operating system
Comment[ru_RU]=Комплекс проектов для создания инфраструктурных облачных сервисов Comment[ru_RU]=Комплекс проектов для создания инфраструктурных облачных сервисов
...@@ -4,6 +4,6 @@ Type=Directory ...@@ -4,6 +4,6 @@ Type=Directory
Name=PVE Name=PVE
Name[ru_RU]=PVE Name[ru_RU]=PVE
X-Alterator-Required=no X-Alterator-Required=no
X-Alterator-Conflicts=server-v/110-basic server-virt/130-opennebula server-virt/140-openstack X-Alterator-Conflicts=server-virt/110-opennebula server-virt/120-openstack server-v/140-basic
Comment=Proxmox Virtual Environment Comment=Proxmox Virtual Environment
Comment[ru_RU]=Виртуальное Окружение Proxmox Comment[ru_RU]=Виртуальное Окружение Proxmox
...@@ -6,4 +6,4 @@ Name[ru_RU]=Cockpit интерфейс управления сервером ...@@ -6,4 +6,4 @@ Name[ru_RU]=Cockpit интерфейс управления сервером
Comment=Cockpit is an interactive server admin interface Comment=Cockpit is an interactive server admin interface
Comment[ru_RU]=Cockpit это интерактивный интерфейс управления сервером Comment[ru_RU]=Cockpit это интерактивный интерфейс управления сервером
X-Alterator-Required=no X-Alterator-Required=no
X-Alterator-Parent=server-v/110-basic X-Alterator-Parent=server-v/140-basic
...@@ -6,5 +6,5 @@ Name[ru_RU]=Управление контейнерами docker ...@@ -6,5 +6,5 @@ Name[ru_RU]=Управление контейнерами docker
X-Alterator-PackageList=virt/cockpit/docker X-Alterator-PackageList=virt/cockpit/docker
X-Alterator-Required=no X-Alterator-Required=no
X-Alterator-Depends=server-v/docker X-Alterator-Depends=server-v/docker
X-Alterator-Parent=server-v/111-cockpit X-Alterator-Parent=server-v/141-cockpit
...@@ -6,4 +6,4 @@ Name[ru_RU]=Управление виртуальными машинами KVM ...@@ -6,4 +6,4 @@ Name[ru_RU]=Управление виртуальными машинами KVM
X-Alterator-PackageList=virt/cockpit/machines X-Alterator-PackageList=virt/cockpit/machines
X-Alterator-Required=no X-Alterator-Required=no
X-Alterator-Depends=server-v/kvm X-Alterator-Depends=server-v/kvm
X-Alterator-Parent=server-v/111-cockpit X-Alterator-Parent=server-v/141-cockpit
...@@ -5,4 +5,4 @@ Name=Web Service ...@@ -5,4 +5,4 @@ Name=Web Service
Name[ru_RU]=Web интерфейс Name[ru_RU]=Web интерфейс
X-Alterator-PackageList=virt/cockpit/web X-Alterator-PackageList=virt/cockpit/web
X-Alterator-Required=no X-Alterator-Required=no
X-Alterator-Parent=server-v/111-cockpit X-Alterator-Parent=server-v/141-cockpit
...@@ -5,4 +5,4 @@ Name=KVM virtualization server ...@@ -5,4 +5,4 @@ Name=KVM virtualization server
Name[ru_RU]=Сервер виртуализации (KVM) Name[ru_RU]=Сервер виртуализации (KVM)
X-Alterator-PackageList=virt/kvm X-Alterator-PackageList=virt/kvm
X-Alterator-Required=no X-Alterator-Required=no
X-Alterator-Parent=server-v/110-basic X-Alterator-Parent=server-v/140-basic
...@@ -5,4 +5,4 @@ Name=OneFlow manages services and elasticity ...@@ -5,4 +5,4 @@ Name=OneFlow manages services and elasticity
Name[ru_RU]=Управление сервисами OneFlow Name[ru_RU]=Управление сервисами OneFlow
X-Alterator-PackageList=virt/opennebula/flow X-Alterator-PackageList=virt/opennebula/flow
X-Alterator-Required=no X-Alterator-Required=no
X-Alterator-Parent=server-v/130-opennebula X-Alterator-Parent=server-v/110-opennebula
...@@ -5,4 +5,4 @@ Name=Communication between VMs and OpenNebula ...@@ -5,4 +5,4 @@ Name=Communication between VMs and OpenNebula
Name[ru_RU]=Сервер сообщений между VM и OpenNebula Name[ru_RU]=Сервер сообщений между VM и OpenNebula
X-Alterator-PackageList=virt/opennebula/gate X-Alterator-PackageList=virt/opennebula/gate
X-Alterator-Required=no X-Alterator-Required=no
X-Alterator-Parent=server-v/130-opennebula X-Alterator-Parent=server-v/110-opennebula
...@@ -5,4 +5,4 @@ Name=Web GUI and the EC2 API ...@@ -5,4 +5,4 @@ Name=Web GUI and the EC2 API
Name[ru_RU]=Web-интерфейс управления и EC2 API Name[ru_RU]=Web-интерфейс управления и EC2 API
X-Alterator-PackageList=virt/opennebula/gui X-Alterator-PackageList=virt/opennebula/gui
X-Alterator-Required=no X-Alterator-Required=no
X-Alterator-Parent=server-v/130-opennebula X-Alterator-Parent=server-v/110-opennebula
...@@ -7,4 +7,4 @@ X-Alterator-PackageList=virt/opennebula/node-kvm ...@@ -7,4 +7,4 @@ X-Alterator-PackageList=virt/opennebula/node-kvm
X-Alterator-Required=no X-Alterator-Required=no
X-Alterator-Conflicts=server-v/opennebula/server server-virt/opennebula/gui server-virt/opennebula/gate server-virt/opennebula/flow X-Alterator-Conflicts=server-v/opennebula/server server-virt/opennebula/gui server-virt/opennebula/gate server-virt/opennebula/flow
X-Alterator-Depends=server-v/kvm X-Alterator-Depends=server-v/kvm
X-Alterator-Parent=server-v/130-opennebula X-Alterator-Parent=server-v/110-opennebula
...@@ -7,4 +7,4 @@ X-Alterator-PackageList=virt/opennebula/node-lxd ...@@ -7,4 +7,4 @@ X-Alterator-PackageList=virt/opennebula/node-lxd
X-Alterator-Required=no X-Alterator-Required=no
X-Alterator-Conflicts=server-v/opennebula/server server-virt/opennebula/gui server-virt/opennebula/gate server-virt/opennebula/flow X-Alterator-Conflicts=server-v/opennebula/server server-virt/opennebula/gui server-virt/opennebula/gate server-virt/opennebula/flow
X-Alterator-Depends=server-v/lxd X-Alterator-Depends=server-v/lxd
X-Alterator-Parent=server-v/130-opennebula X-Alterator-Parent=server-v/110-opennebula
...@@ -5,4 +5,4 @@ Name=Main OpenNebula daemon and scheduler ...@@ -5,4 +5,4 @@ Name=Main OpenNebula daemon and scheduler
Name[ru_RU]=Сервер Opennebula Name[ru_RU]=Сервер Opennebula
X-Alterator-PackageList=virt/opennebula/server X-Alterator-PackageList=virt/opennebula/server
X-Alterator-Required=no X-Alterator-Required=no
X-Alterator-Parent=server-v/130-opennebula X-Alterator-Parent=server-v/110-opennebula
...@@ -5,4 +5,4 @@ Name=Block Storage Node ...@@ -5,4 +5,4 @@ Name=Block Storage Node
Name[ru_RU]=Сервер управления блочными устройствами Name[ru_RU]=Сервер управления блочными устройствами
X-Alterator-PackageList=virt/openstack/block X-Alterator-PackageList=virt/openstack/block
X-Alterator-Required=no X-Alterator-Required=no
X-Alterator-Parent=server-v/140-openstack X-Alterator-Parent=server-v/120-openstack
...@@ -7,4 +7,4 @@ X-Alterator-PackageList=virt/openstack/compute ...@@ -7,4 +7,4 @@ X-Alterator-PackageList=virt/openstack/compute
X-Alterator-Required=no X-Alterator-Required=no
X-Alterator-Conflicts=server-v/openstack-block server-virt/openstack-controller server-virt/openstack-network server-virt/openstack-storage X-Alterator-Conflicts=server-v/openstack-block server-virt/openstack-controller server-virt/openstack-network server-virt/openstack-storage
X-Alterator-Depends=server-v/kvm X-Alterator-Depends=server-v/kvm
X-Alterator-Parent=server-v/140-openstack X-Alterator-Parent=server-v/120-openstack
...@@ -5,4 +5,4 @@ Name=Controller Node ...@@ -5,4 +5,4 @@ Name=Controller Node
Name[ru_RU]=Сервер управления Name[ru_RU]=Сервер управления
X-Alterator-PackageList=virt/openstack/controller X-Alterator-PackageList=virt/openstack/controller
X-Alterator-Required=no X-Alterator-Required=no
X-Alterator-Parent=server-v/140-openstack X-Alterator-Parent=server-v/120-openstack
...@@ -5,4 +5,4 @@ Name=Network Node ...@@ -5,4 +5,4 @@ Name=Network Node
Name[ru_RU]=Сервер управления сетью Name[ru_RU]=Сервер управления сетью
X-Alterator-PackageList=virt/openstack/network X-Alterator-PackageList=virt/openstack/network
X-Alterator-Required=no X-Alterator-Required=no
X-Alterator-Parent=server-v/140-openstack X-Alterator-Parent=server-v/120-openstack
...@@ -5,4 +5,4 @@ Name=Storage Node ...@@ -5,4 +5,4 @@ Name=Storage Node
Name[ru_RU]=Сервер управления хранением объектов Name[ru_RU]=Сервер управления хранением объектов
X-Alterator-PackageList=virt/openstack/storage X-Alterator-PackageList=virt/openstack/storage
X-Alterator-Required=no X-Alterator-Required=no
X-Alterator-Parent=server-v/140-openstack X-Alterator-Parent=server-v/120-openstack
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
Encoding=UTF-8 Encoding=UTF-8
Type=Directory Type=Directory
Name=PVE Server Name=PVE Server
Name[ru_RU]=PVE Сервер Name[ru_RU]=Сервер PVE
X-Alterator-PackageList=virt/pve X-Alterator-PackageList=virt/pve
X-Alterator-Required=no X-Alterator-Required=no
X-Alterator-Conflicts=server-v/kvm X-Alterator-Conflicts=server-v/kvm
X-Alterator-Parent=server-v/120-pve X-Alterator-Parent=server-v/130-pve
[Desktop Entry]
Type=Directory
Name=Minimal Install
Name[ru_RU]=Минимальная установка
X-Alterator-Groups=
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment