fix typo copy-paste

conf.d/p8.mk

@@ -38,6 +38,7 @@ distro/alt-p8-server: distro/regular-server mixin/p8; @:
 distro/alt-p8-server-ovz: distro/regular-server-ovz mixin/p8; @:
 distro/alt-p8-server-hyperv: distro/regular-server-hyperv mixin/p8; @:
 distro/alt-p8-server-samba4: distro/regular-server-samba4 mixin/p8; @:
+distro/alt-p8-server-opennebula: distro/regular-server-opennebula mixin/p8; @:
 distro/alt-p8-server-openstack: distro/regular-server-openstack mixin/p8; @:
 distro/alt-p8-server-pve: distro/regular-server-pve mixin/p8; @:
 

conf.d/regular.mk

@@ -224,8 +224,17 @@ distro/regular-server-hyperv: distro/.regular-server-managed
 	@$(call add,DEFAULT_SERVICES_DISABLE,bridge smartd)
 	@$(call add,DEFAULT_SERVICES_DISABLE,cpufreq-simple powertop)
 
+distro/regular-server-opennebula: distro/.regular-server-systemd \
+	use/kernel/server use/ntp/chrony use/server/groups/opennebula \
+	use/firmware/qlogic use/control/sudo-su use/net-ssh +efi
+	@$(call set,BASE_BOOTLOADER,grub)
+	@$(call set,INSTALLER,altlinux-server)
+	@$(call add,MAIN_GROUPS,tools/ipmi tools/monitoring)
+	@$(call add,THE_PACKAGES,nfs-clients su sudo)
+	@$(call add,THE_PACKAGES,bridge-utils dhcpcd tzdata)
+
 distro/.regular-server-openstack: distro/.regular-server-base \
-	use/firmware/qlogic use/server/groups/openstack
+	use/ntp/chrony use/firmware/qlogic use/server/groups/openstack
 	@$(call add,MAIN_GROUPS,tools/ipmi tools/monitoring)
 
 distro/regular-server-openstack: distro/.regular-server-openstack +systemd; @:

features.in/firmware/config.mk

@@ -16,12 +16,6 @@ use/firmware/server: use/firmware
 	@$(call add,THE_PACKAGES_REGEXP,firmware-ql.*)
 
 use/firmware/qlogic: use/firmware
-	@$(call add,SYSTEM_PACKAGES,firmware-ql2100)
-	@$(call add,SYSTEM_PACKAGES,firmware-ql2200)
-	@$(call add,SYSTEM_PACKAGES,firmware-ql2300)
-	@$(call add,SYSTEM_PACKAGES,firmware-ql2322)
-	@$(call add,SYSTEM_PACKAGES,firmware-ql2400)
-	@$(call add,SYSTEM_PACKAGES,firmware-ql2500)
 	@$(call add,SYSTEM_PACKAGES,firmware-ql6312)
 
 # NB: individual firmwarez would sometimes conflict

features.in/server/config.mk

@@ -51,6 +51,11 @@ use/server/groups/services: use/server
 
 use/server/groups/base: use/server/groups/tools use/server/groups/services; @:
 
+use/server/groups/opennebula: use/server
+	@$(call add,MAIN_GROUPS,opennebula/node-kvm opennebula/node-lxd)
+	@$(call add,MAIN_GROUPS,opennebula/server opennebula/gui)
+	@$(call add,MAIN_GROUPS,opennebula/flow opennebula/gate)
+
 use/server/groups/openstack: use/server
 	@$(call add,MAIN_GROUPS,openstack/block openstack/compute)
 	@$(call add,MAIN_GROUPS,openstack/controller openstack/network)

pkg.in/groups/opennebula/flow.directory

@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=OneFlow manages services and elasticity
+X-Alterator-PackageList=opennebula/flow
+X-Alterator-Required=no
+Name[ru_RU]=OneFlow управление сервисами

pkg.in/groups/opennebula/gate.directory

@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=OneGate server that enables communication between VMs and OpenNebula
+X-Alterator-PackageList=opennebula/gate
+X-Alterator-Required=no
+Name[ru_RU]=OneGate сервер сообщение между VM и OpenNebula

pkg.in/groups/opennebula/gui.directory

@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Sunstone Web GUI and the EC2 API
+X-Alterator-PackageList=opennebula/gui
+X-Alterator-Required=no
+Name[ru_RU]=Sunstone Web-интерфейс и EC2 API

