From af47291cd0809291aaafac0adacc48ac0f5a55f1 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 22 Dec 2018 21:55:44 +0200 Subject: [patch] Fix whitespace at EOL `make patches-export` trims trailing whitespace from patch file, bring it back to prevent issues with `patches-import`. Change-Id: Ie9fe31f4480164ce19d3ccd47c2050e28382410a Signed-off-by: Alexandru Avadanii --- mcp/patches/salt-formula-cinder/0001-Support-rocky-version.patch | 2 +- mcp/patches/salt-formula-heat/0001-Support-rocky-version.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'mcp') diff --git a/mcp/patches/salt-formula-cinder/0001-Support-rocky-version.patch b/mcp/patches/salt-formula-cinder/0001-Support-rocky-version.patch index abbad47d8..39b146495 100644 --- a/mcp/patches/salt-formula-cinder/0001-Support-rocky-version.patch +++ b/mcp/patches/salt-formula-cinder/0001-Support-rocky-version.patch @@ -30,7 +30,7 @@ index f103550..33e062f 100644 {#- Therefore if api_version is not defined and OpenStack version is mitaka or newton use v2.0. #} {%- if 'api_version' in identity %} {%- set keystone_api_version = identity.get('api_version') %} --{%- else %} +-{%- else %} +{%- else %} {%- if 'version' in controller and controller.version in ['mitaka', 'newton'] %} {%- set keystone_api_version = 'v2.0' %} diff --git a/mcp/patches/salt-formula-heat/0001-Support-rocky-version.patch b/mcp/patches/salt-formula-heat/0001-Support-rocky-version.patch index 3998ab3dd..62fe935fe 100644 --- a/mcp/patches/salt-formula-heat/0001-Support-rocky-version.patch +++ b/mcp/patches/salt-formula-heat/0001-Support-rocky-version.patch @@ -36,7 +36,7 @@ index f5b4b13..6b90880 100644 {%- endif %} # Maximum raw byte size of any template. (integer value) --max_template_size = {{ server.get('max_template_size', 5440000) }} +-max_template_size = {{ server.get('max_template_size', 5440000) }} +max_template_size = {{ server.get('max_template_size', 5440000) }} # Maximum depth allowed when using nested stacks. (integer value) -- cgit 1.2.3-korg