summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-04-22 04:31:24 +0000
committerTarmac <>2011-04-22 04:31:24 +0000
commit32bb38fad4bd86406d714827743fbfe2e134f53d (patch)
tree69345f9bcd3a6a6052accdd7ee276f3d51289dde /doc
parent659ae2ce4685034f9979702ca92a361acc23b1b6 (diff)
parentb8683f5d0e9b903f3c7864f5dffe536d6e8ccea3 (diff)
Fixes cloudpipe to get the proper ip address.
* Changes FLAGS.vpn_image_id to integer * Converts to str when comparing because instance['image_id'] is a str * Removes unused method from db * Converts integer_id to ami when launching * Adds docs for setting up interface in cloudpipe image
Diffstat (limited to 'doc')
-rw-r--r--doc/source/devref/cloudpipe.rst8
-rw-r--r--doc/source/devref/down.sh (renamed from doc/source/down.sh)0
-rw-r--r--doc/source/devref/interfaces17
-rw-r--r--doc/source/devref/up.sh (renamed from doc/source/up.sh)0
4 files changed, 24 insertions, 1 deletions
diff --git a/doc/source/devref/cloudpipe.rst b/doc/source/devref/cloudpipe.rst
index 95570aa1b..15d3160b7 100644
--- a/doc/source/devref/cloudpipe.rst
+++ b/doc/source/devref/cloudpipe.rst
@@ -62,12 +62,18 @@ Making a cloudpipe image is relatively easy.
:language: bash
:linenos:
-# download and run the payload on boot from /etc/rc.local.
+# download and run the payload on boot from /etc/rc.local
.. literalinclude:: rc.local
:language: bash
:linenos:
+# setup /etc/network/interfaces
+
+.. literalinclude:: interfaces
+ :language: bash
+ :linenos:
+
# register the image and set the image id in your flagfile::
--vpn_image_id=ami-xxxxxxxx
diff --git a/doc/source/down.sh b/doc/source/devref/down.sh
index 5c1888870..5c1888870 100644
--- a/doc/source/down.sh
+++ b/doc/source/devref/down.sh
diff --git a/doc/source/devref/interfaces b/doc/source/devref/interfaces
new file mode 100644
index 000000000..b7116aeb7
--- /dev/null
+++ b/doc/source/devref/interfaces
@@ -0,0 +1,17 @@
+# This file describes the network interfaces available on your system
+# and how to activate them. For more information, see interfaces(5).
+
+# The loopback network interface
+auto lo
+iface lo inet loopback
+
+# The primary network interface
+auto eth0
+iface eth0 inet manual
+ up ifconfig $IFACE 0.0.0.0 up
+ down ifconfig $IFACE down
+
+auto br0
+iface br0 inet dhcp
+ bridge_ports eth0
+
diff --git a/doc/source/up.sh b/doc/source/devref/up.sh
index 073a58e15..073a58e15 100644
--- a/doc/source/up.sh
+++ b/doc/source/devref/up.sh