Revision 4084d18f

b/Makefile.am
1842 1842
	    -DRAPI_GROUP="$(RAPI_GROUP)" \
1843 1843
	    -DCONFD_USER="$(CONFD_USER)" \
1844 1844
	    -DCONFD_GROUP="$(CONFD_GROUP)" \
1845
	    -DKVMD_USER="$(KVMD_USER)" \
1846
	    -DKVMD_GROUP="$(KVMD_GROUP)" \
1845 1847
	    -DLUXID_USER="$(LUXID_USER)" \
1846 1848
	    -DLUXID_GROUP="$(LUXID_GROUP)" \
1847 1849
	    -DNODED_USER="$(NODED_USER)" \
b/configure.ac
223 223
  [user_masterd="${withval}masterd";
224 224
   user_rapi="${withval}rapi";
225 225
   user_confd="${withval}confd";
226
   user_kvmd="$user_default";
226 227
   user_luxid="${withval}luxid";
227 228
   user_noded="$user_default";
228 229
   user_mond="$user_default"],
229 230
  [user_masterd="$user_default";
230 231
   user_rapi="$user_default";
231 232
   user_confd="$user_default";
233
   user_kvmd="$user_default";
232 234
   user_luxid="$user_default";
233 235
   user_noded="$user_default";
234 236
   user_mond="$user_default"])
