diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-03-12 19:41:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-12 19:41:01 +0000 |
| commit | 8bd6edd252ca5e8f62ef24ae27fe4c8123ec82f7 (patch) | |
| tree | da43bb665d430a3048cd57c8372f7f87fa874601 /mcp/patches/0008-Handle-extra-environment-variables.patch | |
| parent | a12266c64987be03998ee9ad663a691fd8b58134 (diff) | |
| parent | 5e182cdd5f114989f0425abae089cf5b7de065ea (diff) | |
Merge "Set volume_device_name variable"
Diffstat (limited to 'mcp/patches/0008-Handle-extra-environment-variables.patch')
| -rw-r--r-- | mcp/patches/0008-Handle-extra-environment-variables.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/mcp/patches/0008-Handle-extra-environment-variables.patch b/mcp/patches/0008-Handle-extra-environment-variables.patch new file mode 100644 index 000000000..8df3227f2 --- /dev/null +++ b/mcp/patches/0008-Handle-extra-environment-variables.patch @@ -0,0 +1,25 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: 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: Mon, 12 Mar 2018 17:43:09 +0400 +Subject: [PATCH] Handle extra environment variables + +Change-Id: Ieae46ac65041630759c82238a8a5ce0535c454b2 + +diff --git a/keystone/files/keystonercv3 b/keystone/files/keystonercv3 +index 1b7f378..984c8a2 100644 +--- a/keystone/files/keystonercv3 ++++ b/keystone/files/keystonercv3 +@@ -11,3 +11,6 @@ export OS_REGION_NAME={{ server.region }} + export OS_INTERFACE=internal + export OS_ENDPOINT_TYPE="internal" + export OS_CACERT="{{ server.cacert }}" ++{%- for opt, value in server.get('openrc_extra', {}).iteritems() %} ++{{ "export %s=%s"|format(opt|upper, value) }} ++{%- endfor %} |