Accepting request 223329 from devel:languages:python

Major release, salt-cloud integration and cleaner build sources

OBS-URL: https://build.opensuse.org/request/show/223329
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/salt?expand=0&rev=24

salt-0.17.5.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:36ae196ef87af0ae33e880d1ad593783e2cb102221edda2782071738d595ea3f
-size 1873131

salt-2014.1.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:168dd154a9243b1c853700e61f56e7d6ab5cbc9862fb215ab991e05f46b2a406
+size 2787665

salt-master

@@ -1,136 +0,0 @@
-#!/bin/sh
-#
-# Salt master
-###################################
-
-# LSB header
-
-### BEGIN INIT INFO
-# Provides:          salt-master
-# Required-Start:    $local_fs $remote_fs $network $named $time
-# Should-Start:      $time ypbind smtp
-# Required-Stop:	 $local_fs $remote_fs $network $named $time
-# Should-Stop:       ypbind smtp
-# Default-Start:     3 5
-# Default-Stop:      0 1 2 6
-# Short-Description: Salt master control daemon
-# Description:       This is a daemon that controls the Salt minions.
-### END INIT INFO
-
-
-# chkconfig header
-
-# chkconfig: 345 96 05
-# description:  This is a daemon that controls the Salt minions
-#
-# processname: /usr/bin/salt-master
-
-
-DEBIAN_VERSION=/etc/debian_version
-SUSE_RELEASE=/etc/SuSE-release
-# Source function library.
-if [ -f $DEBIAN_VERSION ]; then
-   break   
-elif [ -f $SUSE_RELEASE -a -r /etc/rc.status ]; then
-    . /etc/rc.status
-else
-    . /etc/rc.d/init.d/functions
-fi
-
-# Default values (can be overridden below)
-SALTMASTER=/usr/bin/salt-master
-PYTHON=/usr/bin/python
-MASTER_ARGS=""
-
-if [ -f /etc/default/salt ]; then
-    . /etc/default/salt
-fi
-
-SERVICE=salt-master
-PROCESS=salt-master
-
-RETVAL=0
-
-start() {
-    echo -n $"Starting salt-master daemon: "
-    if [ -f $SUSE_RELEASE ]; then
-        startproc -f -p /var/run/$SERVICE.pid $SALTMASTER -d $MASTER_ARGS
-        rc_status -v
-    elif [ -e $DEBIAN_VERSION ]; then
-        if [ -f $LOCKFILE ]; then
-            echo -n "already started, lock file found" 
-            RETVAL=1
-        elif $PYTHON $SALTMASTER -d $MASTER_ARGS >& /dev/null; then
-            echo -n "OK"
-            RETVAL=0
-        fi
-    else
-        daemon --check $SERVICE $SALTMASTER -d $MASTER_ARGS
-    fi
-    RETVAL=$?
-    echo
-    return $RETVAL
-}
-
-stop() {
-    echo -n $"Stopping salt-master daemon: "
-    if [ -f $SUSE_RELEASE ]; then
-        killproc -TERM $SALTMASTER
-        rc_status -v
-    elif [ -f $DEBIAN_VERSION ]; then
-        # Added this since Debian's start-stop-daemon doesn't support spawned processes
-        if ps -ef | grep "$PYTHON $SALTMASTER" | grep -v grep | awk '{print $2}' | xargs kill &> /dev/null; then
-            echo -n "OK"
-            RETVAL=0
-        else
-            echo -n "Daemon is not started"
-            RETVAL=1
-        fi
-    else
-        killproc $PROCESS
-    fi
-    RETVAL=$?
-    echo
-}
-
-restart() {
-   stop
-   start
-}
-
-# See how we were called.
-case "$1" in
-    start|stop|restart)
-        $1
-        ;;
-    status)
-        if [ -f $SUSE_RELEASE ]; then
-            echo -n "Checking for service salt-master "
-            checkproc $SALTMASTER
-            rc_status -v
-        elif [ -f $DEBIAN_VERSION ]; then
-            if [ -f $LOCKFILE ]; then
-                RETVAL=0
-                echo "salt-master is running."
-            else
-                RETVAL=1
-                echo "salt-master is stopped."
-            fi
-        else
-            status $PROCESS
-            RETVAL=$?
-        fi
-        ;;
-    condrestart)
-        [ -f $LOCKFILE ] && restart || :
-        ;;
-    reload)
-        echo "can't reload configuration, you have to restart it"
-        RETVAL=$?
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
-        exit 1
-        ;;
-esac
-exit $RETVAL