235 237
AC_SUBST(MASTERD_USER, $user_masterd)
236 238
AC_SUBST(RAPI_USER, $user_rapi)
237 239
AC_SUBST(CONFD_USER, $user_confd)
240
AC_SUBST(KVMD_USER, $user_kvmd)
238 241
AC_SUBST(LUXID_USER, $user_luxid)
239 242
AC_SUBST(NODED_USER, $user_noded)
240 243
AC_SUBST(MOND_USER, $user_mond)
......
249 252
  [group_rapi="${withval}rapi";
250 253
   group_admin="${withval}admin";
251 254
   group_confd="${withval}confd";
255
   group_kvmd="$group_default";
252 256
   group_luxid="${withval}luxid";
253 257
   group_masterd="${withval}masterd";
254 258
   group_noded="$group_default";
......
257 261
  [group_rapi="$group_default";
258 262
   group_admin="$group_default";
259 263
   group_confd="$group_default";
264
   group_kvmd="$group_default";
260 265
   group_luxid="$group_default";
261 266
   group_masterd="$group_default";
262 267
   group_noded="$group_default";
......
265 270
AC_SUBST(RAPI_GROUP, $group_rapi)
266 271
AC_SUBST(ADMIN_GROUP, $group_admin)
267 272
AC_SUBST(CONFD_GROUP, $group_confd)
273
AC_SUBST(KVMD_GROUP, $group_kvmd)
268 274
AC_SUBST(LUXID_GROUP, $group_luxid)
269 275
AC_SUBST(MASTERD_GROUP, $group_masterd)
270 276
AC_SUBST(NODED_GROUP, $group_noded)
b/src/AutoConf.hs.in
169 169
confdGroup :: String
170 170
confdGroup = "CONFD_GROUP"
171 171

  
172
kvmdUser :: String
173
kvmdUser = "KVMD_USER"
174

  
175
kvmdGroup :: String
176
kvmdGroup = "KVMD_GROUP"
177

  
172 178
luxidUser :: String
173 179
luxidUser = "LUXID_USER"
174 180

  
b/src/Ganeti/Constants.hs
212 212
confdGroup :: String
213 213
confdGroup = Runtime.daemonGroup (DaemonGroup GanetiConfd)
214 214

  
215
kvmdUser :: String
216
kvmdUser = Runtime.daemonUser GanetiKvmd
217

  
218
kvmdGroup :: String
219
kvmdGroup = Runtime.daemonGroup (DaemonGroup GanetiKvmd)
220

  
215 221
luxidUser :: String
216 222
luxidUser = Runtime.daemonUser GanetiLuxid
217 223

  
......
341 347
rapi :: String
342 348
rapi = Runtime.daemonName GanetiRapi
343 349

  
350
kvmd :: String
351
kvmd = Runtime.daemonName GanetiKvmd
352

  
344 353
daemons :: FrozenSet String
345 354
daemons =
346 355
  ConstantUtils.mkSet [confd,
b/src/Ganeti/Runtime.hs
63 63
                  | GanetiNoded
64 64
                  | GanetiRapi
65 65
                  | GanetiConfd
66
                  | GanetiKvmd
66 67
                  | GanetiLuxid
67 68
                  | GanetiMond
68 69
                    deriving (Show, Enum, Bounded, Eq, Ord)
......
83 84
daemonName GanetiNoded   = "ganeti-noded"
84 85
daemonName GanetiRapi    = "ganeti-rapi"
85 86
daemonName GanetiConfd   = "ganeti-confd"
87
daemonName GanetiKvmd    = "ganeti-kvmd"
86 88
daemonName GanetiLuxid   = "ganeti-luxid"
87 89
daemonName GanetiMond    = "ganeti-mond"
88 90

  
......
92 94
daemonOnlyOnMaster GanetiNoded   = False
93 95
daemonOnlyOnMaster GanetiRapi    = False
94 96
daemonOnlyOnMaster GanetiConfd   = False
97
daemonOnlyOnMaster GanetiKvmd    = False
95 98
daemonOnlyOnMaster GanetiLuxid   = True
96 99
daemonOnlyOnMaster GanetiMond    = False
97 100

  
......
101 104
daemonLogBase GanetiNoded   = "node-daemon"
102 105
daemonLogBase GanetiRapi    = "rapi-daemon"
103 106
daemonLogBase GanetiConfd   = "conf-daemon"
107
daemonLogBase GanetiKvmd    = "kvm-daemon"
104 108
daemonLogBase GanetiLuxid   = "luxi-daemon"
105 109
daemonLogBase GanetiMond    = "monitoring-daemon"
106 110

  
......
110 114
daemonUser GanetiNoded   = AutoConf.nodedUser
111 115
daemonUser GanetiRapi    = AutoConf.rapiUser
112 116
daemonUser GanetiConfd   = AutoConf.confdUser
117
daemonUser GanetiKvmd    = AutoConf.kvmdUser
113 118
daemonUser GanetiLuxid   = AutoConf.luxidUser
114 119
daemonUser GanetiMond    = AutoConf.mondUser
115 120

  
......
120 125
daemonGroup (DaemonGroup GanetiRapi)    = AutoConf.rapiGroup
121 126
daemonGroup (DaemonGroup GanetiConfd)   = AutoConf.confdGroup
122 127
daemonGroup (DaemonGroup GanetiLuxid)   = AutoConf.luxidGroup
128
daemonGroup (DaemonGroup GanetiKvmd)    = AutoConf.kvmdGroup
123 129
daemonGroup (DaemonGroup GanetiMond)    = AutoConf.mondGroup
124 130
daemonGroup (ExtraGroup  DaemonsGroup)  = AutoConf.daemonsGroup
125 131
daemonGroup (ExtraGroup  AdminGroup)    = AutoConf.adminGroup
b/test/hs/Test/Ganeti/Runtime.hs
83 83
              \         constants.NODED_USER,\n\
84 84
              \         constants.RAPI_USER,\n\
85 85
              \         constants.CONFD_USER,\n\
86
              \         constants.KVMD_USER,\n\
86 87
              \         constants.LUXID_USER,\n\
87 88
              \         constants.MOND_USER,\n\
88 89
              \        ]\n\
......
90 91
              \          constants.NODED_GROUP,\n\
91 92
              \          constants.RAPI_GROUP,\n\
92 93
              \          constants.CONFD_GROUP,\n\
94
              \          constants.KVMD_GROUP,\n\
93 95
              \          constants.LUXID_GROUP,\n\
94 96
              \          constants.MOND_GROUP,\n\
95 97
              \          constants.DAEMONS_GROUP,\n\

Also available in: Unified diff