Merge pull request #95 from mohitj1988/PSTRESS-155

PSTRESS-155 Add support for vault-as-a-component in pstress

Author: mohitj1988

pstress/pstress-run-57.conf

@@ -157,8 +157,8 @@ MYEXTRA=""
 #                                                                              #
 ################################################################################
 ENCRYPTION_RUN=1
-KEYRING_FILE=1
-KEYRING_VAULT=0
+PLUGIN_KEYRING_FILE=1
+PLUGIN_KEYRING_VAULT=0
 
 ################################################################################
 # Number of threads to use. Default: 10.                                       #

pstress/pstress-run-80.conf

@@ -144,25 +144,24 @@ MYINIT=""
 MYEXTRA=""
 
 ################################################################################
-# Keyring options: Plugin and components                                       #
-# Plugins: keyring_file, keyring_vault                                         #
-# Component: component_keyring_file                                            #
+# Encryption options: keyring_file, keyring_vault                              #
 #                                                                              #
-# Both are supported in MySQL from 8.0.24. However, we can use either          #
-# component_keyring_file, keyring_file or keyring_vault at a time.             #
+# Both are supported in MySQL from 8.0.24. However, we can use only one        #
+# encryption type at a time.                                                   #
 #                                                                              #
 # By default, encryption runs are enabled i.e ENCRYPTION_RUN=1                 #
 # To disable all types of encryption set ENCRYPTION_RUN=0                      #
 #                                                                              #
 # keyring_file component is used for encryption by default.                    #
-# To use keyring_file plugin, set KEYRING_FILE=1                               #
-# To use keyring_vault, set KEYRING_VAULT=1                                    #
-#                                                                              #
+# To use keyring_file plugin, set PLUGIN_KEYRING_FILE=1                        #
+# To use keyring_vault plugin, set PLUGIN_KEYRING_VAULT=1                      #
+# To use keyring_vault component, set COMPONENT_KEYRING_VAULT=1                #
 ################################################################################
 ENCRYPTION_RUN=1
-KEYRING_FILE=0
-KEYRING_COMPONENT=1
-KEYRING_VAULT=0
+PLUGIN_KEYRING_FILE=0
+COMPONENT_KEYRING_FILE=1
+PLUGIN_KEYRING_VAULT=0
+COMPONENT_KEYRING_VAULT=0
 
 ################################################################################
 # Number of threads to use. Default: 10.                                       #

pstress/pstress-run-PXC57.conf

@@ -147,15 +147,15 @@ MYEXTRA="--thread_handling=pool-of-threads --log-bin --server-id=0 --binlog_form
 #                                                                              #
 # By default, encryption runs are enabled using keyring_file plugin            #
 # => To disable encryption run, set ENCRYPTION_RUN=0                           #
-# => To perform encryption using vault server, set KEYRING_VAULT=1             #
+# => To perform encryption using vault server, set PLUGIN_KEYRING_VAULT=1      #
 #                                                                              #
 # Note:                                                                        #
 # 1. keyring_component is not supported in PXC-5.7                             #
 # 2. keyring encryption type must be enabled one at a time                     #
 ################################################################################
 ENCRYPTION_RUN=1
-KEYRING_FILE=1
-KEYRING_VAULT=0
+PLUGIN_KEYRING_FILE=1
+PLUGIN_KEYRING_VAULT=0
 
 ################################################################################
 # Number of threads to use. Default: 10.                                       #

pstress/pstress-run-PXC80.conf

@@ -151,13 +151,14 @@ MYEXTRA="--thread_handling=pool-of-threads --log-bin --server-id=0 --binlog_form
 #                                                                              #
 # By default, encryption runs are enabled using component_keyring_file plugin  #
 # => To disable encryption run, set ENCRYPTION_RUN=0                           #
-# => To perform encryption using vault server, set KEYRING_VAULT=1             #
+# => To perform encryption using vault server, set PLUGIN_KEYRING_VAULT=1      #
 #                                                                              #
 ################################################################################
 ENCRYPTION_RUN=1
-KEYRING_FILE=0
-KEYRING_VAULT=0
-KEYRING_COMPONENT=1
+PLUGIN_KEYRING_FILE=0
+PLUGIN_KEYRING_VAULT=0
+COMPONENT_KEYRING_FILE=1
+COMPONENT_KEYRING_VAULT=0
 
 ################################################################################
 # To enable GCache encryption, set GCACHE_ENCRYPTION=1                         #