diff --git a/debian/changelog b/debian/changelog index c0c0e08..7ce8512 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ surok (0.8) testing; urgency=medium * Version bump * new config structure - * Basic consul support + * Port type * Discovery over Marathon API -- Denis Zheleztsov Tue, 07 Feb 2017 12:41:52 +0300 diff --git a/docs/Main-config-file.md b/docs/Main-config-file.md index 60f33ab..cd75b99 100644 --- a/docs/Main-config-file.md +++ b/docs/Main-config-file.md @@ -11,10 +11,6 @@ Default location is **/etc/surok/conf/surok.json** "force": true, "host": "http://marathon.mesos:8080" }, - "consul": { - "enabled": false, - "domain": "service.dc1.consul" - }, "mesos":{ "enabled": true, "domain": "marathon.mesos" @@ -56,9 +52,6 @@ Surok working with folowing systems. If system is disabled parameters will be ig Enable/disable restarting container * **host** - *string. Optional. "http://marathon.mesos:8080" by default* Marathon address. - * For Consul "consul" - * **domain** - *string. Required.* - Consul private domain * For mesos-dns "mesos" * **domain** - *string. Optional. "marathon.mesos" by default* mesos-dns private domain @@ -72,7 +65,6 @@ Surok working with folowing systems. If system is disabled parameters will be ig Accept values: * "mesos_dns" - mesos-dns * "marathon_api"- Marathon API - * "consul_dns" - Consul * **confd** - *strig. Required.* Path to directory with app config files. * **wait_time** - *int. Required.* diff --git a/docs/ru/surok.configuration.md b/docs/ru/surok.configuration.md index 754bc5d..973721b 100644 --- a/docs/ru/surok.configuration.md +++ b/docs/ru/surok.configuration.md @@ -9,14 +9,6 @@ "force": true, "host": "http://marathon.mesos:8080" }, - "consul": { - "enabled": false, - "domain": "service.dc1.consul" - }, - "mesos":{ - "enabled": true, - "domain": "marathon.mesos" - }, "default_discovery": "mesos_dns", "confd": "/etc/surok/conf.d", "wait_time": 20, @@ -53,9 +45,6 @@ Вкл/выкл. рестарта контейнера * **host** - *string. Не обязательный. По умолчанию "http://marathon.mesos:8080".* Адрес Marathon. - * для Consul "consul" - * **domain** - *string. Обязательный.* - Приватный домен Consul * для mesos DNS "mesos" * **domain** - *string. Не обязательный. По умолчанию "marathon.mesos".* Приватный домен Mesos DNS @@ -70,7 +59,6 @@ Может принимать значения: * "mesos_dns" - Mesos DNS * "marathon_api"- Marathon API - * "consul_dns" - Consul * **confd** - *strig. Обязательный.* Абсолютный путь до директории с конфигурационными файлами приложений. * **wait_time** - *int. Обязательный.* diff --git a/surok.spec b/surok.spec index c7fa158..763b6a1 100644 --- a/surok.spec +++ b/surok.spec @@ -76,7 +76,6 @@ cd /opt/surok && pip3 install -r requriments.txt * Tue Feb 7 2017 Denis Zheleztsov - New major release - Discovery over marathon api -- Basic Consul support * Mon Nov 14 2016 Denis Zheleztsov - - Initial build. diff --git a/surok_fedora.spec b/surok_fedora.spec index f67c8a1..d9cbad6 100644 --- a/surok_fedora.spec +++ b/surok_fedora.spec @@ -57,7 +57,6 @@ rm -rf $RPM_BUILD_ROOT * Tue Feb 7 2017 Denis Zheleztsov - New major release - Discovery over marathon api -- Basic Consul support * Mon Nov 14 2016 Denis Zheleztsov - - Initial build.