commit f26166c13dd421b181989160d1b4b69f08dd696a
author Aleš Komárek <github@newt.cz> Wed Mar 08 11:55:57 2017 +0100
committer GitHub <noreply@github.com> Wed Mar 08 11:55:57 2017 +0100
tree 74a770018fbebfd8d019cff394ece09702a73bf6
parent c1f604385ee1d4f51b7363000f95f054c0bb7d0f
parent 33cd256ad1d921fe6b98da1923b006db0ba5515e

Merge pull request #152 from tomkukral/sal-api-port

change salt-api default port to 6969

CHANGELOG.rst

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
new file mode 100644
index 0000000..4fd75aa
--- /dev/null
+++ b/CHANGELOG.rst
@@ -0,0 +1,6 @@
+Changelog
+==========
+
+
+* 2017-03-03 Tomáš Kukrál <tkukral@mirantis.com}
+- change default Salt-API port to 6969

salt/master/api.yml

diff --git a/salt/master/api.yml b/salt/master/api.yml
index 1c0c3fb..b5ede2f 100644
--- a/salt/master/api.yml
+++ b/salt/master/api.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    salt_master_api_port: 8000
+    salt_master_api_port: 6969
     salt_master_api_permissions:
     - '.*'
     - '@local'