keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

server-v.mk: update profile:

Browse Source 
- disable openstack
- disable ocfs2
- disable moosefs
- disable openvz
This commit is contained in:
Алексей Шабалин 2019-10-21 19:57:11 +03:00 committed by Anton Midyukov
parent 1d5b7b1938
commit 1cfefc62ab
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
conf.d/server-v.mk
View File

@ -46,11 +46,13 @@ 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/,\
111-opennebula-node 112-opennebula-server 121-openstack-node 122-openstack-controller 140-basic 201-docker) 111-opennebula-node 112-opennebula-server 140-basic 201-docker)
#121-openstack-node 122-openstack-controller
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/,\
211-openvz 130-pve) 130-pve)
# 211-openvz
endif endif
distro/.server-v-base: distro/.base distro/.installer \ distro/.server-v-base: distro/.base distro/.installer \
@ -100,23 +102,17 @@ distro/server-v: distro/.server-v-base +installer \
@$(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-opennebula $(opennebula)) @$(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/130-pve server-v/pve) @$(call add,MAIN_GROUPS,server-v/130-pve server-v/pve)
endif endif
@$(call add,MAIN_GROUPS,server-v/140-basic server-v/kvm) @$(call add,MAIN_GROUPS,server-v/140-basic server-v/kvm)
@$(call add,MAIN_GROUPS,server-v/200-container $(container)) @$(call add,MAIN_GROUPS,server-v/200-container $(container))
ifeq (,$(filter-out x86_64,$(ARCH)))
@$(call add,MAIN_GROUPS,server-v/openvz)
endif
@$(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)
@$(call add,MAIN_GROUPS,server-v/410-ceph $(ceph)) @$(call add,MAIN_GROUPS,server-v/410-ceph $(ceph))
@$(call add,MAIN_GROUPS,server-v/420-glusterfs $(glusterfs)) @$(call add,MAIN_GROUPS,server-v/420-glusterfs $(glusterfs))
@$(call add,MAIN_GROUPS,server-v/430-moosefs $(moosefs))
@$(call add,MAIN_GROUPS,server-v/450-nfs $(nfs)) @$(call add,MAIN_GROUPS,server-v/450-nfs $(nfs))
@$(call add,MAIN_GROUPS,server-v/460-iscsi $(iscsi)) @$(call add,MAIN_GROUPS,server-v/460-iscsi $(iscsi))
@$(call add,MAIN_GROUPS,server-v/ocfs2)
@$(call add,MAIN_GROUPS,server-v/500-network $(network)) @$(call add,MAIN_GROUPS,server-v/500-network $(network))
@$(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))
@ -134,4 +130,11 @@ endif
@$(call add,DEFAULT_SERVICES_DISABLE,systemd-networkd systemd-resolved) @$(call add,DEFAULT_SERVICES_DISABLE,systemd-networkd systemd-resolved)
# @$(call add,MAIN_GROUPS,server-v/141-cockpit $(cockpit)) # @$(call add,MAIN_GROUPS,server-v/141-cockpit $(cockpit))
# @$(call add,MAIN_GROUPS,server-v/430-moosefs $(moosefs))
# @$(call add,MAIN_GROUPS,server-v/ocfs2)
# @$(call add,MAIN_GROUPS,server-v/120-openstack $(openstack))
#ifeq (,$(filter-out x86_64,$(ARCH)))
# @$(call add,MAIN_GROUPS,server-v/openvz)
#endif
endif endif