[rhinstaller/blivet/pulls/200 rhel7-branch] fcoe: replace fipvlan with fcoemon (#1085325)

jkonecny12 installerbot-noreply at redhat.com
Wed Aug 12 08:07:34 UTC 2015


> @@ -145,28 +188,46 @@ def write(self, root):
>          if not self.nics:
>              return
>  
> -        if not os.path.isdir(root + "/etc/fcoe"):
> -            os.makedirs(root + "/etc/fcoe", 0o755)
> -
> -        for nic, dcb, auto_vlan in self.nics:
> -            fd = os.open(root + "/etc/fcoe/cfg-" + nic,
> -                         os.O_RDWR | os.O_CREAT)
> -            os.write(fd, '# Created by anaconda\n')
> -            os.write(fd, '# Enable/Disable FCoE service at the Ethernet port\n')
> -            os.write(fd, 'FCOE_ENABLE="yes"\n')
> -            os.write(fd, '# Indicate if DCB service is required at the Ethernet port\n')
> -            if dcb:
> -                os.write(fd, 'DCB_REQUIRED="yes"\n')
> -            else:
> -                os.write(fd, 'DCB_REQUIRED="no"\n')
> -            os.write(fd, '# Indicate if VLAN discovery should be handled by fcoemon\n')
> -            if auto_vlan:
> -                os.write(fd, 'AUTO_VLAN="yes"\n')
> -            else:
> -                os.write(fd, 'AUTO_VLAN="no"\n')
> -            os.close(fd)
> +        # Done before packages are installed so don't call
> +        # write_nic_fcoe_cfg in target root but just copy the cfgs
> +        shutil.copytree("/etc/fcoe", root + "/etc/fcoe")
>  
> -        return
> +    def write_nic_fcoe_cfg(self, nic, dcb=True, auto_vlan=True, enable=True, mode=None, root=""):
> +        cfg_dir = root + "/etc/fcoe"
> +        example_cfg = os.path.join(cfg_dir, "cfg-ethx")
> +        if os.access(example_cfg, os.R_OK):
> +            lines = open(example_cfg, "r").readlines()
> +        else:
> +            anaconda_cfg = """FCOE_ENABLE="yes"\n
> +DCB_REQUIRED="yes"\n
> +AUTO_VLAN="yes"\n
> +MODE="fabric"\n
> +"""

Could you please give here better indentation. Maybe concatenation of strings will be better here for readability.

-- 
To view this pull request on github, visit https://github.com/rhinstaller/blivet/pull/200#discussion_r36835270


More information about the anaconda-patches mailing list