Merge pull request #131 from arthurlogilab/network-id-0.9

[network-id] add an optional config to specify network-id
cloudenvy · Nov 1, 2014 · 328723a · 328723a
2 parents 18d7171 + 99a2eda
commit 328723a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/cloudenvy/config.py b/cloudenvy/config.py
@@ -14,6 +14,7 @@
         'auto_provision': False,
         'forward_agent': True,
         'default_cloud': None,
+        'network_id': None,
         'dotfiles': '.vimrc, .gitconfig, .gitignore, .screenrc',
         'sec_groups': [
             'icmp, -1, -1, 0.0.0.0/0',
@@ -50,6 +51,7 @@ def __init__(self, config):
         self.forward_agent = self._get_config('forward_agent')
 
         self.cloud_type = 'openstack' if 'os_auth_url' in self.user_config['cloud'] else 'ec2'
+        self.network_id = self._get_config('network_id')
 
     def _get_config(self, name, default=None):
         """Traverse the various config files in order of specificity.

diff --git a/cloudenvy/core.py b/cloudenvy/core.py
@@ -79,6 +79,9 @@ def build_server(self):
         #     userdata_path = self.project_config['userdata_path']
         #     logging.info('Using userdata from: %s', userdata_path)
         #     build_kwargs['user_data'] = userdata_path
+        if self.config.network_id:
+            logging.info('Adding network-id configuration.')
+            build_kwargs['nics'] = [{'net-id': self.config.network_id,},]
 
         logging.info('Creating server...')
         server = self.cloud_api.create_server(**build_kwargs)

diff --git a/etc/Envyfile.yml.example b/etc/Envyfile.yml.example
@@ -6,5 +6,6 @@ project_config:
   #remote_user: ubuntu
   #flavor_name: m1.small
   #auto_provision: False
+  #network_id : 00000000-0000-0000-0000-000000000000
   provision_scripts:
     #- provision_script.sh
diff --git a/etc/cloudenvy.yml.example b/etc/cloudenvy.yml.example
@@ -6,6 +6,7 @@ cloudenvy:
       os_password: password
       os_tenant_name: tenant_name
       os_auth_url: http://keystone.example.com:5000/v2.0/
+      #network_id : 00000000-0000-0000-0000-000000000000
 
       # Optional
       #os_region_name: RegionOne