Update and clean configuration files

Change-Id: I260c3cebaf725fb4d12fc316897db5eadaba056c

diff --git a/moonv4/conf/moon.conf b/moonv4/conf/moon.conf
index e0200c8..e807b1d 100644 (file)
--- a/moonv4/conf/moon.conf
+++ b/moonv4/conf/moon.conf
@@ -2,20 +2,6 @@ database:
     url: mysql+pymysql://moon:p4sswOrd1@db/moon
     driver: sql
 
-messenger:
-    url: rabbit://moon:p4sswOrd1@messenger:5672/moon
-
-docker:
-    url: tcp://172.88.88.1:2376
-    network: moon
-
-slave:
-    name:
-    master:
-        url:
-        login:
-        password:
-
 openstack:
     keystone:
         url: http://keystone:5000/v3
@@ -29,31 +15,33 @@ openstack:
 plugins:
     authz:
         container: wukongsun/moon_authz:v4.3
+        port: 8081
     session:
         container: asteroide/session:latest
+        port: 8082
 
 components:
     interface:
-        port: 8081
+        port: 8080
         bind: 0.0.0.0
         hostname: interface
         container: wukongsun/moon_interface:v4.3
     orchestrator:
         port: 8083
         bind: 0.0.0.0
-        hostname: orchestrator
+        hostname: interface
         container: wukongsun/moon_orchestrator:v4.3
     wrapper:
         port: 8080
         bind: 0.0.0.0
         hostname: wrapper
-        container: wukongsun/moon_wrapper:v4.3
+        container: wukongsun/moon_wrapper:v4.3.1
         timeout: 5
     manager:
         port: 8082
         bind: 0.0.0.0
         hostname: manager
-        container: wukongsun/moon_manager:v4.3
+        container: wukongsun/moon_manager:v4.3.1
     port_start: 31001
 
 logging:

diff --git a/moonv4/templates/moonforming/moon.conf b/moonv4/templates/moonforming/moon.conf
index 2fa1db5..e807b1d 100644 (file)
--- a/moonv4/templates/moonforming/moon.conf
+++ b/moonv4/templates/moonforming/moon.conf
@@ -2,20 +2,6 @@ database:
     url: mysql+pymysql://moon:p4sswOrd1@db/moon
     driver: sql
 
-messenger:
-    url: rabbit://moon:p4sswOrd1@messenger:5672/moon
-
-docker:
-    url: tcp://172.88.88.1:2376
-    network: moon
-
-slave:
-    name:
-    master:
-        url:
-        login:
-        password:
-
 openstack:
     keystone:
         url: http://keystone:5000/v3
@@ -49,13 +35,13 @@ components:
         port: 8080
         bind: 0.0.0.0
         hostname: wrapper
-        container: wukongsun/moon_wrapper:v4.3
+        container: wukongsun/moon_wrapper:v4.3.1
         timeout: 5
     manager:
         port: 8082
         bind: 0.0.0.0
         hostname: manager
-        container: wukongsun/moon_manager:v4.3
+        container: wukongsun/moon_manager:v4.3.1
     port_start: 31001
 
 logging: