summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <javier.jardon@codethink.co.uk>2015-02-27 12:41:51 +0000
committerJavier Jardón <javier.jardon@codethink.co.uk>2015-02-27 12:44:14 +0000
commit2d97d408f473796bc5dab7291908c658f2f73a5b (patch)
tree2fcd85aa520b951b48daa947ae4e303f466898ec
parentf4c0ab971485f6f3c47596a22ed1dc95d58875ca (diff)
downloadmorph-2d97d408f473796bc5dab7291908c658f2f73a5b.tar.gz
simple-network.configure: Update documentation
To refer to .network files in /etc/systemd/network instead /etc/network/interfaces
-rwxr-xr-xmorphlib/exts/simple-network.configure18
1 files changed, 10 insertions, 8 deletions
diff --git a/morphlib/exts/simple-network.configure b/morphlib/exts/simple-network.configure
index a24c5845..b658851b 100755
--- a/morphlib/exts/simple-network.configure
+++ b/morphlib/exts/simple-network.configure
@@ -14,13 +14,14 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-'''A Morph deployment configuration extension to handle /etc/network/interfaces
+'''A Morph deployment configuration extension to handle .network files in
+/etc/systemd/network/
-This extension prepares /etc/network/interfaces with the interfaces specified
-during deployment.
+This extension prepares .network files in /etc/systemd/network/ with the
+interfaces specified during deployment.
-If no network configuration is provided, eth0 will be configured for DHCP
-with the hostname of the system.
+If no network configuration is provided, any interface starating by e*
+will be configured for DHCP.
'''
@@ -37,9 +38,10 @@ class SimpleNetworkError(morphlib.Error):
class SimpleNetworkConfigurationExtension(cliapp.Application):
- '''Configure /etc/network/interfaces
+ '''Generate .network files in /etc/systemd/network
- Reading NETWORK_CONFIG, this extension sets up /etc/network/interfaces.
+ Reading NETWORK_CONFIG, this extension sets up .network files in
+ /etc/systemd/network/.
'''
def process_args(self, args):
@@ -95,7 +97,7 @@ class SimpleNetworkConfigurationExtension(cliapp.Application):
return lines
def generate_iface_file(self, stanza):
- """Generate an interfaces stanza from the provided data."""
+ """Generate an .network file from the provided data."""
name = stanza['name']
itype = stanza['type']