Align patches

* patch is merged into oslo-templates
* rocky repo key name is made as for others
* jinja package is updated to fix incorrect quoted value
  [https://github.com/saltstack/salt/issues/46594]

Change-Id: Ia6359cf89579b4d892ae40c4d087168edcd86ebb
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

4 files changed, 44 insertions, 116 deletions

diff --git a/mcp/patches/reclass-system-salt-model/0003-Define-keystone-domain-for-heat-stack.patch b/mcp/patches/reclass-system-salt-model/0003-Define-keystone-domain-for-heat-stack.patch
new file mode 100644
index 000000000..1da54c6ce
--- /dev/null
+++ b/mcp/patches/reclass-system-salt-model/0003-Define-keystone-domain-for-heat-stack.patch
@@ -0,0 +1,44 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2019 Mirantis Inc., Enea AB and others.
+:
+: All rights reserved. This program and the accompanying materials
+: are made available under the terms of the Apache License, Version 2.0
+: which accompanies this distribution, and is available at
+: http://www.apache.org/licenses/LICENSE-2.0
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+From: Michael Polenchuk <mpolenchuk@mirantis.com>
+Date: Wed, 9 Jan 2019 15:36:36 +0400
+Subject: [PATCH] Define keystone domain for heat stack
+
+Create domain for heat stack user by keystone state,
+previously it was doing by heat-keystone-setup-domain script.
+
+diff --git a/keystone/client/v3/service/heat.yml b/keystone/client/v3/service/heat.yml
+index 6c45bfe2..f1d500c7 100644
+--- a/keystone/client/v3/service/heat.yml
++++ b/keystone/client/v3/service/heat.yml
+@@ -6,6 +6,9 @@ parameters:
+     client:
+       resources:
+         v3:
++          domains:
++            heat_user_domain:
++              description: 'Contains users and projects created by heat'
+           roles:
+             heat_stack_user:
+               name: heat_stack_user
+@@ -21,6 +24,14 @@ parameters:
+                 service_admin:
+                   name: admin
+                   project_id: service
++            heat_domain_admin:
++              password: ${_param:heat_domain_admin_password}
++              email: ${_param:admin_email}
++              roles:
++                heat_stack_admin:
++                  name: admin
++                  role_domain_id: heat_user_domain
++                  domain_id: heat_user_domain
+           services:
+             heat:
+               type: orchestration
diff --git a/mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Fix-archive-key-URL.patch b/mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Fix-archive-key-URL.patch
deleted file mode 100644
index dbb127406..000000000
--- a/mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Fix-archive-key-URL.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Thu, 7 Jun 2018 21:19:07 +0200
-Subject: [PATCH] linux.system.repo: Fix archive key URL
-
-While at it, fix keystone specifics for Rocky.
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- keystone/client/os_client_config/admin_identity.yml |  2 +-
- keystone/client/v3/service/heat.yml                 | 11 +++++++++++
- linux/system/repo/mcp/mirror/v1/openstack.yml       |  2 +-
- 3 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/keystone/client/os_client_config/admin_identity.yml b/keystone/client/os_client_config/admin_identity.yml
-index d31db498..f6b6e5d6 100644
---- a/keystone/client/os_client_config/admin_identity.yml
-+++ b/keystone/client/os_client_config/admin_identity.yml
-@@ -9,7 +9,7 @@ parameters:
-               clouds:
-                 admin_identity:
-                   region_name: ${_param:openstack_region}
--                  identity_api_version: '3'
-+                  identity_api_version: 3
-                   interface: 'internal'
-                   auth:
-                     username: 'admin'
-diff --git a/keystone/client/v3/service/heat.yml b/keystone/client/v3/service/heat.yml
-index 6c45bfe2..f1d500c7 100644
---- a/keystone/client/v3/service/heat.yml
-+++ b/keystone/client/v3/service/heat.yml
-@@ -6,6 +6,9 @@ parameters:
-     client:
-       resources:
-         v3:
-+          domains:
-+            heat_user_domain:
-+              description: 'Contains users and projects created by heat'
-           roles:
-             heat_stack_user:
-               name: heat_stack_user
-@@ -21,6 +24,14 @@ parameters:
-                 service_admin:
-                   name: admin
-                   project_id: service
-+            heat_domain_admin:
-+              password: ${_param:heat_domain_admin_password}
-+              email: ${_param:admin_email}
-+              roles:
-+                heat_stack_admin:
-+                  name: admin
-+                  role_domain_id: heat_user_domain
-+                  domain_id: heat_user_domain
-           services:
-             heat:
-               type: orchestration
-diff --git a/linux/system/repo/mcp/mirror/v1/openstack.yml b/linux/system/repo/mcp/mirror/v1/openstack.yml
-index a4a369b2..f7048f74 100644
---- a/linux/system/repo/mcp/mirror/v1/openstack.yml
-+++ b/linux/system/repo/mcp/mirror/v1/openstack.yml
-@@ -9,7 +9,7 @@ parameters:
-           source: "deb http://mirror.mirantis.com/${_param:apt_mk_version}/openstack-${_param:openstack_version}/${_param:linux_system_codename} ${_param:linux_system_codename} main"
-           architectures: ${_param:linux_system_architecture}
-           clean_file: true
--          key_url: https://mirror.mirantis.com/${_param:apt_mk_version}/openstack-${_param:openstack_version}/${_param:linux_system_codename}/archive-${_param:openstack_version}.key
-+          key_url: https://mirror.mirantis.com/${_param:apt_mk_version}/openstack-${_param:openstack_version}/${_param:linux_system_codename}/archive-openstack-${_param:openstack_version}.key
-           pin:
-           - pin: 'release o=Mirantis'
-             priority: 1100
diff --git a/mcp/patches/salt-formula-oslo-templates/0001-Handle-lock_path-option-of-oslo.concurrency.patch b/mcp/patches/salt-formula-oslo-templates/0001-Handle-lock_path-option-of-oslo.concurrency.patch
deleted file mode 100644
index 61b19c30d..000000000
--- a/mcp/patches/salt-formula-oslo-templates/0001-Handle-lock_path-option-of-oslo.concurrency.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Michael Polenchuk <mpolenchuk@mirantis.com>
-Date: Tue, 18 Dec 2018 11:59:51 +0400
-Subject: [PATCH] Handle lock_path option of oslo.concurrency
-
-Neutron agents requires lock_path option to be set
-to perform concurrency actions.
-
-Change-Id: If0a297fc2bb6f01bb8be9b31237f8e135d254a14
-Related-Prod: PROD-23722
-
-diff --git a/oslo_templates/files/queens/oslo/_concurrency.conf b/oslo_templates/files/queens/oslo/_concurrency.conf
-index 856ae0d..cd6b7ed 100644
---- a/oslo_templates/files/queens/oslo/_concurrency.conf
-+++ b/oslo_templates/files/queens/oslo/_concurrency.conf
-@@ -16,3 +16,6 @@ disable_process_locking = {{ _data.disable_process_locking }}
- # tempfile.gettempdir function to find a suitable location. If
- # external locks are used, a lock path must be set. (string value)
- #lock_path = /tmp
-+{%- if _data.lock_path is defined %}
-+lock_path = {{ _data.lock_path }}
-+{%- endif %}
-diff --git a/oslo_templates/files/rocky/oslo/_concurrency.conf b/oslo_templates/files/rocky/oslo/_concurrency.conf
-index 856ae0d..cd6b7ed 100644
---- a/oslo_templates/files/rocky/oslo/_concurrency.conf
-+++ b/oslo_templates/files/rocky/oslo/_concurrency.conf
-@@ -16,3 +16,6 @@ disable_process_locking = {{ _data.disable_process_locking }}
- # tempfile.gettempdir function to find a suitable location. If
- # external locks are used, a lock path must be set. (string value)
- #lock_path = /tmp
-+{%- if _data.lock_path is defined %}
-+lock_path = {{ _data.lock_path }}
-+{%- endif %}
diff --git a/mcp/salt-formulas/salt-formula-oslo-templates b/mcp/salt-formulas/salt-formula-oslo-templates
-Subproject 47ecec73a582f2f0634b297c05b97077fac300e
+Subproject 779d20aebfc5ed1fe1db645fd71a6456ed3550c