salt-master.service

@@ -1,10 +0,0 @@
-[Unit]
-Description=The Salt Master Server
-After=syslog.target network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/salt-master
-
-[Install]
-WantedBy=multi-user.target

salt-minion

@@ -1,142 +0,0 @@
-#!/bin/sh
-#
-# Salt minion
-###################################
-
-# LSB header
-
-### BEGIN INIT INFO
-# Provides:          salt-minion
-# Required-Start:    $local_fs $remote_fs $network $named $time
-# Should-Start:      $time ypbind smtp
-# Required-Stop:	 $local_fs $remote_fs $network $named $time
-# Should-Stop:       ypbind smtp
-# Default-Start:     3 5
-# Default-Stop:      0 1 2 6
-# Short-Description: Salt minion daemon
-# Description:       This is the Salt minion daemon that can be controlled by the
-#                    Salt master.
-### END INIT INFO
-
-
-# chkconfig header
-
-# chkconfig: 345 97 04
-# description:  This is the Salt minion daemon that can be controlled by the Salt master.
-#
-# processname: /usr/bin/salt-minion
-
-
-DEBIAN_VERSION=/etc/debian_version
-SUSE_RELEASE=/etc/SuSE-release
-# Source function library.
-if [ -f $DEBIAN_VERSION ]; then
-   break
-elif [ -f $SUSE_RELEASE -a -r /etc/rc.status ]; then
-    . /etc/rc.status
-else
-    . /etc/rc.d/init.d/functions
-fi
-
-# Default values (can be overridden below)
-SALTMINION=/usr/bin/salt-minion
-PYTHON=/usr/bin/python
-MINION_ARGS=""
-
-if [ -f /etc/default/salt ]; then
-    . /etc/default/salt
-fi
-
-SERVICE=salt-minion
-PROCESS=salt-minion
-
-RETVAL=0
-
-start() {
-    echo -n $"Starting salt-minion daemon: "
-    if [ -f $SUSE_RELEASE ]; then
-        startproc -f -p /var/run/$SERVICE.pid $SALTMINION -d $MINION_ARGS
-        rc_status -v
-    elif [ -e $DEBIAN_VERSION ]; then
-        if [ -f $LOCKFILE ]; then
-            echo -n "already started, lock file found"
-            RETVAL=1
-        elif $PYTHON $SALTMINION -d $MINION_ARGS >& /dev/null; then
-            echo -n "OK"
-            RETVAL=0
-        fi
-    else
-        if [ $(pidofproc $PROCESS) ]; then
-	          RETVAL=$?
-	          echo -n "already running"
-        else
-	          daemon --check $SERVICE $SALTMINION -d $MINION_ARGS
-	          RETVAL=$?
-        fi
-    fi
-    echo
-    return $RETVAL
-}
-
-stop() {
-    echo -n $"Stopping salt-minion daemon: "
-    if [ -f $SUSE_RELEASE ]; then
-        killproc -TERM $SALTMINION
-        rc_status -v
-    elif [ -f $DEBIAN_VERSION ]; then
-        # Added this since Debian's start-stop-daemon doesn't support spawned processes
-        if ps -ef | grep "$PYTHON $SALTMINION" | grep -v grep | awk '{print $2}' | xargs kill &> /dev/null; then
-            echo -n "OK"
-            RETVAL=0
-        else
-            echo -n "Daemon is not started"
-            RETVAL=1
-        fi
-    else
-        killproc $PROCESS
-    fi
-    RETVAL=$?
-    echo
-}
-
-restart() {
-   stop
-   start
-}
-
-# See how we were called.
-case "$1" in
-    start|stop|restart)
-        $1
-        ;;
-    status)
-        if [ -f $SUSE_RELEASE ]; then
-            echo -n "Checking for service salt-minion "
-            checkproc $SALTMINION
-            rc_status -v
-        elif [ -f $DEBIAN_VERSION ]; then
-            if [ -f $LOCKFILE ]; then
-                RETVAL=0
-                echo "salt-minion is running."
-            else
-                RETVAL=1
-                echo "salt-minion is stopped."
-            fi
-        else
-            status $PROCESS
-            RETVAL=$?
-        fi
-        ;;
-    condrestart)
-        [ -f $LOCKFILE ] && restart || :
-        ;;
-    reload)
-        echo "can't reload configuration, you have to restart it"
-        RETVAL=$?
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
-        exit 1
-        ;;
-esac
-exit $RETVAL

salt-minion.service

