Revision 0cffcdb1

b/lib/client/gnt_cluster.py
1103 1103
          opts.default_iallocator is not None or
1104 1104
          opts.default_iallocator_params or
1105 1105
          opts.reserved_lvs is not None or
1106
          opts.mac_prefix is not None or
1106 1107
          opts.master_netdev is not None or
1107 1108
          opts.master_netmask is not None or
1108 1109
          opts.use_external_mip_script is not None or
......
1219 1220
    default_iallocator=opts.default_iallocator,
1220 1221
    default_iallocator_params=opts.default_iallocator_params,
1221 1222
    prealloc_wipe_disks=opts.prealloc_wipe_disks,
1223
    mac_prefix=opts.mac_prefix,
1222 1224
    master_netdev=opts.master_netdev,
1223 1225
    master_netmask=opts.master_netmask,
1224 1226
    reserved_lvs=opts.reserved_lvs,
......
2169 2171
    SetClusterParams, ARGS_NONE,
2170 2172
    [FORCE_OPT,
2171 2173
     BACKEND_OPT, CP_SIZE_OPT, RQL_OPT, INSTANCE_COMMUNICATION_NETWORK_OPT,
2172
     ENABLED_HV_OPT, HVLIST_OPT, MASTER_NETDEV_OPT,
2174
     ENABLED_HV_OPT, HVLIST_OPT, MAC_PREFIX_OPT, MASTER_NETDEV_OPT,
2173 2175
     MASTER_NETMASK_OPT, NIC_PARAMS_OPT, VG_NAME_OPT, MAINTAIN_NODE_HEALTH_OPT,
2174 2176
     UIDPOOL_OPT, ADD_UIDS_OPT, REMOVE_UIDS_OPT, DRBD_HELPER_OPT,
2175 2177
     DEFAULT_IALLOCATOR_OPT, DEFAULT_IALLOCATOR_PARAMS_OPT, RESERVED_LVS_OPT,
b/lib/cmdlib/cluster.py
803 803
    if self.op.remove_uids:
804 804
      uidpool.CheckUidPool(self.op.remove_uids)
805 805

  
806
    if self.op.mac_prefix:
807
      self.op.mac_prefix = \
808
          utils.NormalizeAndValidateThreeOctetMacPrefix(self.op.mac_prefix)
809

  
806 810
    if self.op.master_netmask is not None:
807 811
      _ValidateNetmask(self.cfg, self.op.master_netmask)
808 812

  
......
1589 1593
    if self.op.blacklisted_os:
1590 1594
      helper_os("blacklisted_os", self.op.blacklisted_os, "blacklisted")
1591 1595

  
1596
    if self.op.mac_prefix:
1597
      self.cluster.mac_prefix = self.op.mac_prefix
1598

  
1592 1599
    if self.op.master_netdev:
1593 1600
      master_params = self.cfg.GetMasterNetworkParameters()
1594 1601
      ems = self.cfg.GetUseExternalMipScript()
b/src/Ganeti/OpCodes.hs
228 228
     , pDrbdHelper
229 229
     , pDefaultIAllocator
230 230
     , pDefaultIAllocatorParams
231
     , pNetworkMacPrefix
231 232
     , pMasterNetdev
232 233
     , pMasterNetmask
233 234
     , pReservedLvs
b/test/hs/Test/Ganeti/OpCodes.hs
196 196
          <*> arbitrary                    -- drbd_helper
197 197
          <*> arbitrary                    -- default_iallocator
198 198
          <*> emptyMUD                     -- default_iallocator_params
199
          <*> genMaybe genMacPrefix        -- mac_prefix
199 200
          <*> arbitrary                    -- master_netdev
200 201
          <*> arbitrary                    -- master_netmask
201 202
          <*> arbitrary                    -- reserved_lvs

Also available in: Unified diff