summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Bryant <russell@ovn.org>2016-03-25 00:31:22 +0000
committerRussell Bryant <russell@ovn.org>2016-03-24 23:10:43 -0400
commit9e6ec60ab3d577d53254b5ac9c35e1c4dc4194cf (patch)
tree2fdcd53b0aa996cd1c0b5d7e84ea0db2fea4e729
parent0e12c2a45cf91aa7391b6f1948f1cbd978843cbe (diff)
downloadopenvswitch-9e6ec60ab3d577d53254b5ac9c35e1c4dc4194cf.tar.gz
ovs-ctl: Store hostname as an external-id.
Update ovs-ctl to store the system hostname as an external-id, similar to the system-id. This is largely for convenience. ovn-controller will make use of it in a future commit. Someone in the OpenDaylight community requested the same thing in a discussion earlier this week. While we're at it, set external-ids:hostname in ovs-sandbox as well. Suggested-by: Justin Pettit <jpettit@ovn.org> Suggested-at: http://openvswitch.org/pipermail/dev/2016-March/068225.html Signed-off-by: Russell Bryant <russell@ovn.org> Acked-by: Justin Pettit <jpettit@ovn.org>
-rwxr-xr-xtutorial/ovs-sandbox1
-rwxr-xr-xutilities/ovs-ctl.in2
-rw-r--r--vswitchd/vswitch.xml4
3 files changed, 7 insertions, 0 deletions
diff --git a/tutorial/ovs-sandbox b/tutorial/ovs-sandbox
index f331a0015..412c98289 100755
--- a/tutorial/ovs-sandbox
+++ b/tutorial/ovs-sandbox
@@ -356,6 +356,7 @@ rungdb $gdb_vswitchd $gdb_vswitchd_ex ovs-vswitchd --detach --no-chdir --pidfile
if $ovn; then
ovs-vsctl set open . external-ids:system-id=56b18105-5706-46ef-80c4-ff20979ab068
+ ovs-vsctl set open . external-ids:hostname=sandbox
ovs-vsctl set open . external-ids:ovn-remote=unix:"$sandbox"/ovnsb_db.sock
ovs-vsctl set open . external-ids:ovn-encap-type=geneve
ovs-vsctl set open . external-ids:ovn-encap-ip=127.0.0.1
diff --git a/utilities/ovs-ctl.in b/utilities/ovs-ctl.in
index 7354a473f..d2872ef82 100755
--- a/utilities/ovs-ctl.in
+++ b/utilities/ovs-ctl.in
@@ -108,6 +108,8 @@ set_system_ids () {
esac
set "$@" external-ids:system-id="\"$SYSTEM_ID\""
+ set "$@" external-ids:hostname="\"$(hostname)\""
+
if test X"$SYSTEM_TYPE" != X; then
set "$@" system-type="\"$SYSTEM_TYPE\""
else
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index 09985845a..7d6976f2f 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -72,6 +72,10 @@
host as displayed by <code>xe host-list</code>.
</column>
+ <column name="external_ids" key="hostname">
+ The hostname for the host running Open vSwitch.
+ </column>
+
<column name="other_config" key="stats-update-interval"
type='{"type": "integer", "minInteger": 5000}'>
<p>