pkg.in/groups/opennebula/node-kvm.directory

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Computing KVM Node
+X-Alterator-PackageList=opennebula/node-kvm
+X-Alterator-Required=no
+X-Alterator-Conflicts=opennebula/server opennebula/gui opennebula/gate opennebula/flow
+Name[ru_RU]=Вычислительный узел KVM

pkg.in/groups/opennebula/node-lxd.directory

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Computing LXD Node
+X-Alterator-PackageList=opennebula/node-lxd
+X-Alterator-Required=no
+X-Alterator-Conflicts=opennebula/server opennebula/gui opennebula/gate opennebula/flow
+Name[ru_RU]=Вычислительный узел LXD

pkg.in/groups/opennebula/server.directory

@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Main OpenNebula daemon and scheduler
+X-Alterator-PackageList=opennebula/server
+X-Alterator-Required=no
+Name[ru_RU]=Основной сервер Opennebula и планировщик

pkg.in/lists/opennebula/flow

@@ -0,0 +1 @@
+opennebula-flow

pkg.in/lists/opennebula/gate

@@ -0,0 +1 @@
+opennebula-gate

pkg.in/lists/opennebula/gui

@@ -0,0 +1,2 @@
+opennebula-sunstone
+memcached

pkg.in/lists/opennebula/node-kvm

@@ -0,0 +1 @@
+opennebula-node-kvm

pkg.in/lists/opennebula/node-lxd

@@ -0,0 +1 @@
+opennebula-node-lxd

pkg.in/lists/opennebula/server

@@ -0,0 +1,2 @@
+MySQL-server
+opennebula-server

pkg.in/lists/openstack/block

@@ -1,5 +1,3 @@
-openntpd
-python-module-MySQLdb
 lvm2
 openstack-cinder
-python-module-rtslib
+

pkg.in/lists/openstack/compute

@@ -1,4 +1,4 @@
-openntpd
-python-module-MySQLdb
 openstack-nova-compute
-openstack-neutron-openvswitch
+openstack-neutron-openvswitch-agent
+openstack-neutron-linuxbridge-agent
+openstack-ceilometer-compute

pkg.in/lists/openstack/controller

@@ -1,35 +1,20 @@
-openntpd
+MySQL-server
-python-module-MySQLdb
+rabbitmq-server
+memcached
 openstack-keystone
-python-module-keystoneclient
 openstack-glance
-python-module-glanceclient
 openstack-nova-api
 openstack-nova-conductor
 openstack-nova-console
 openstack-nova-novncproxy
 openstack-nova-scheduler
-python-module-novaclient
 openstack-neutron
-python-module-neutronclient
-memcached
-python-module-memcached
-apache2-mod_wsgi
-openstack-dashboard
 openstack-cinder
-python-module-swiftclient
 openstack-swift
 openstack-heat-api
 openstack-heat-engine
 openstack-heat-api-cfn
-openstack-ceilometer-api
-openstack-ceilometer-collector
 openstack-ceilometer-notification
 openstack-ceilometer-central
 openstack-ceilometer-alarm
-python-module-ceilometerclient
+openstack-dashboard
-mongo
-mongo-server-mongod
-python-module-troveclient
-MySQL-server
-rabbitmq-server

pkg.in/lists/openstack/network

@@ -1,7 +1,8 @@
-openntpd
-python-module-MySQLdb
 openstack-neutron
-openstack-neutron-openvswitch
+openstack-neutron-openvswitch-agent
-openstack-ceilometer-compute
+openstack-neutron-l3-agent
-python-module-ceilometerclient
+openstack-neutron-linuxbridge-agent
-python-module-pecan
+openstack-neutron-metadata-agent
+openstack-neutron-server
+openstack-neutron-fwaas
+openstack-neutron-lbaas

pkg.in/lists/openstack/storage

@@ -1,7 +1,4 @@
-openntpd
-python-module-MySQLdb
 openstack-swift-account
 openstack-swift-container
 openstack-swift-object
 xfsprogs
-xinetd

pkg.in/lists/tools/monitoring

@@ -10,10 +10,18 @@ collectd-cgi
 collectd-curl
 collectd-dbi
 collectd-ipmi
-#collectd-libvirt
+collectd-memcached
 collectd-mysql
 collectd-nginx
 #collectd-openvz
 collectd-ping
 collectd-rrdtool
 collectd-sensors
+collectd-virt
+
+telegraf
+
+prometheus-node_exporter
+
+zabbix-agent
+zabbix-agent-sudo