commit 46e9959e4f9b74b45bda965f03c314e83450c09e
author garciadeblas <gerardo.garciadeblas@telefonica.com> Mon Apr 16 13:32:02 2018 +0200
committer garciadeblas <gerardo.garciadeblas@telefonica.com> Tue Apr 17 23:13:49 2018 +0200
tree c459f313c90e0ac97a2fd2800417c47c06e1f3c6
parent 34b892a25173619996492dd037643af146235894

Generalization of lightweight build install

Swarm init with advertised address
Docker-compose file exposing only relevant ports
Docker env files updated to be generated by the installer

Change-Id: I8325d929b76564f5f1bf9fb49144e9b8c239f128
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

installers/docker/docker-compose.yaml

diff --git a/installers/docker/docker-compose.yaml b/installers/docker/docker-compose.yaml
index 0b24db2..82d0d09 100644
--- a/installers/docker/docker-compose.yaml
+++ b/installers/docker/docker-compose.yaml
@@ -10,8 +10,8 @@
 services:
   zookeeper:
     image: wurstmeister/zookeeper
-    ports:
-      - "2181:2181"
+#    ports:
+#      - "2181:2181"
     networks:
       - netOSM
   kafka:
@@ -30,8 +30,8 @@
     #  - zookeeper
   mongo:
     image: mongo
-    ports:
-      - "27017:27017"
+#    ports:
+#      - "27017:27017"
     networks:
       - netOSM
   nbi:
@@ -70,8 +70,8 @@
       - netOSM
     env_file:
       - ./ro-db.env
-    ports:
-      - "3306:3306"
+#    ports:
+#      - "3306:3306"
   ro:
     image: osm/ro
     networks:
@@ -90,6 +90,8 @@
       - netOSM
     environment:
       BROKER_URI: kafka:9092
+    env_file:
+      - ./mon.env
     #depends_on:
     #  - kafka
     ports:

installers/docker/lcm.env

diff --git a/installers/docker/lcm.env b/installers/docker/lcm.env
index 9c9de25..f0baac4 100644
--- a/installers/docker/lcm.env
+++ b/installers/docker/lcm.env
@@ -1,2 +1,2 @@
-OSMLCM_VCA_HOST=`juju show-controller|grep api-endpoints|awk -F\' '{print $2}'|awk -F\: '{print $1}'`
-OSMLCM_VCA_SECRET=`grep password /home/ubuntu/.local/share/juju/accounts.yaml |awk '{print $2}'`
+OSMLCM_VCA_HOST=__JUJU_CONTROLLER_IP__
+OSMLCM_VCA_SECRET=__JUJU_PASSWORD__

installers/docker/mon.env

diff --git a/installers/docker/mon.env b/installers/docker/mon.env
new file mode 100644
index 0000000..10a0388
--- /dev/null
+++ b/installers/docker/mon.env
@@ -0,0 +1 @@
+OS_NOTIFIER_URI=http://__DEFAULT_IP__:8662

installers/docker/ro-db.env

diff --git a/installers/docker/ro-db.env b/installers/docker/ro-db.env
index 6f7297e..ac2a8d8 100644
--- a/installers/docker/ro-db.env
+++ b/installers/docker/ro-db.env
@@ -1 +1 @@
-MYSQL_ROOT_PASSWORD=osm4u
+MYSQL_ROOT_PASSWORD=__MYSQL_ROOT_PASSWORD__

installers/docker/ro.env

diff --git a/installers/docker/ro.env b/installers/docker/ro.env
index ca257f1..aa47593 100644
--- a/installers/docker/ro.env
+++ b/installers/docker/ro.env
@@ -1 +1 @@
-RO_DB_ROOT_PASSWORD=osm4u
+RO_DB_ROOT_PASSWORD=__MYSQL_ROOT_PASSWORD__