shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

F #5260: Remove fs_lvm_ssh.conf file.

Browse Source 
(cherry picked from commit 1abfece3514a7adff2caef4b3d1bc19c658fb642)
This commit is contained in:
Ruben S. Montero 2021-05-26 10:43:00 +02:00
parent e7f7b685d7
commit ed088ef826
No known key found for this signature in database
GPG Key ID: A0CEA6FA880A1D87
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
install.sh
View File

@ -322,7 +322,6 @@ LIB_DIRS="$LIB_LOCATION/ruby \
VAR_DIRS="$VAR_LOCATION/remotes \
$VAR_LOCATION/remotes/etc \
$VAR_LOCATION/remotes/etc/tm/fs_lvm \
$VAR_LOCATION/remotes/etc/tm/fs_lvm_ssh \
$VAR_LOCATION/remotes/etc/tm/ssh \
$VAR_LOCATION/remotes/etc/datastore/fs \
$VAR_LOCATION/remotes/etc/datastore/ceph \
@ -688,7 +687,6 @@ INSTALL_FILES=(
TM_FS_LVM_FILES:$VAR_LOCATION/remotes/tm/fs_lvm
TM_FS_LVM_ETC_FILES:$VAR_LOCATION/remotes/etc/tm/fs_lvm/fs_lvm.conf
TM_FS_LVM_SSH_FILES:$VAR_LOCATION/remotes/tm/fs_lvm_ssh
TM_FS_LVM_SSH_ETC_FILES:$VAR_LOCATION/remotes/etc/tm/fs_lvm_ssh/fs_lvm_ssh.conf
TM_QCOW2_FILES:$VAR_LOCATION/remotes/tm/qcow2
TM_SSH_FILES:$VAR_LOCATION/remotes/tm/ssh
TM_SSH_ETC_FILES:$VAR_LOCATION/remotes/etc/tm/ssh
@ -1887,9 +1885,6 @@ TM_FS_LVM_SSH_FILES="src/tm_mad/fs_lvm_ssh/activate \
src/tm_mad/fs_lvm_ssh/delete \
src/tm_mad/fs_lvm_ssh/resize"
TM_FS_LVM_SSH_ETC_FILES="src/tm_mad/fs_lvm_ssh/fs_lvm_ssh.conf"
TM_QCOW2_FILES="src/tm_mad/qcow2/clone \
src/tm_mad/qcow2/clone.ssh \
src/tm_mad/qcow2/delete \

25
src/template/OpenNebulaTemplate.cc
View File

@ -62,8 +62,9 @@ void OpenNebulaTemplate::set_multiple_conf_default()
#*******************************************************************************
# dummy
# lvm
# shared
# fs_lvm
# fs_lvmm_ssh
# shared
# qcow2
# ssh
# vmfs
@ -71,15 +72,21 @@ void OpenNebulaTemplate::set_multiple_conf_default()
# dev
#*******************************************************************************
*/
set_conf_tm("dummy", "NONE", "SYSTEM", "YES", "YES", "");
set_conf_tm("lvm", "NONE", "SELF", "YES", "NO", "");
set_conf_tm("shared", "NONE", "SYSTEM", "YES", "YES", "");
set_conf_tm("dummy", "NONE", "SYSTEM", "YES", "YES", "");
set_conf_tm("lvm", "NONE", "SELF", "YES", "NO", "");
set_conf_tm("fs_lvm", "SYSTEM", "SYSTEM", "YES", "NO", "raw");
set_conf_tm("qcow2", "NONE", "SYSTEM", "YES", "NO", "qcow2");
set_conf_tm("ssh", "SYSTEM", "SYSTEM", "NO", "YES", "");
set_conf_tm("vmfs", "NONE", "SYSTEM", "YES", "NO", "");
set_conf_tm("ceph", "NONE", "SELF", "YES", "NO", "raw");
set_conf_tm("dev", "NONE", "NONE", "YES", "NO", "");
set_conf_tm("fs_lvm_ssh", "SYSTEM", "SYSTEM", "YES", "NO", "raw");
set_conf_tm("shared", "NONE", "SYSTEM", "YES", "YES", "");
set_conf_tm("qcow2", "NONE", "SYSTEM", "YES", "NO", "qcow2");
set_conf_tm("ssh", "SYSTEM", "SYSTEM", "NO", "YES", "");
set_conf_tm("vmfs", "NONE", "SYSTEM", "YES", "NO", "");
set_conf_tm("ceph", "NONE", "SELF", "YES", "NO", "raw");
set_conf_tm("dev", "NONE", "NONE", "YES", "NO", "");
register_multiple_conf_default("TM_MAD_CONF");
/*

1
src/tm_mad/fs_lvm_ssh/fs_lvm_ssh.conf
View File

@ -1 +0,0 @@
../fs_lvm/fs_lvm.conf