summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <javier.jardon@codethink.co.uk>2015-03-11 19:48:02 (GMT)
committerJavier Jardón <javier.jardon@codethink.co.uk>2015-03-16 17:59:55 (GMT)
commitdacb812a9589f1dade8b9b66ae9c17947c2301d5 (patch)
treebbc7fd4522c1a27119154874a0a1e83bc7bdf8ee
parentf9ba8e880da87af2952b6daef15c720d2c860217 (diff)
downloadmorph-dacb812a9589f1dade8b9b66ae9c17947c2301d5.tar.gz
simple-network.configure: Update documentation
-rwxr-xr-xmorphlib/exts/simple-network.configure15
1 files changed, 9 insertions, 6 deletions
diff --git a/morphlib/exts/simple-network.configure b/morphlib/exts/simple-network.configure
index fbbe6c4..7c078c9 100755
--- a/morphlib/exts/simple-network.configure
+++ b/morphlib/exts/simple-network.configure
@@ -13,13 +13,15 @@
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
-'''A Morph deployment configuration extension to handle /etc/network/interfaces
+'''A Morph deployment configuration extension to handle network configutation
-This extension prepares /etc/network/interfaces with the interfaces specified
-during deployment.
+This extension prepares /etc/network/interfaces and networkd .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.
+with the hostname of the system in the case of /etc/network/interfaces.
+In the case of networkd, any interface starting by e* will be configured
+for DHCP
'''
@@ -36,9 +38,10 @@ class SimpleNetworkError(morphlib.Error):
class SimpleNetworkConfigurationExtension(cliapp.Application):
- '''Configure /etc/network/interfaces
+ '''Configure /etc/network/interfaces and generate networkd .network files
- Reading NETWORK_CONFIG, this extension sets up /etc/network/interfaces.
+ Reading NETWORK_CONFIG, this extension sets up /etc/network/interfaces
+ and .network files in /etc/systemd/network/.
'''
def process_args(self, args):