From ae8998f36a92484a13b5f23f63102494634ae58b Mon Sep 17 00:00:00 2001
From: Pranali Deore <pdeore@redhat.com>
Date: Wed, 19 Dec 2018 15:18:16 +0530
Subject: [PATCH] Enable image inject metadata properties & user roles to be
 ignored

Adding GlanceInjectMetadataProperties & GlanceIgnoreUserRoles to
inject metadata properties to the image with specific user roles
to be ignored for injecting metadata properties in the image.

Depends-on: I02482dff7b1412d6254ce82d80257ce26c23430d
Change-Id: Ie6504f73fd5f7492389d6c55a89c66b8ca568ef7
---
 deployment/glance/glance-api-container-puppet.yaml     | 10 ++++++++++
 ...ge-inject-metadata-properties-72cdc946748e9b1b.yaml |  7 +++++++
 2 files changed, 17 insertions(+)
 create mode 100644 releasenotes/notes/enabled-image-inject-metadata-properties-72cdc946748e9b1b.yaml

diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml
index ff7a360d58..7416368c9e 100644
--- a/deployment/glance/glance-api-container-puppet.yaml
+++ b/deployment/glance/glance-api-container-puppet.yaml
@@ -116,6 +116,14 @@ parameters:
     default: 'raw'
     description: Desired output format for image conversion plugin.
     type: string
+  GlanceInjectMetadataProperties:
+    default: ''
+    description: Metadata properties to be injected in image.
+    type: comma_delimited_list
+  GlanceIgnoreUserRoles:
+    default: 'admin'
+    description: List of user roles to be ignored for injecting image metadata properties.
+    type: comma_delimited_list
   GlanceEnabledImportMethods:
     default: 'web-download'
     description: >
@@ -310,6 +318,8 @@ outputs:
             glance::api::node_staging_uri: {get_param: GlanceNodeStagingUri}
             glance::api::image_import_plugins: {get_param: GlanceImageImportPlugins}
             glance::api::image_conversion_output_format: {get_param: GlanceImageConversionOutputFormat}
+            glance::api::inject_metadata_properties: {get_param: GlanceInjectMetadataProperties}
+            glance::api::ignore_user_roles: {get_param: GlanceIgnoreUserRoles}
             # NOTE: bind IP is found in hiera replacing the network name with the
             # local node IP for the given network; replacement examples
             # (eg. for internal_api):
diff --git a/releasenotes/notes/enabled-image-inject-metadata-properties-72cdc946748e9b1b.yaml b/releasenotes/notes/enabled-image-inject-metadata-properties-72cdc946748e9b1b.yaml
new file mode 100644
index 0000000000..5e0bd40dc1
--- /dev/null
+++ b/releasenotes/notes/enabled-image-inject-metadata-properties-72cdc946748e9b1b.yaml
@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    Add new parameter 'GlanceInjectMetadataProperties', to add metadata
+    properties to be injected in image.
+    Add new parameter 'GlanceIgnoreUserRoles',  to specify name of user
+    roles to be ignored for injecting metadata properties in the image.