@@ -1,10 +0,0 @@
-[Unit]
-Description=The Salt Minion
-After=syslog.target network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/salt-minion
-
-[Install]
-WantedBy=multi-user.target

salt-syndic

@@ -1,137 +0,0 @@
-#!/bin/sh
-#
-# Salt syndic
-###################################
-
-# LSB header
-
-### BEGIN INIT INFO
-# Provides:          salt-syndic
-# Required-Start:    $local_fs $remote_fs $network $named $time
-# Should-Start:      $time ypbind smtp
-# Required-Stop:	 $local_fs $remote_fs $network $named $time
-# Should-Stop:       ypbind smtp
-# Default-Start:     3 5
-# Default-Stop:      0 1 2 6
-# Short-Description: Salt syndic master-minion passthrough daemon
-# Description:       This is a the Salt syndic daemon that enables Salt master-minion
-#                    remote control passthrough.
-### END INIT INFO
-
-
-# chkconfig header
-
-# chkconfig: - 99 99 
-# description:  This is a the Salt syndic daemon that enables Salt master-minion remote control passthrough.
-#
-# processname: /usr/bin/salt-syndic
-
-
-DEBIAN_VERSION=/etc/debian_version
-SUSE_RELEASE=/etc/SuSE-release
-# Source function library.
-if [ -f $DEBIAN_VERSION ]; then
-   break   
-elif [ -f $SUSE_RELEASE -a -r /etc/rc.status ]; then
-    . /etc/rc.status
-else
-    . /etc/rc.d/init.d/functions
-fi
-
-# Default values (can be overridden below)
-SALTSYNDIC=/usr/bin/salt-syndic
-PYTHON=/usr/bin/python
-SYNDIC_ARGS=""
-
-if [ -f /etc/default/salt ]; then
-    . /etc/default/salt
-fi
-
-SERVICE=salt-syndic
-PROCESS=salt-syndic
-
-RETVAL=0
-
-start() {
-    echo -n $"Starting salt-syndic daemon: "
-    if [ -f $SUSE_RELEASE ]; then
-        startproc -f -p /var/run/$SERVICE.pid $SALTSYNDIC -d $SYNDIC_ARGS
-        rc_status -v
-    elif [ -e $DEBIAN_VERSION ]; then
-        if [ -f $LOCKFILE ]; then
-            echo -n "already started, lock file found" 
-            RETVAL=1
-        elif $PYTHON $SALTSYNDIC -d $SYNDIC_ARGS >& /dev/null; then
-            echo -n "OK"
-            RETVAL=0
-        fi
-    else
-        daemon --check $SERVICE $SALTSYNDIC -d $SYNDIC_ARGS
-    fi
-    RETVAL=$?
-    echo
-    return $RETVAL
-}
-
-stop() {
-    echo -n $"Stopping salt-syndic daemon: "
-    if [ -f $SUSE_RELEASE ]; then
-        killproc -TERM $SALTSYNDIC
-        rc_status -v
-    elif [ -f $DEBIAN_VERSION ]; then
-        # Added this since Debian's start-stop-daemon doesn't support spawned processes
-        if ps -ef | grep "$PYTHON $SALTSYNDIC" | grep -v grep | awk '{print $2}' | xargs kill &> /dev/null; then
-            echo -n "OK"
-            RETVAL=0
-        else
-            echo -n "Daemon is not started"
-            RETVAL=1
-        fi
-    else
-        killproc $PROCESS
-    fi
-    RETVAL=$?
-    echo
-}
-
-restart() {
-   stop
-   start
-}
-
-# See how we were called.
-case "$1" in
-    start|stop|restart)
-        $1
-        ;;
-    status)
-        if [ -f $SUSE_RELEASE ]; then
-            echo -n "Checking for service salt-syndic "
-            checkproc $SALTSYNDIC
-            rc_status -v
-        elif [ -f $DEBIAN_VERSION ]; then
-            if [ -f $LOCKFILE ]; then
-                RETVAL=0
-                echo "salt-syndic is running."
-            else
-                RETVAL=1
-                echo "salt-syndic is stopped."
-            fi
-        else
-            status $PROCESS
-            RETVAL=$?
-        fi
-        ;;
-    condrestart)
-        [ -f $LOCKFILE ] && restart || :
-        ;;
-    reload)
-        echo "can't reload configuration, you have to restart it"
-        RETVAL=$?
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
-        exit 1
-        ;;
-esac
-exit $RETVAL

salt-syndic.service

