Merge remote-tracking branch 'upstream/develop' into develop

rsmekala · May 22, 2018 · 77ab7d4 · 77ab7d4
2 parents 8d280a6 + 4da4560
commit 77ab7d4
Show file tree

Hide file tree

Showing 1,057 changed files with 226,590 additions and 140,741 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -9,52 +9,66 @@
 # See https://help.github.com/articles/about-codeowners/
 # for more info about the CODEOWNERS file
 
+# This file uses an fnmatch-style matching pattern.
+
 # Team Boto
 salt/**/*boto*                      @saltstack/team-boto
 
 # Team Core
-salt/auth/                          @saltstack/team-core
-salt/cache/                         @saltstack/team-core
-salt/cli/                           @saltstack/team-core
+salt/auth/*                         @saltstack/team-core
+salt/cache/*                        @saltstack/team-core
+salt/cli/*                          @saltstack/team-core
 salt/client/*                       @saltstack/team-core
 salt/config/*                       @saltstack/team-core
-salt/daemons/                       @saltstack/team-core
-salt/pillar/                        @saltstack/team-core
+salt/daemons/*                      @saltstack/team-core
+salt/pillar/*                       @saltstack/team-core
 salt/loader.py                      @saltstack/team-core
 salt/payload.py                     @saltstack/team-core
 salt/**/master*                     @saltstack/team-core
 salt/**/minion*                     @saltstack/team-core
 
 # Team Cloud
-salt/cloud/                         @saltstack/team-cloud
-salt/utils/openstack/               @saltstack/team-cloud
+salt/cloud/*                        @saltstack/team-cloud
+salt/utils/openstack/*              @saltstack/team-cloud
 salt/utils/aws.py                   @saltstack/team-cloud
 salt/**/*cloud*                     @saltstack/team-cloud
 
 # Team NetAPI
 salt/cli/api.py                     @saltstack/team-netapi
 salt/client/netapi.py               @saltstack/team-netapi
-salt/netapi/                        @saltstack/team-netapi
+salt/netapi/*                       @saltstack/team-netapi
 
 # Team Network
-salt/proxy/                         @saltstack/team-proxy
+salt/proxy/*                        @saltstack/team-proxy
 
 # Team SPM
 salt/cli/spm.py                     @saltstack/team-spm
-salt/spm/                           @saltstack/team-spm
+salt/spm/*                          @saltstack/team-spm
 
 # Team SSH
 salt/cli/ssh.py                     @saltstack/team-ssh
-salt/client/ssh/                    @saltstack/team-ssh
+salt/client/ssh/*                   @saltstack/team-ssh
 salt/runners/ssh.py                 @saltstack/team-ssh
 salt/**/thin.py                     @saltstack/team-ssh
 
 # Team State
 salt/state.py                       @saltstack/team-state
 
+# Team SUSE
+salt/**/*btrfs*                     @saltstack/team-suse
+salt/**/*kubernetes*                @saltstack/team-suse
+salt/**/*pkg*                       @saltstack/team-suse
+salt/**/*snapper*                   @saltstack/team-suse
+salt/**/*xfs*                       @saltstack/team-suse
+salt/**/*zypper*                    @saltstack/team-suse
+
 # Team Transport
-salt/transport/                     @saltstack/team-transport
+salt/transport/*                    @saltstack/team-transport
 salt/utils/zeromq.py                @saltstack/team-transport
 
 # Team Windows
-salt/**/*win*                       @saltstack/team-windows
+salt/*/*win*                        @saltstack/team-windows
+salt/modules/reg.py                 @saltstack/team-windows
+salt/states/reg.py                  @saltstack/team-windows
+tests/*/*win*                       @saltstack/team-windows
+tests/*/test_reg.py                 @saltstack/team-windows
diff --git a/.github/stale.yml b/.github/stale.yml
@@ -1,8 +1,8 @@
 # Probot Stale configuration file
 
 # Number of days of inactivity before an issue becomes stale
-# 810 is approximately 2 years and 2 months
-daysUntilStale: 800
+# 710 is approximately 1 year and 11 months
+daysUntilStale: 710
 
 # Number of days of inactivity before a stale issue is closed
 daysUntilClose: 7

diff --git a/.kitchen.yml b/.kitchen.yml
@@ -1,6 +1,6 @@
 ---
-<% vagrant = system('which vagrant 2>/dev/null >/dev/null') %>
-<% version = '2017.7.1' %>
+<% vagrant = system('gem list -i kitchen-vagrant 2>/dev/null >/dev/null') %>
+<% version = '2017.7.4' %>
 <% platformsfile = ENV['SALT_KITCHEN_PLATFORMS'] || '.kitchen/platforms.yml' %>
 <% driverfile = ENV['SALT_KITCHEN_DRIVER'] || '.kitchen/driver.yml' %>
 <% verifierfile = ENV['SALT_KITCHEN_VERIFIER'] || '.kitchen/verifier.yml' %>
@@ -31,31 +31,49 @@ provisioner:
   salt_version: latest
   salt_bootstrap_url: https://bootstrap.saltstack.com
   salt_bootstrap_options: -X -p rsync stable <%= version %>
-  log_level: info
+  log_level: debug
   sudo: true
   require_chef: false
+  retry_on_exit_code:
+    - 139
+  max_retries: 2
   remote_states:
     name: git://github.com/saltstack/salt-jenkins.git
-    branch: oxygen
+    branch: master
     repo: git
     testingdir: /testing
   salt_copy_filter:
     - .bundle
-    - .git
-    - .gitignore
     - .kitchen
     - .kitchen.yml
+    - artifacts
     - Gemfile
     - Gemfile.lock
     - README.rst
     - .travis.yml
+    - '*.pyc'
+    - __pycache__
   state_top:
     base:
       "os:Windows":
         - match: grain
         - prep_windows
       "*":
         - git.salt
+  pillars:
+    top.sls:
+      base:
+        "*":
+          - jenkins
+        "os:Windows":
+          - match: grain
+          - windows
+    jenkins.sls:
+      testing_dir: "{{salt.config.get('root_dir')|replace('\\', '\\\\')}}/testing"
+      clone_repo: false
+      salttesting_namespec: salttesting==2017.6.1
+    windows.sls:
+      virtualenv_path: 'c:\Python27\Scripts\pip.exe'
 <% if File.exists?(platformsfile) %>
 <%= ERB.new(File.read(platformsfile)).result %>
 <% else %>
@@ -76,12 +94,9 @@ platforms:
         - yum install -y upstart
     provisioner:
       salt_bootstrap_options: -P -p rsync -y -x python2.7 -X git v<%= version %> >/dev/null
-  - name: ubuntu-rolling
+  - name: ubuntu-18.04
     driver_config:
-      image: ubuntu:rolling
       run_command: /lib/systemd/systemd
-    provisioner:
-      salt_bootstrap_url: https://raw.githubusercontent.com/saltstack/salt-bootstrap/develop/bootstrap-salt.sh
   - name: ubuntu-16.04
     driver_config:
       run_command: /lib/systemd/systemd
@@ -124,16 +139,22 @@ platforms:
       box: mwrock/Windows2012R2
       name: vagrant
       gui: true
-      customize:
-        cpus: 4
-        memory: 8192
     transport:
       name: winrm
-      username: Vagrant
-      password: vagrant
+      username: Administrator
+      password: Pass@word1
     provisioner:
+      init_environment: |
+        Clear-Host
+        $AddedLocation ="c:\salt;c:\salt\bin\Scripts"
+        $Reg = "Registry::HKLM\System\CurrentControlSet\Control\Session Manager\Environment"
+        $OldPath = (Get-ItemProperty -Path $Reg -Name PATH).Path
+        $NewPath= $OldPath + ";" + $AddedLocation
+        Set-ItemProperty -Path $Reg -Value $NewPath -Name PATH
+        reg add "hklm\system\currentcontrolset\control\session manager\memory management" /v pagingfiles /t reg_multi_sz /d "d:\pagefile.sys 4096 8192" /f
+        winrm set winrm/config/winrs '@{MaxMemoryPerShellMB="5000"}'
       salt_bootstrap_url: https://raw.githubusercontent.com/saltstack/salt-bootstrap/develop/bootstrap-salt.ps1
-      salt_bootstrap_options: -version <%= version %>
+      salt_bootstrap_options: ''
     verifier:
       windows: true
       types:
@@ -157,12 +178,25 @@ platforms:
     provisioner:
       salt_bootstrap_url: https://raw.githubusercontent.com/saltstack/salt-bootstrap/develop/bootstrap-salt.ps1
       salt_bootstrap_options: -version <%= version %>
+      init_environment: |
+        Clear-Host
+        $AddedLocation ="c:\salt;c:\salt\bin\Scripts"
+        $Reg = "Registry::HKLM\System\CurrentControlSet\Control\Session Manager\Environment"
+        $OldPath = (Get-ItemProperty -Path $Reg -Name PATH).Path
+        $NewPath= $OldPath + ";" + $AddedLocation
+        Set-ItemProperty -Path $Reg -Value $NewPath -Name PATH
+        reg add "hklm\system\currentcontrolset\control\session manager\memory management" /v pagingfiles /t reg_multi_sz /d "d:\pagefile.sys 4096 8192" /f
+        winrm set winrm/config/winrs '@{MaxMemoryPerShellMB="5000"}'
+      salt_bootstrap_url: https://raw.githubusercontent.com/saltstack/salt-bootstrap/develop/bootstrap-salt.ps1
+      salt_bootstrap_options: ''
     verifier:
       windows: true
       types:
         - unit
       coverage_xml: false
+      xml: /tmp/xml-unittests-output/
       save:
+        /tmp/xml-unittests-output/: artifacts/
         $env:TEMP/salt-runtests.log: artifacts/logs/salt-runtests.log
         /salt/var/log/salt/minion: artifacts/logs/minion
 <% end %>
@@ -171,21 +205,6 @@ suites:
   - name: py2
     verifier:
       python_bin: python2.7
-    provisioner:
-      pillars:
-        top.sls:
-          base:
-            "*":
-              - jenkins
-            "os:Windows":
-              - match: grain
-              - windows
-        jenkins.sls:
-          testing_dir: "{{salt.config.get('root_dir')|replace('\\', '\\\\')}}/testing"
-          clone_repo: false
-          salttesting_namespec: salttesting==2017.6.1
-        windows.sls:
-          virtualenv_path: 'c:\Python27\Scripts\pip.exe'
   - name: py3
     excludes:
       - centos-6
@@ -194,18 +213,8 @@ suites:
       python_bin: python3
     provisioner:
       pillars:
-        top.sls:
-          base:
-            "*":
-              - jenkins
-            "os:Windows":
-              - match: grain
-              - windows
         jenkins.sls:
-          testing_dir: "{{salt.config.get('root_dir')|replace('\\', '\\\\')}}/testing"
-          clone_repo: false
           py3: true
-          salttesting_namespec: salttesting==2017.6.1
         windows.sls:
           virtualenv_path: 'c:\Python35\Scripts\pip.exe'
 
@@ -215,7 +224,6 @@ suites:
 verifier:
   name: runtests
   sudo: true
-  verbose: true
   run_destructive: true
   transport: zeromq
   types:

diff --git a/.testing.pylintrc b/.testing.pylintrc
@@ -29,6 +29,25 @@ load-plugins=saltpylint.pep8,
 # Don't bump this values on PyLint 1.4.0 - Know bug that ignores the passed --rcfile
 jobs=1
 
+# List of blacklisted functions and suggested replacements
+#
+# NOTE: This pylint check will infer the full name of the function by walking
+# back up from the function name to the parent, to the parent's parent, etc.,
+# and this means that functions which come from platform-specific modules need
+# to be referenced using name of the module from which the function was
+# imported. This happens a lot in the os and os.path modules. Functions from
+# os.path should be defined using posixpath.funcname and ntpath.funcname, while
+# functions from os should be defined using posix.funcname and nt.funcname.
+#
+# When defining a blacklisted function, the format is:
+#
+#   <func_name>=<suggested_replacement>
+#
+# The replacement text will be included in the alert message.
+#
+blacklisted-functions=posix.umask=salt.utils.files.set_umask or get_umask,
+  nt.umask=salt.utils.files.set_umask or get_umask
+
 # Allow loading of arbitrary C extensions. Extensions are imported into the
 # active Python interpreter and may run arbitrary code.
 unsafe-load-any-extension=no

diff --git a/Gemfile b/Gemfile
@@ -12,7 +12,7 @@ group :docker do
 end
 
 group :opennebula do
-  gem 'kitchen-opennebula', :git => 'https://github.com/gtmanfred/kitchen-opennebula.git'
+  gem 'kitchen-opennebula', '>=0.2.3'
   gem 'xmlrpc'
 end
 

diff --git a/conf/cloud b/conf/cloud
@@ -26,7 +26,7 @@
 
 
 # The level of messages to send to the console.
-# One of 'garbage', 'trace', 'debug', info', 'warning', 'error', 'critical'.
+# One of 'garbage', 'trace', 'debug', 'info', 'warning', 'error', 'critical'.
 #
 # The following log levels are considered INSECURE and may log sensitive data:
 # ['garbage', 'trace', 'debug']

diff --git a/conf/cloud.providers b/conf/cloud.providers
@@ -84,3 +84,6 @@
 
 #my-saltify-config:
 #  driver: saltify
+
+#my-scaleway-config:
+#  driver: scaleway
diff --git a/conf/cloud.providers.d/scaleway.conf b/conf/cloud.providers.d/scaleway.conf
@@ -0,0 +1,2 @@
+#my-scaleway-config:
+#  driver: scaleway
diff --git a/conf/master b/conf/master
@@ -176,6 +176,14 @@
 # master event bus. The value is expressed in bytes.
 #max_event_size: 1048576
 
+# Windows platforms lack posix IPC and must rely on slower TCP based inter-
+# process communications. Set ipc_mode to 'tcp' on such systems
+#ipc_mode: ipc
+
+# Overwrite the default tcp ports used by the minion when ipc_mode is set to 'tcp'
+#tcp_master_pub_port: 4510
+#tcp_master_pull_port: 4511
+
 # By default, the master AES key rotates every 24 hours. The next command
 # following a key rotation will trigger a key refresh from the minion which may
 # result in minions which do not respond to the first command after a key refresh.
@@ -577,7 +585,7 @@
 #external_nodes: None
 
 # The renderer to use on the minions to render the state data
-#renderer: yaml_jinja
+#renderer: jinja|yaml
 
 # Default Jinja environment options for all templates except sls templates
 #jinja_env:
@@ -587,8 +595,8 @@
 #  variable_end_string: '}}'
 #  comment_start_string: '{#'
 #  comment_end_string: '#}'
-#  line_statement_prefix: 
-#  line_comment_prefix: 
+#  line_statement_prefix:
+#  line_comment_prefix:
 #  trim_blocks: False
 #  lstrip_blocks: False
 #  newline_sequence: '\n'
@@ -602,8 +610,8 @@
 #  variable_end_string: '}}'
 #  comment_start_string: '{#'
 #  comment_end_string: '#}'
-#  line_statement_prefix: 
-#  line_comment_prefix: 
+#  line_statement_prefix:
+#  line_comment_prefix:
 #  trim_blocks: False
 #  lstrip_blocks: False
 #  newline_sequence: '\n'
@@ -1157,7 +1165,7 @@
 #log_level: warning
 
 # The level of messages to send to the log file.
-# One of 'garbage', 'trace', 'debug', info', 'warning', 'error', 'critical'.
+# One of 'garbage', 'trace', 'debug', 'info', 'warning', 'error', 'critical'.
 # If using 'log_granular_levels' this must be set to the highest desired level.
 #log_level_logfile: warning