diff --git a/bin/confetty b/bin/confetty
index 71bc4a95..bba5e20f 100755
--- a/bin/confetty
+++ b/bin/confetty
@@ -368,7 +368,7 @@ inconsole = False
pendingcommand = ""
if len(args) == 1: # a node name, go straight to trying to console
consoleonly = True
- do_command("start /node/%s/console/session" % args[0], server)
+ do_command("start /nodes/%s/console/session" % args[0], server)
while not doexit:
if inconsole:
rdylist, _, _ = select.select((sys.stdin, session.connection), (), (), 60)
diff --git a/confluent/consoleserver.py b/confluent/consoleserver.py
index b4140219..b0f28d58 100644
--- a/confluent/consoleserver.py
+++ b/confluent/consoleserver.py
@@ -38,7 +38,7 @@ class _ConsoleHandler(object):
def _connect(self):
self._console = plugin.handle_path(
- "/node/%s/_console/session" % self.node,
+ "/nodes/%s/_console/session" % self.node,
"create", self.cfgmgr)
self._console.connect(self.get_console_output)
diff --git a/confluent/httpapi.py b/confluent/httpapi.py
index 15f106d7..bd0e1376 100644
--- a/confluent/httpapi.py
+++ b/confluent/httpapi.py
@@ -71,8 +71,8 @@ def node_creation_resources():
desc=attribs.node[attr]['description']).html() + '
\n'
create_resource_functions = {
- '/node/': node_creation_resources,
- '/nodegroup/': group_creation_resources,
+ '/nodes/': node_creation_resources,
+ '/groups/': group_creation_resources,
}
@@ -356,7 +356,7 @@ def _assemble_html(responses, resource, querydict, url):
firstpass = True
for y in create_resource_functions[url]():
if firstpass:
- yield "