Merge pull request #594 from Springest/private_networking_support

Matthew Fisher · Matthew Fisher · commit 6ee6a535909d · 2014-03-14T00:33:54.000-07:00
Adds private networking for Digital Ocean
diff --git a/provider/digitalocean.py b/provider/digitalocean.py
@@ -95,7 +95,8 @@ def _get_droplet_kwargs(node, conn):
         'region_id': _get_id(conn.regions(), params.get('region', 'San Francisco 1')),
         'ssh_key_ids': [str(_get_id(conn.all_ssh_keys(),
                         "deis-{formation}-{layer}".format(**node)))],
-        'virtio': True
+        'virtio': True,
+        'private_networking': True
     }
 
 
diff --git a/requirements.txt b/requirements.txt
@@ -7,7 +7,8 @@ django-guardian==1.1.1
 django-json-field==0.5.5
 django-yamlfield==0.5
 djangorestframework==2.3.12
-dop==0.1.4
+#dop
+git+git://github.com/ahmontero/dop.git@6485d4eda8cd42dc44b3e6e5cf13d4974be0cdee
 gevent==1.0
 gunicorn==18.0
 paramiko==1.12.1

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,8 @@ def _get_droplet_kwargs(node, conn):`
`95`	`95`	`'region_id': _get_id(conn.regions(), params.get('region', 'San Francisco 1')),`
`96`	`96`	`'ssh_key_ids': [str(_get_id(conn.all_ssh_keys(),`
`97`	`97`	`"deis-{formation}-{layer}".format(**node)))],`
`98`		`- 'virtio': True`
	`98`	`+ 'virtio': True,`
	`99`	`+ 'private_networking': True`
`99`	`100`	`}`
`100`	`101`
`101`	`102`