Fix salt-ssh, fix version
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 4fa6f4a..1448a15 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -3,26 +3,26 @@
salt-formula
============
-0.0.4
+0.4
-----
- Salt-virt
- Salt API
+- Many fixes and enhancements
-
-0.0.3
+0.3
-----
- High availability
- Cloud control updated
- Virt control added
-0.0.2
+0.2
-----
- Graphing of salt minion states
-0.0.1
+0.1
-----
- Initial state for installing Salt master
diff --git a/README.rst b/README.rst
index 9b0b946..c079750 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,5 @@
-====
+====
Salt
====
diff --git a/debian/changelog b/debian/changelog
index 02a9fbd..b667bad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+salt-formula-salt (0.4) trusty; urgency=medium
+
+ * New upstream version
+
+ -- Filip Pytloun <filip@pytloun.cz> Mon, 22 Aug 2016 14:41:59 +0200
+
salt-formula-salt (0.2) trusty; urgency=medium
* First public release
diff --git a/salt/files/roster b/salt/files/roster
index e59daf2..c2af316 100644
--- a/salt/files/roster
+++ b/salt/files/roster
@@ -1,5 +1,5 @@
{%- from "salt/map.jinja" import master with context %}
-{%- for minion_name, minion in master.get('ssh_minion', {}).items() %}
+{%- for minion_name, minion in master.ssh.get('minion', {}).iteritems() %}
{{ minion_name }}:
host: {{ minion.host }}
user: {{ minion.user }}
@@ -14,3 +14,6 @@
tty: True
{%- endif %}
{%- endfor %}
+{#-
+ vim: syntax=jinja
+-#}
diff --git a/salt/master/init.sls b/salt/master/init.sls
index 378baa2..84c5457 100644
--- a/salt/master/init.sls
+++ b/salt/master/init.sls
@@ -6,9 +6,9 @@
{%- if pillar.salt.master.windows_repo is defined %}
- salt.master.win_repo
{%- endif %}
-{%- if pillar.salt.master.ssh_minion is defined %}
+{%- if pillar.salt.master.ssh is defined %}
- salt.master.ssh
{%- endif %}
{#
- salt.master.orchestrate
-#}
\ No newline at end of file
+#}
diff --git a/tests/pillar/master_ssh_minion_key.sls b/tests/pillar/master_ssh_minion_key.sls
index 09e007e..86d328e 100644
--- a/tests/pillar/master_ssh_minion_key.sls
+++ b/tests/pillar/master_ssh_minion_key.sls
@@ -16,10 +16,11 @@
environment:
prd:
formula: {}
- ssh_minion:
- node01:
- host: 10.0.0.1
- user: saltssh
- sudo: true
- key_file: /path/to/the/key
- port: 22
+ ssh:
+ minion:
+ node01:
+ host: 10.0.0.1
+ user: saltssh
+ sudo: true
+ key_file: /path/to/the/key
+ port: 22
diff --git a/tests/pillar/master_ssh_minion_password.sls b/tests/pillar/master_ssh_minion_password.sls
index 2883f4d..fcb0cd5 100644
--- a/tests/pillar/master_ssh_minion_password.sls
+++ b/tests/pillar/master_ssh_minion_password.sls
@@ -16,10 +16,11 @@
environment:
prd:
formula: {}
- ssh_minion:
- node01:
- host: 10.0.0.1
- user: saltssh
- sudo: true
- password: password
- port: 22
+ ssh:
+ minion:
+ node01:
+ host: 10.0.0.1
+ user: saltssh
+ sudo: true
+ password: password
+ port: 22
diff --git a/tests/pillar/master_ssh_minion_root.sls b/tests/pillar/master_ssh_minion_root.sls
index b076fbc..e12681f 100644
--- a/tests/pillar/master_ssh_minion_root.sls
+++ b/tests/pillar/master_ssh_minion_root.sls
@@ -16,9 +16,10 @@
environment:
prd:
formula: {}
- ssh_minion:
- node01:
- host: 10.0.0.1
- user: root
- password: password
- port: 22
+ ssh:
+ minion:
+ node01:
+ host: 10.0.0.1
+ user: root
+ password: password
+ port: 22