@@ -1,10 +0,0 @@
-[Unit]
-Description=The Salt Master Server
-After=syslog.target network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/salt-syndic
-
-[Install]
-WantedBy=multi-user.target

salt.SuSEfirewall2

@@ -1,5 +0,0 @@
-## Name: Salt Stack
-## Description: Open ports for Salt Stack
-
-# space separated list of allowed TCP ports
-TCP="4505 4506"

salt.changes

@@ -1,4 +1,52 @@
 -------------------------------------------------------------------
+Thu Feb 20 19:10:20 UTC 2014 - aboe76@gmail.com
+
+- Updated to 2014.1.0 Major Release
+- features:
+  - 2014.1.0 is the first release to follow the new date-based release naming system.
+  - Salt Cloud Merged into Salt
+  - Google Compute Engine support is added to salt-cloud.
+  - Salt Virt released
+  - Docker Integration
+  - IPv6 Support for iptables State/Module
+  - GitFS Improvements
+  - MinionFS
+  - saltenv
+  - Grains Caching
+  - Improved Command Logging Control
+  - PagerDuty Support
+  - Virtual Terminal
+  - Proxy Minions
+- bugfixes:
+  - Fix mount.mounted leaving conflicting entries in fstab (:issue:`7079`)
+  - Fix mysql returner serialization to use json (:issue:`9590`)
+  - Fix ZMQError: Operation cannot be accomplished in current state errors (:issue:`6306`)
+  - Rbenv and ruby improvements
+  - Fix quoting issues with mysql port (:issue:`9568`)
+  - Update mount module/state to support multiple swap partitions (:issue:`9520`)
+  - Fix archive state to work with bsdtar
+  - Clarify logs for minion ID caching
+  - Add numeric revision support to git state (:issue:`9718`)
+  - Update master_uri with master_ip (:issue:`9694`)
+  - Add comment to Debian mod_repo (:issue:`9923`)
+  - Fix potential undefined loop variable in rabbitmq state (:issue:`8703`)
+  - Fix for salt-virt runner to delete key on VM deletion
+  - Fix for salt-run -d to limit results to specific runner or function (:issue:`9975`)
+  - Add tracebacks to jinja renderer when applicable (:issue:`10010`)
+  - Fix parsing in monit module (:issue:`10041`)
+  - Fix highstate output from syndic minions (:issue:`9732`)
+  - Quiet logging when dealing with passwords/hashes (:issue:`10000`)
+  - Fix for multiple remotes in git_pillar (:issue:`9932`)
+  - Fix npm installed command (:issue:`10109`)
+  - Add safeguards for utf8 errors in zcbuildout module
+  - Fix compound commands (:issue:`9746`)
+  - Add systemd notification when master is started
+  - Many doc improvements
+- packaging:
+  - source tarball includes all packaging files in pkg folder.
+  - fixed rpmlint errors about duplicates.
+  - fixed rpmlint errors about non executables scripts.
+-------------------------------------------------------------------
 Sat Jan 25 20:21:12 UTC 2014 - aboe76@gmail.com
 
 - Updated to 0.17.5 a bugfix release for 0.17.0:

salt.logrotate

@@ -1,23 +0,0 @@
-/var/log/salt/master {
-	weekly
-	missingok
-	rotate 7
-	compress
-	notifempty
-}
-
-/var/log/salt/minion {
-	weekly
-	missingok
-	rotate 7
-	compress
-	notifempty
-}
-
-/var/log/salt/key {
-	weekly
-	missingok
-	rotate 7
-	compress
-	notifempty
-}

salt.spec

@@ -17,32 +17,25 @@
 
 
 Name:           salt
-Version:        0.17.5
+Version:        2014.1.0
 Release:        0
 Summary:        A parallel remote execution system
 License:        Apache-2.0
 Group:          System/Monitoring
 Url:            http://saltstack.org/
 Source0:        http://pypi.python.org/packages/source/s/%{name}/%{name}-%{version}.tar.gz
-Source1:        %{name}-master
-Source2:        %{name}-syndic
-Source3:        %{name}-minion
-Source4:        %{name}-master.service
-Source5:        %{name}-syndic.service
-Source6:        %{name}-minion.service
-Source7:        %{name}.logrotate
-Source8:        %{name}.SuSEfirewall2
 
 #for building
+BuildRequires:  fdupes
 BuildRequires:  logrotate
 BuildRequires:  python-Jinja2
 BuildRequires:  python-M2Crypto
 BuildRequires:  python-PyYAML
-BuildRequires:  python-apache-libcloud >= 0.12.1
 BuildRequires:  python-devel
 BuildRequires:  python-msgpack-python
 BuildRequires:  python-pycrypto
 BuildRequires:  python-pyzmq
+BuildRequires:  python-apache-libcloud >= 0.14.0
 
 %if 0%{?sles_version}
 BuildRequires:  python
@@ -83,6 +76,7 @@ BuildArch:      noarch
 Recommends:     python-botocore
 Recommends:     python-netaddr
 
+
 %description
 Salt is a distributed remote execution system used to execute commands and
 query data. It was developed in order to bring the best solutions found in
@@ -91,6 +85,21 @@ malleable. Salt accomplishes this via its ability to handle larger loads of
 information, and not just dozens, but hundreds or even thousands of individual
 servers, handle them quickly and through a simple and manageable interface.
 
+%package cloud
+Summary:        Salt Cloud is a generic cloud provisioning tool
+Group:          System/Monitoring
+Requires:       %{name} = %{version}
+Requires:       python-PyYAML
+Requires:       python-apache-libcloud
+Recommends:     sshpass
+Recommends:     python-botocore
+Recommends:     python-netaddr
+
+%description cloud
+public cloud VM management system
+provision virtual machines on various public clouds via a cleanly
+controlled profile and mapping system.
+
 %package doc
 Summary:        Documentation for salt, a parallel remote execution system
 Group:          Documentation/HTML
@@ -184,17 +193,24 @@ it enables the management of minions over a ssh connection.
 python setup.py build
 
 ## documentation
-cd doc && make html && rm _build/html/.buildinfo && cd _build/html && chmod -R -x+X *
+cd doc && make html && rm _build/html/.buildinfo && rm _build/html/_images/proxy_minions.png && cd _build/html && chmod -R -x+X *
+
 
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%fdupes %{buildroot}%{_prefix}
 
 ## create missing directories
 mkdir -p %{buildroot}%{_sysconfdir}/salt/master.d
 mkdir -p %{buildroot}%{_sysconfdir}/salt/minion.d
+mkdir -p %{buildroot}%{_sysconfdir}/salt/cloud.maps.d
+mkdir -p %{buildroot}%{_sysconfdir}/salt/cloud.profiles.d
+mkdir -p %{buildroot}%{_sysconfdir}/salt/cloud.providers.d
+
 %if 0%{?suse_version} < 1210
 mkdir -p %{buildroot}%{_sysconfdir}/init.d
 %endif
+
 mkdir -p %{buildroot}%{_localstatedir}/log/salt
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d/
 mkdir -p %{buildroot}%{_sbindir}
@@ -203,15 +219,19 @@ mkdir -p %{buildroot}/srv/salt
 mkdir -p %{buildroot}/srv/pillar
 mkdir -p %{buildroot}%{_docdir}/salt
 #
-## install init scripts
+## install init and systemd scripts
 %if 0%{?_unitdir:1}
-install -Dpm 0644  %{SOURCE4} %{buildroot}%_unitdir/salt-master.service
+install -Dpm 0644 pkg/salt-master.service %{buildroot}%_unitdir/salt-master.service
-install -Dpm 0644  %{SOURCE5} %{buildroot}%_unitdir/salt-syndic.service
+install -Dpm 0644 pkg/salt-minion.service %{buildroot}%_unitdir/salt-minion.service
-install -Dpm 0644  %{SOURCE6} %{buildroot}%_unitdir/salt-minion.service
+install -Dpm 0644 pkg/salt-syndic.service %{buildroot}%_unitdir/salt-syndic.service
+ln -s service %{buildroot}%{_sbindir}/rcsalt-master
+ln -s service %{buildroot}%{_sbindir}/rcsalt-syndic
+ln -s service %{buildroot}%{_sbindir}/rcsalt-minion
 %else
-install -Dpm 0755 %{SOURCE1} %{buildroot}%{_initddir}/salt-master
+## install init scripts
-install -Dpm 0755 %{SOURCE2} %{buildroot}%{_initddir}/salt-syndic
+install -Dpm 0755 pkg/suse/salt-master %{buildroot}%{_initddir}/salt-master
-install -Dpm 0755 %{SOURCE3} %{buildroot}%{_initddir}/salt-minion
+install -Dpm 0755 pkg/suse/salt-syndic %{buildroot}%{_initddir}/salt-syndic
+install -Dpm 0755 pkg/suse/salt-minion %{buildroot}%{_initddir}/salt-minion
 ln -sf %{_initddir}/salt-master %{buildroot}%{_sbindir}/rcsalt-master
 ln -sf %{_initddir}/salt-syndic %{buildroot}%{_sbindir}/rcsalt-syndic
 ln -sf %{_initddir}/salt-minion %{buildroot}%{_sbindir}/rcsalt-minion
