diff options
| author |   Thomas Duval <thomas.duval@orange.com> | 2018-01-04 11:23:10 +0100 |
|---|---|---|
| committer | Thomas Duval <thomas.duval@orange.com> | 2018-01-04 11:23:10 +0100 |
| commit | 5707f4cb4ac8b7bd0b5d9c63110d21a6c068512c (patch) | |
| tree | 9b501f72601933e34884be951309669d1df72f78 | |
| parent | 0f88d8acc6d55a2274376c949e3ad3f4fc14dac7 (diff) | |
Move consul:/components_port_start to consul:/components/port_start
Change-Id: Ia7764535dbb56608af563ecbaeacf4cf8f5d3b7c
| -rw-r--r-- | moon_forming/conf2consul.py | 9 | ||||
| -rw-r--r-- | tools/moon_kubernetes/conf/moon.conf | 29 |
2 files changed, 20 insertions, 18 deletions
diff --git a/moon_forming/conf2consul.py b/moon_forming/conf2consul.py index 46c99d5c..148bf923 100644 --- 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 a5a40ad2..cf3f5c58 100644 --- 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 |