Move consul:/components_port_start to consul:/components/port_start

Change-Id: Ia7764535dbb56608af563ecbaeacf4cf8f5d3b7c

diff --git a/moon_forming/conf2consul.py b/moon_forming/conf2consul.py
index 46c99d5..148bf92 100644 (file)
--- a/moon_forming/conf2consul.py
+++ b/moon_forming/conf2consul.py
@@ -86,14 +86,13 @@ def main():
     # put("slave", data_config["slave"])
     # put("docker", data_config["docker"])
     put("logging", data_config["logging"])
-    put("components_port_start", data_config["components"]["port_start"])
+    # put("components_port_start", data_config["components"]["port_start"])
 
     for _key, _value in data_config["components"].items():
-        if type(_value) is dict:
-            put("components/{}".format(_key), data_config["components"][_key])
+        put("components/{}".format(_key), data_config["components"][_key])
 
-    for _key, _value in data_config["plugins"].items():
-        put("plugins/{}".format(_key), data_config["plugins"][_key])
+    # for _key, _value in data_config["plugins"].items():
+    #     put("plugins/{}".format(_key), data_config["plugins"][_key])
 
     for _key, _value in data_config["openstack"].items():
         put("openstack/{}".format(_key), data_config["openstack"][_key])

diff --git a/tools/moon_kubernetes/conf/moon.conf b/tools/moon_kubernetes/conf/moon.conf
index a5a40ad..cf3f5c5 100644 (file)
--- a/tools/moon_kubernetes/conf/moon.conf
+++ b/tools/moon_kubernetes/conf/moon.conf
@@ -14,20 +14,23 @@ openstack:
         external:
             url: http://keystone:30006/v3
 
-plugins:
-    authz:
-        container: wukongsun/moon_authz:v4.3
-        port: 8081
-    session:
-        container: asteroide/session:latest
-        port: 8082
-
 components:
-    interface:
-        port: 8080
-        bind: 0.0.0.0
-        hostname: interface
-        container: wukongsun/moon_interface:v4.3
+    port_start:
+        31001
+    pipeline:
+        interface:
+            port: 8080
+            bind: 0.0.0.0
+            hostname: interface
+            container: wukongsun/moon_interface:v4.3
+        authz:
+            port: 8081
+            bind: 0.0.0.0
+            hostname: interface
+            container: wukongsun/moon_authz:v4.3
+        session:
+            container: asteroide/session:latest
+            port: 8082
     orchestrator:
         port: 8083
         bind: 0.0.0.0