@@ -221,12 +241,16 @@ ln -sf %{_initddir}/salt-minion %{buildroot}%{_sbindir}/rcsalt-minion
 ## install config files
 install -Dpm 0644 conf/minion %{buildroot}%{_sysconfdir}/salt/minion
 install -Dpm 0644 conf/master %{buildroot}%{_sysconfdir}/salt/master
+install -Dpm 0644 conf/roster %{buildroot}%{_sysconfdir}/salt/roster
+install -Dpm 0644 conf/cloud %{buildroot}%{_sysconfdir}/salt/cloud
+install -Dpm 0644 conf/cloud.profiles %{buildroot}%{_sysconfdir}/salt/cloud.profiles
+install -Dpm 0644 conf/cloud.providers %{buildroot}%{_sysconfdir}/salt/cloud.providers
 #
 ## install logrotate file
-install -Dpm 0644  %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/salt
+install -Dpm 0644  pkg/salt-common.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/salt
 #
 ## install SuSEfirewall2 rules
-install -Dpm 0644  %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/salt
+install -Dpm 0644  pkg/suse/salt.SuSEfirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/salt
 
 %check
 %{__python} setup.py test --runtests-opts=-u
@@ -300,6 +324,17 @@ install -Dpm 0644  %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2
 %restart_on_update salt-minion
 %endif
 
+%files cloud
+%defattr(-,root,root)
+%{_bindir}/salt-cloud
+%{_sysconfdir}/salt/cloud.maps.d
+%{_sysconfdir}/salt/cloud.profiles.d
+%{_sysconfdir}/salt/cloud.providers.d
+%attr(0644, root, root) %config(noreplace) %{_sysconfdir}/salt/cloud
+%attr(0644, root, root) %config(noreplace) %{_sysconfdir}/salt/cloud.profiles
+%attr(0644, root, root) %config(noreplace) %{_sysconfdir}/salt/cloud.providers
+%{_mandir}/man1/salt-cloud.1.*
+
 %files ssh
 %defattr(-,root,root)
 %{_bindir}/salt-ssh
@@ -309,10 +344,10 @@ install -Dpm 0644  %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2
 %defattr(-,root,root)
 %{_bindir}/salt-syndic
 %{_mandir}/man1/salt-syndic.1.gz
+%{_sbindir}/rcsalt-syndic
 %if 0%{?_unitdir:1}
 %_unitdir/salt-syndic.service
 %else
-%{_sbindir}/rcsalt-syndic
 %{_sysconfdir}/init.d/salt-syndic
 %endif
 
@@ -322,10 +357,10 @@ install -Dpm 0644  %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2
 %{_mandir}/man1/salt-minion.1.gz
 %attr(0644, root, root) %config(noreplace) %{_sysconfdir}/salt/minion
 %{_sysconfdir}/salt/minion.d
+%{_sbindir}/rcsalt-minion
 %if 0%{?_unitdir:1}
 %_unitdir/salt-minion.service
 %else
-%{_sbindir}/rcsalt-minion
 %config(noreplace) %{_sysconfdir}/init.d/salt-minion
 %endif
 
@@ -343,13 +378,14 @@ install -Dpm 0644  %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2
 %{_mandir}/man1/salt-run.1.gz
 %config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/salt
 %attr(0644, root, root) %config(noreplace) %{_sysconfdir}/salt/master
+%attr(0644, root, root) %config(noreplace) %{_sysconfdir}/salt/roster
 %{_sysconfdir}/salt/master.d
 %dir /srv/salt
 %dir /srv/pillar
+%{_sbindir}/rcsalt-master
 %if 0%{?_unitdir:1}
 %_unitdir/salt-master.service
 %else
-%{_sbindir}/rcsalt-master
 %config(noreplace) %{_sysconfdir}/init.d/salt-master
 %endif
 
@@ -365,6 +401,7 @@ install -Dpm 0644  %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2
 %{_mandir}/man1/salt-call.1.gz
 %{_mandir}/man7/salt.7.gz
 %config(noreplace) %{_sysconfdir}/logrotate.d/salt
+%attr(755,root,root)%{python_sitelib}/salt/cloud/deploy/*.sh
 %{python_sitelib}/*
 %doc LICENSE AUTHORS README.rst HACKING.rst