Release v0.4.4:

- wamp recovery on timeout updated - docs updated - requirements updated: pyOpenssl Change-Id: Id2e3c1adf05fb774713dd0488fb8b2751ec1b5da
2018-12-12 18:38:05 +01:00 · 2018-12-12 18:38:05 +01:00 · 19a0729c91
parent 044b45ff00
commit 19a0729c91
13 changed files with 107 additions and 28 deletions
--- a/.gitignore
+++ b/.gitignore
@ -9,7 +9,6 @@ build
 AUTHORS
 Authors
 ChangeLog
-*.md
 .eggs
 dist
 STUFF/
--- a/README.rst
+++ b/README.rst
@ -15,6 +15,11 @@ board-side probe.
 Installation guides
 -------------------

-* `Raspberry Pi 3 <https://github.com/MDSLab/iotronic-lightning-rod-agent/blob/master/doc/installation/raspberry_pi_3.rst>`_.
+* `Raspberry Pi 2/3 <https://github.com/openstack/iotronic-lightning-rod/blob/master/doc/installation/raspberry_pi_3.rst>`_.

-* `Ubuntu 16.04 <https://github.com/MDSLab/iotronic-lightning-rod-agent/blob/master/doc/installation/ubuntu1604.rst>`_.
+* `Ubuntu 16.04 <https://github.com/openstack/iotronic-lightning-rod/blob/master/doc/installation/ubuntu1604.rst>`_.
+
+* Docker:
+
+  * `Raspberry Pi <https://hub.docker.com/r/mdslab/rpi-openstack-iotronic-lightning-rod/>`_.
+  * `Debian/Ubuntu <https://hub.docker.com/r/mdslab/openstack-iotronic-lightning-rod/>`_.
--- a/doc/installation/docker/rpi_docker.md
+++ b/doc/installation/docker/rpi_docker.md
@ -0,0 +1,36 @@
+## Installation on arm architecture
+
+GitHub repo:
+- https://github.com/openstack/iotronic-lightning-rod
+
+# Configure Lightning-rod environment
+
+* Create the folder in your system to store Lightning-rod settings  <LR_CONF_PATH> (e.g. "/etc/iotronic/"):
+```
+sudo mkdir  <LR_CONF_PATH>
+```
+ 
+* Get Lightning-rod configuration template files:
+```
+cd  <LR_CONF_PATH>
+sudo wget https://raw.githubusercontent.com/openstack/iotronic-lightning-rod/master/templates/settings.example.json -O settings.json
+sudo wget https://raw.githubusercontent.com/openstack/iotronic-lightning-rod/master/etc/iotronic/iotronic.conf
+```
+
+* Configure Lightning-rod identity:
+```
+cd  <LR_CONF_PATH>
+wget https://raw.githubusercontent.com/openstack/iotronic-lightning-rod/master/scripts/lr_configure
+chmod +x lr_configure
+./lr_configure -c <REGISTRATION-TOKEN> <WAMP-REG-AGENT-URL>  <LR_CONF_PATH>
+```
+
+# Create container:
+```
+docker run -d --privileged \
+-v lr_var:/var/lib/iotronic -v lr_le:/etc/letsencrypt/ \
+-v  <LR_CONF_PATH>/settings.json:/etc/iotronic/settings.json \
+-v  <LR_CONF_PATH>/iotronic.conf:/etc/iotronic/iotronic.conf \
+--net=host --restart unless-stopped \
+--name=lightning-rod mdslab/rpi-openstack-iotronic-lightning-rod
+```
--- a/doc/installation/docker/x86_64_docker.md
+++ b/doc/installation/docker/x86_64_docker.md
@ -0,0 +1,36 @@
+# Installation on Ubuntu/Debian x86_64
+
+GitHub repo:
+- https://github.com/openstack/iotronic-lightning-rod
+
+# Configure Lightning-rod environment
+
+* Create the folder in your system to store Lightning-rod settings  <LR_CONF_PATH> (e.g. "/etc/iotronic/"):
+```
+sudo mkdir  <LR_CONF_PATH>
+```
+ 
+* Get Lightning-rod configuration template files:
+```
+cd  <LR_CONF_PATH>
+sudo wget https://raw.githubusercontent.com/openstack/iotronic-lightning-rod/master/templates/settings.example.json -O settings.json
+sudo wget https://raw.githubusercontent.com/openstack/iotronic-lightning-rod/master/etc/iotronic/iotronic.conf
+```
+
+* Configure Lightning-rod identity:
+```
+cd  <LR_CONF_PATH>
+wget https://raw.githubusercontent.com/openstack/iotronic-lightning-rod/master/scripts/lr_configure
+chmod +x lr_configure
+./lr_configure -c <REGISTRATION-TOKEN> <WAMP-REG-AGENT-URL>  <LR_CONF_PATH>
+```
+
+# Create container:
+```
+docker run -d --privileged \
+-v lr_var:/var/lib/iotronic -v lr_le:/etc/letsencrypt/ \
+-v  <LR_CONF_PATH>/settings.json:/etc/iotronic/settings.json \
+-v  <LR_CONF_PATH>/iotronic.conf:/etc/iotronic/iotronic.conf \
+--net=host --restart unless-stopped \
+--name=lightning-rod mdslab/openstack-iotronic-lightning-rod
+```
--- a/doc/installation/raspberry_pi_3.rst
+++ b/doc/installation/raspberry_pi_3.rst
@ -1,42 +1,42 @@
-IoTronic Lightning-rod installation guide for Raspberry Pi 3
+IoTronic Lightning-rod installation guide for Raspberry Pi 2/3
 ============================================================

-We tested this procedure on a Raspberry Pi 3 board (Raspbian).
+We tested this procedure on a Raspberry Pi 2/3 board (Raspbian).


 Install Lightning-rod
 ~~~~~~~~~~~~~~~~~~~~~
-
 ::

    pip3 install iotronic-lightningrod

-Deployment
-''''''''''
-
+Iotronic deployment
+'''''''''''''''''''
 ::
+
    lr_install


 Iotronic setup
 ''''''''''''''
-
 ::
+
    lr_configure

 Arguments required:
-    <REGISTRATION-TOKEN> : token released by IoTronic registration procedure
-    <WAMP-REG-AGENT-URL> : IoTronic Crossbar server URL
+   * <REGISTRATION-TOKEN> , token released by IoTronic registration procedure
+   * <WAMP-REG-AGENT-URL> , IoTronic Crossbar server WAMP URL:
+   ws(s)://<IOTRONIC-CROSSBAR-IP>:<IOTRONIC-CROSSBAR-PORT>/

 e.g.
 ::
-    lr_configure 000001 ws(s)://<IOTRONIC-CROSSBAR-IP>:<IOTRONIC-CROSSBAR-PORT>/
+
+    lr_configure <REGISTRATION-TOKEN> <WAMP-REG-AGENT-URL>

 Execution:
 ~~~~~~~~~~
-
 ::

    systemctl start lightning-rod.service

-    tail -f /var/log/iotronic/lightning-rod.log
+    tail -f /var/log/iotronic/lightning-rod.log
--- a/doc/installation/ubuntu1604.rst
+++ b/doc/installation/ubuntu1604.rst
@ -6,37 +6,37 @@ container). Everything needs to be run as root.

 Install Lightning-rod
 ~~~~~~~~~~~~~~~~~~~~~
-
 ::

    pip3 install iotronic-lightningrod

-Deployment
-''''''''''
-
+Iotronic deployment
+'''''''''''''''''''
 ::
+
    lr_install


 Iotronic setup
 ''''''''''''''
-
 ::
+
    lr_configure

 Arguments required:
-    <REGISTRATION-TOKEN> : token released by IoTronic registration procedure
-    <WAMP-REG-AGENT-URL> : IoTronic Crossbar server URL
+   * <REGISTRATION-TOKEN> , token released by IoTronic registration procedure
+   * <WAMP-REG-AGENT-URL> , IoTronic Crossbar server WAMP URL:
+   ws(s)://<IOTRONIC-CROSSBAR-IP>:<IOTRONIC-CROSSBAR-PORT>/

 e.g.
 ::
-    lr_configure 000001 ws(s)://<IOTRONIC-CROSSBAR-IP>:<IOTRONIC-CROSSBAR-PORT>/
+
+    lr_configure <REGISTRATION-TOKEN> <WAMP-REG-AGENT-URL>

 Execution:
 ~~~~~~~~~~
-
 ::

    systemctl start lightning-rod.service

-    tail -f /var/log/iotronic/lightning-rod.log
+    tail -f /var/log/iotronic/lightning-rod.log
--- a/doc/source/installation.rst
+++ b/doc/source/installation.rst
@ -4,9 +4,10 @@ Installation

 At the command line::

-    $ pip install iotronic_lightningrod
+    $ pip3 install iotronic_lightningrod
+    $ lr_install

 Or, if you have virtualenvwrapper installed::

    $ mkvirtualenv iotronic_lightningrod
-    $ pip install iotronic_lightningrod
+    $ pip3 install iotronic_lightningrod
--- a/iotronic_lightningrod/common/utils.py
+++ b/iotronic_lightningrod/common/utils.py
@ -77,6 +77,7 @@ def destroyWampSocket():

    except Exception as e:
        LOG.warning("RPC-ALIVE - destroyWampSocket error: " + str(e))
+        LR_restart()


 def get_version(package):
--- a/requirements.txt
+++ b/requirements.txt
@ -10,3 +10,4 @@ psutil>=5.4.7  # BSD
 oslo.config>=5.1.0  # Apache-2.0
 oslo.log>=3.36.0  # Apache-2.0
 pyinotify>=0.9.6;sys_platform!='win32' and sys_platform!='darwin' and sys_platform!='sunos5' # MIT
+pyOpenSSL>=16.2.0  # Apache-2.0
--- a/setup.cfg
+++ b/setup.cfg
@ -3,7 +3,7 @@ name = iotronic_lightningrod
 summary = Implementation of the Lightning-rod, the Stack4Things board-side probe
 description-file =
    README.rst
-author = Nicola Peditto, Fabio Verboso
+author = Nicola Peditto
 author-email = n.peditto@gmail.com
 home-page = http://stack4things.unime.it/
 classifier =
--- a/utils/docker/arm/Dockerfile
+++ b/utils/docker/arm/Dockerfile
--- a/utils/docker/arm/data/lr_install
+++ b/utils/docker/arm/data/lr_install
--- a/utils/docker/arm/data/startLR
+++ b/utils/docker/arm/data/startLR