Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mkimage-profiles
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ximper Linux
mkimage-profiles
Commits
1cfefc62
Commit
1cfefc62
authored
Oct 21, 2019
by
Alexey Shabalin
Committed by
Anton Midyukov
May 22, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
server-v.mk: update profile:
- disable openstack - disable ocfs2 - disable moosefs - disable openvz
parent
1d5b7b19
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
8 deletions
+11
-8
server-v.mk
conf.d/server-v.mk
+11
-8
No files found.
conf.d/server-v.mk
View file @
1cfefc62
...
@@ -46,11 +46,13 @@ distro/server-v: logging = $(addprefix server-v/,\
...
@@ -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 \
...
@@ -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
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment