From 5737b1c40993f965ac83370d55059e9b417cecec Mon Sep 17 00:00:00 2001 From: Aditya Kulkarni Date: Fri, 16 Sep 2016 16:33:32 -0400 Subject: [PATCH 1/3] Update versionadded and release notes (#36352) --- doc/topics/cloud/vmware.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/topics/cloud/vmware.rst b/doc/topics/cloud/vmware.rst index 1ec2b38e84..7cb08fc690 100644 --- a/doc/topics/cloud/vmware.rst +++ b/doc/topics/cloud/vmware.rst @@ -533,7 +533,7 @@ Example of a minimal profile: Cloning from a Snapshot ======================= -.. versionadded:: Carbon +.. versionadded:: 2016.3.4 Cloning a template works similar to cloning a VM except for the fact that a snapshot number must be provided. From 93269cfb65efd86a247a3c15f236d62fbab7185a Mon Sep 17 00:00:00 2001 From: xiaoanyunfei Date: Sat, 17 Sep 2016 09:53:16 +0800 Subject: [PATCH 2/3] fix salt-api log and pid --- salt/config/__init__.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/salt/config/__init__.py b/salt/config/__init__.py index 7aa47ea34f..f79181d3a0 100644 --- a/salt/config/__init__.py +++ b/salt/config/__init__.py @@ -1384,8 +1384,8 @@ CLOUD_CONFIG_DEFAULTS = { DEFAULT_API_OPTS = { # ----- Salt master settings overridden by Salt-API ---------------------> - 'pidfile': '/var/run/salt-api.pid', - 'logfile': '/var/log/salt/api', + 'api_pidfile': os.path.join(salt.syspaths.PIDFILE_DIR, 'salt-api.pid'), + 'api_logfile': os.path.join(salt.syspaths.LOGS_DIR, 'api'), 'rest_timeout': 300, # <---- Salt master settings overridden by Salt-API ---------------------- } @@ -3280,12 +3280,15 @@ def api_config(path): Read in the salt master config file and add additional configs that need to be stubbed out for salt-api ''' - # Let's grab a copy of salt's master default opts - defaults = DEFAULT_MASTER_OPTS + # Let's grab a copy of salt's master opts + opts = client_config(path, defaults=DEFAULT_MASTER_OPTS) # Let's override them with salt-api's required defaults - defaults.update(DEFAULT_API_OPTS) - - return client_config(path, defaults=defaults) + api_opts = { + 'log_file': opts.get('api_logfile', DEFAULT_API_OPTS['api_logfile']), + 'pidfile': opts.get('api_pidfile', DEFAULT_API_OPTS['api_pidfile']) + } + opts.update(api_opts) + return opts def spm_config(path): From f5d63d93cc946a0fee4eacdcebf9598fa4a856a9 Mon Sep 17 00:00:00 2001 From: Mike Place Date: Sat, 17 Sep 2016 20:53:41 +0900 Subject: [PATCH 3/3] Lint --- salt/config/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/config/__init__.py b/salt/config/__init__.py index f79181d3a0..e0114e77e8 100644 --- a/salt/config/__init__.py +++ b/salt/config/__init__.py @@ -3281,7 +3281,7 @@ def api_config(path): need to be stubbed out for salt-api ''' # Let's grab a copy of salt's master opts - opts = client_config(path, defaults=DEFAULT_MASTER_OPTS) + opts = client_config(path, defaults=DEFAULT_MASTER_OPTS) # Let's override them with salt-api's required defaults api_opts = { 'log_file': opts.get('api_logfile', DEFAULT_API_OPTS['api_logfile']),