diff options
| author | Ruby Loo <rloo@yahoo-inc.com> | 2016-02-09 22:36:10 +0000 |
|---|---|---|
| committer | Ruby Loo <rloo@yahoo-inc.com> | 2016-02-09 22:47:45 +0000 |
| commit | 0b3da478a24a85df392ad383acea15bb559b80dc (patch) | |
| tree | 54b0d5b5ce0ea01bfb8fbd141f629f18cab17dbd /ironic/dhcp | |
| parent | 4a8482c9b82b6ce3909216179619d367e598e183 (diff) | |
| download | ironic-0b3da478a24a85df392ad383acea15bb559b80dc.tar.gz | |
Remove 'zapping' from code
The term 'zapping' has been replaced by 'manual cleaning'. This
removes 'zapping' from the code. Since one of the changes is in
the help for a config option, ironic.conf.sample was updated
(note that it was out of date).
(References to 'zapping' in the documentation is addressed in a
separate patch.)
Change-Id: Icc0303cf26b464b84ba97636b41d9edfa16b8dbd
Partial-Bug: #1526290
Diffstat (limited to 'ironic/dhcp')
| -rw-r--r-- | ironic/dhcp/neutron.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ironic/dhcp/neutron.py b/ironic/dhcp/neutron.py index 60499dabf..1ca4226de 100644 --- a/ironic/dhcp/neutron.py +++ b/ironic/dhcp/neutron.py @@ -52,9 +52,8 @@ neutron_opts = [ 'affected by this setting) is insecure and should only ' 'be used for testing.')), cfg.StrOpt('cleaning_network_uuid', - help=_('UUID of the network to create Neutron ports on when ' - 'booting to a ramdisk for cleaning/zapping using ' - 'Neutron DHCP')) + help=_('UUID of the network to create Neutron ports on, when ' + 'booting to a ramdisk for cleaning using Neutron DHCP.')) ] CONF = cfg.CONF |