Merge pull request #26 from arbulu89/fetaure/create-0.2.0

Fetaure/create 0.2.0
SUSE · Jun 4, 2019 · ab59d95 · ab59d95
2 parents 42939f6 + bff2aa5
commit ab59d95
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 22 deletions.
diff --git a/salt-shaptools.changes b/salt-shaptools.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jun  4 07:29:24 UTC 2019 - Xabier Arbulu Insausti <[email protected]>
+
+- Create package version 0.2.0 after adding drbd module 
+
 -------------------------------------------------------------------
 Thu May 16 09:03:43 UTC 2019 - Xabier Arbulu Insausti <[email protected]>
 

diff --git a/salt-shaptools.spec b/salt-shaptools.spec
@@ -19,8 +19,8 @@
 # See also http://en.opensuse.org/openSUSE:Specfile_guidelines
 
 Name:           salt-shaptools
-Version:        0.1.0
-Release:        1
+Version:        0.2.0
+Release:        0
 Summary:        Salt modules and states for SAP Applications and SLE-HA components management
 
 License:        Apache-2.0
@@ -51,12 +51,7 @@ cp -R salt/states/drbd.py %{buildroot}/srv/salt/_states
 
 %files
 %defattr(-,root,root,-)
-# %license macro is not available on older releases
-%if 0%{?sle_version} <= 120300
-%doc LICENSE
-%else
 %license LICENSE
-%endif
 %doc README.md
 /srv/salt/_modules
 /srv/salt/_states

diff --git a/salt/__init__.py b/salt/__init__.py
@@ -6,4 +6,4 @@
 :since: 2018-11-30
 """
 
-__version__ = "0.1.0"
+__version__ = "0.2.0"
diff --git a/salt/modules/drbd.py b/salt/modules/drbd.py
@@ -155,7 +155,7 @@ def _add_peernode(line):
 
     peernode = {}
     peernode["peernode name"] = fields[0]
-    #Could be role or connection:
+    # Could be role or connection:
     peernode[fields[1].split(":")[0]] = fields[1].split(":")[1]
     peernode["peer volumes"] = []
 
@@ -349,16 +349,16 @@ def status(name='all'):
 
     cmd = 'drbdadm status {}'.format(name)
 
-    #One possible output: (number of resource/node/vol are flexible)
-    #resource role:Secondary
-    #  volume:0 disk:Inconsistent
-    #  volume:1 disk:Inconsistent
-    #  drbd-node1 role:Primary
-    #    volume:0 replication:SyncTarget peer-disk:UpToDate done:10.17
-    #    volume:1 replication:SyncTarget peer-disk:UpToDate done:74.08
-    #  drbd-node2 role:Secondary
-    #    volume:0 peer-disk:Inconsistent resync-suspended:peer
-    #    volume:1 peer-disk:Inconsistent resync-suspended:peer
+    # One possible output: (number of resource/node/vol are flexible)
+    # resource role:Secondary
+    #   volume:0 disk:Inconsistent
+    #   volume:1 disk:Inconsistent
+    #   drbd-node1 role:Primary
+    #     volume:0 replication:SyncTarget peer-disk:UpToDate done:10.17
+    #     volume:1 replication:SyncTarget peer-disk:UpToDate done:74.08
+    #   drbd-node2 role:Secondary
+    #     volume:0 peer-disk:Inconsistent resync-suspended:peer
+    #     volume:1 peer-disk:Inconsistent resync-suspended:peer
 
     result = __salt__['cmd.run_all'](cmd)
     if result['retcode'] != 0:

diff --git a/salt/states/drbd.py b/salt/states/drbd.py
@@ -38,10 +38,10 @@
 '''
 from __future__ import absolute_import, print_function, unicode_literals
 import logging
+import time
 
 from salt.exceptions import CommandExecutionError
 from salt.ext import six
-import time
 
 LOGGER = logging.getLogger(__name__)
 

diff --git a/salt/states/hanamod.py b/salt/states/hanamod.py
@@ -67,8 +67,8 @@
 __virtualname__ = 'hana'
 
 TMP_CONFIG_FILE = '/tmp/hana.conf'
-INI_PARAM_PRELOAD_CS = {'section_name':'system_replication', 'parameter_name':'preload_column_tables'}
-INI_PARAM_GAL = {'section_name':'memorymanager', 'parameter_name':'global_allocation_limit'}
+INI_PARAM_PRELOAD_CS = {'section_name': 'system_replication', 'parameter_name': 'preload_column_tables'}
+INI_PARAM_GAL = {'section_name': 'memorymanager', 'parameter_name': 'global_allocation_limit'}
 
 
 def __virtual__():  # pragma: no cover