From 435c96f9f8e6184fa5c777c73d98a887dd4a4507 Mon Sep 17 00:00:00 2001
From: Fabio Verboso <fverboso@unime.it>
Date: Wed, 5 Apr 2017 15:55:52 +0200
Subject: [PATCH] cleaning and improving setup configuration

Change-Id: Ic84f254937f10e44144d9f95e115f5b84f269805
---
 etc/iotronic/iotronic.conf                    | 12 +++---------
 iotronic/cmd/__init__.py                      |  0
 iotronic/cmd/conductor.py                     |  6 ++++--
 iotronic/cmd/{wamp-agent.py => wamp_agent.py} |  5 +++--
 4 files changed, 10 insertions(+), 13 deletions(-)
 create mode 100644 iotronic/cmd/__init__.py
 rename iotronic/cmd/{wamp-agent.py => wamp_agent.py} (91%)

diff --git a/etc/iotronic/iotronic.conf b/etc/iotronic/iotronic.conf
index ee3acc3..222add3 100644
--- a/etc/iotronic/iotronic.conf
+++ b/etc/iotronic/iotronic.conf
@@ -9,8 +9,7 @@ verbose=False
 # "keystone" or "noauth". "noauth" should not be used in a
 # production environment because all authentication will be
 # disabled. (string value)
-auth_strategy=noauth
-#auth_strategy=keystone
+auth_strategy=keystone
 
 # Enable pecan debug mode. WARNING: this is insecure and
 # should not be used in a production environment. (boolean
@@ -20,19 +19,14 @@ auth_strategy=noauth
 
 [wamp]
 wamp_transport_url = ws://<host>:<port>/
-#wamp_ip = <wamp_router_ip>
-#wamp_port = <port>
 wamp_realm = s4t
+# register_agent = True
+
 
 
 [database]
 connection = mysql://<user>:<password>@<host>/iotronic
 
-[oslo_messaging_rabbit]
-#rabbit_host = controller
-#rabbit_userid = openstack
-#rabbit_password = RABBIT_PASS
-
 [keystone_authtoken]
 auth_uri = http://<keystone_host>:5000
 auth_url = http://<keystone_host>:35357
diff --git a/iotronic/cmd/__init__.py b/iotronic/cmd/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/iotronic/cmd/conductor.py b/iotronic/cmd/conductor.py
index dc9c3d0..6d1e1bd 100755
--- a/iotronic/cmd/conductor.py
+++ b/iotronic/cmd/conductor.py
@@ -22,5 +22,7 @@ from iotronic.conductor.manager import ConductorManager
 import socket
 
 CONF = cfg.CONF
-if __name__ == '__main__':
-    cond = ConductorManager(socket.gethostname())
+
+
+def main():
+    ConductorManager(socket.gethostname())
diff --git a/iotronic/cmd/wamp-agent.py b/iotronic/cmd/wamp_agent.py
similarity index 91%
rename from iotronic/cmd/wamp-agent.py
rename to iotronic/cmd/wamp_agent.py
index 2577715..307a05c 100755
--- a/iotronic/cmd/wamp-agent.py
+++ b/iotronic/cmd/wamp_agent.py
@@ -22,5 +22,6 @@ Iotronic Wamp Agent
 from iotronic.wamp.agent import WampAgent
 import socket
 
-if __name__ == '__main__':
-    wa = WampAgent(socket.gethostname())
+
+def main():
+    WampAgent(socket.gethostname())