Merge pull request #7636 from t0ffel/fix_oc_process

Automatic merge from submit-queue.

Replacing -v with -p for template parameters in oc_process

-v flag was removed completely, now only -p works.

Looks like -v was removed here: https://github.com/openshift/origin/commit/6f680065a523555e5903cc609615427bc6aa3557

The exact issue was:
```
TASK [openshift_logging_eventrouter : Process EventRouter template] ************
task path: /usr/share/ansible/openshift-ansible/roles/openshift_logging_eventrouter/tasks/install_eventrouter.yaml:48
An exception occurred during task execution. To see the full traceback, use -vvv. The error was: __main__.OpenShiftCLIError: Error processing template [eventrouter-template]: {'cmd': '/bin/oc process eventrouter-template -v REPLICAS=1 IMAGE=openshift/origin-logging-eventrouter:techpreview NAMESPACE=default SINK=stdout MEMORY=64Mi CPU=100m -n default', 'returncode': 1, 'results': {}, 'stderr': u'Error: unknown shorthand flag: \'v\' in -v\n\n\nUsage:\n  oc process (TEMPLATE | -f FILENAME) [-p=KEY=VALUE] [options]\n\nExamples:\n  # Convert template.json file into resource list and pass to create\n  oc process -f template.json | oc create -f -\n  \n  # Process a file locally instead of contacting the server\n  oc process -f template.json --local -o yaml\n  \n  # Process template while passing a user-defined label\n  oc process -f template.json -l name=mytemplate\n  \n  # Convert stored template into resource list\n  oc process foo\n  \n  # Convert stored template into resource list by setting/overriding parameter values\n  oc process foo PARM1=VALUE1 PARM2=VALUE2\n  \n  # Convert template stored in different namespace into a resource list\n  oc process openshift//foo\n  \n  # Convert template.json into resource list\n  cat template.json | oc process -f -\n\nOptions:\n  -f, --filename=\'\': Filename or URL to file to read a template\n      --ignore-unknown-parameters=false: If true, will not stop processing if a provided parameter does not exist in the template.\n  -l, --labels=\'\': Label to set in all resources for this template\n      --local=false: If true process the template locally instead of contacting the server.\n  -o, --output=\'json\': Output format. One of: describe|json|yaml|name|go-template=...|go-template-file=...|jsonpath=...|jsonpath-file=...\n      --output-version=\'\': Output the formatted object with the given version (default api-version).\n  -p, --param=[]: Specify a key-value pair (eg. -p FOO=BAR) to set/override a parameter value in the template.\n      --param-file=[]: File containing template parameter values to set/override in the template.\n      --parameters=false: If true, do not process but only print available parameters\n      --raw=false: If true, output the processed template instead of the template\'s objects. Implied by -o describe\n  -a, --show-all=true: When printing, show all resources (false means hide terminated pods.)\n      --show-labels=false: When printing, show all labels as the last column (default hide labels column)\n  -t, --template=\'\': Template string or path to template file to use when -o=go-template, -o=go-templatefile.  The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]\n\nUse "oc options" for a list of global command-line options (applies to all commands).\n\n', 'stdout': u''}
```

/cc @ewolinetz

roles/lib_openshift/library/oc_adm_ca_server_cert.py

@@ -1000,7 +1000,7 @@ class OpenShiftCLI(object):
             cmd.append(template_name)
         if params:
             param_str = ["{}={}".format(key, str(value).replace("'", r'"')) for key, value in params.items()]
-            cmd.append('-v')
+            cmd.append('-p')
             cmd.extend(param_str)
 
         results = self.openshift_cmd(cmd, output=True, input_data=template_data)

roles/lib_openshift/library/oc_adm_csr.py

@@ -978,7 +978,7 @@ class OpenShiftCLI(object):
             cmd.append(template_name)
         if params:
             param_str = ["{}={}".format(key, str(value).replace("'", r'"')) for key, value in params.items()]
-            cmd.append('-v')
+            cmd.append('-p')
             cmd.extend(param_str)
 
         results = self.openshift_cmd(cmd, output=True, input_data=template_data)

roles/lib_openshift/library/oc_adm_manage_node.py

@@ -986,7 +986,7 @@ class OpenShiftCLI(object):
             cmd.append(template_name)
         if params:
             param_str = ["{}={}".format(key, str(value).replace("'", r'"')) for key, value in params.items()]
-            cmd.append('-v')
+            cmd.append('-p')
             cmd.extend(param_str)
 
         results = self.openshift_cmd(cmd, output=True, input_data=template_data)

roles/lib_openshift/library/oc_adm_policy_group.py

@@ -972,7 +972,7 @@ class OpenShiftCLI(object):
             cmd.append(template_name)
         if params:
             param_str = ["{}={}".format(key, str(value).replace("'", r'"')) for key, value in params.items()]
-            cmd.append('-v')
+            cmd.append('-p')
             cmd.extend(param_str)
 
         results = self.openshift_cmd(cmd, output=True, input_data=template_data)

roles/lib_openshift/library/oc_adm_policy_user.py

@@ -986,7 +986,7 @@ class OpenShiftCLI(object):
             cmd.append(template_name)
         if params:
             param_str = ["{}={}".format(key, str(value).replace("'", r'"')) for key, value in params.items()]
-            cmd.append('-v')
+            cmd.append('-p')
             cmd.extend(param_str)
 
         results = self.openshift_cmd(cmd, output=True, input_data=template_data)

roles/lib_openshift/library/oc_adm_registry.py

@@ -1090,7 +1090,7 @@ class OpenShiftCLI(object):
             cmd.append(template_name)
         if params:
             param_str = ["{}={}".format(key, str(value).replace("'", r'"')) for key, value in params.items()]
-            cmd.append('-v')
+            cmd.append('-p')
             cmd.extend(param_str)
 
         results = self.openshift_cmd(cmd, output=True, input_data=template_data)

roles/lib_openshift/library/oc_adm_router.py

@@ -1115,7 +1115,7 @@ class OpenShiftCLI(object):
             cmd.append(template_name)
         if params:
             param_str = ["{}={}".format(key, str(value).replace("'", r'"')) for key, value in params.items()]
-            cmd.append('-v')
+            cmd.append('-p')
             cmd.extend(param_str)
 
         results = self.openshift_cmd(cmd, output=True, input_data=template_data)

roles/lib_openshift/library/oc_clusterrole.py

@@ -964,7 +964,7 @@ class OpenShiftCLI(object):
             cmd.append(template_name)
         if params:
             param_str = ["{}={}".format(key, str(value).replace("'", r'"')) for key, value in params.items()]
-            cmd.append('-v')
+            cmd.append('-p')
             cmd.extend(param_str)
 
         results = self.openshift_cmd(cmd, output=True, input_data=template_data)

roles/lib_openshift/library/oc_configmap.py

@@ -970,7 +970,7 @@ class OpenShiftCLI(object):
             cmd.append(template_name)
         if params:
             param_str = ["{}={}".format(key, str(value).replace("'", r'"')) for key, value in params.items()]
-            cmd.append('-v')
+            cmd.append('-p')
             cmd.extend(param_str)
 
         results = self.openshift_cmd(cmd, output=True, input_data=template_data)

roles/lib_openshift/library/oc_edit.py

@@ -1020,7 +1020,7 @@ class OpenShiftCLI(object):
             cmd.append(template_name)
         if params:
             param_str = ["{}={}".format(key, str(value).replace("'", r'"')) for key, value in params.items()]
-            cmd.append('-v')
+            cmd.append('-p')
             cmd.extend(param_str)
 
         results = self.openshift_cmd(cmd, output=True, input_data=template_data)

roles/lib_openshift/library/oc_env.py

@@ -981,7 +981,7 @@ class OpenShiftCLI(object):
             cmd.append(template_name)
         if params:
             param_str = ["{}={}".format(key, str(value).replace("'", r'"')) for key, value in params.items()]
-            cmd.append('-v')
+            cmd.append('-p')
             cmd.extend(param_str)
 
         results = self.openshift_cmd(cmd, output=True, input_data=template_data)

roles/lib_openshift/library/oc_group.py

@@ -954,7 +954,7 @@ class OpenShiftCLI(object):
             cmd.append(template_name)
         if params:
             param_str = ["{}={}".format(key, str(value).replace("'", r'"')) for key, value in params.items()]
-            cmd.append('-v')
+            cmd.append('-p')
             cmd.extend(param_str)
 
         results = self.openshift_cmd(cmd, output=True, input_data=template_data)

roles/lib_openshift/library/oc_image.py

@@ -973,7 +973,7 @@ class OpenShiftCLI(object):
             cmd.append(template_name)
         if params:
             param_str = ["{}={}".format(key, str(value).replace("'", r'"')) for key, value in params.items()]
-            cmd.append('-v')
+            cmd.append('-p')
             cmd.extend(param_str)
 
         results = self.openshift_cmd(cmd, output=True, input_data=template_data)

roles/lib_openshift/library/oc_label.py

@@ -990,7 +990,7 @@ class OpenShiftCLI(object):
             cmd.append(template_name)
         if params:
             param_str = ["{}={}".format(key, str(value).replace("'", r'"')) for key, value in params.items()]
-            cmd.append('-v')
+            cmd.append('-p')
             cmd.extend(param_str)
 
         results = self.openshift_cmd(cmd, output=True, input_data=template_data)

roles/lib_openshift/library/oc_obj.py

@@ -999,7 +999,7 @@ class OpenShiftCLI(object):
             cmd.append(template_name)
         if params:
             param_str = ["{}={}".format(key, str(value).replace("'", r'"')) for key, value in params.items()]
-            cmd.append('-v')
+            cmd.append('-p')
             cmd.extend(param_str)
 
         results = self.openshift_cmd(cmd, output=True, input_data=template_data)

roles/lib_openshift/library/oc_objectvalidator.py

@@ -925,7 +925,7 @@ class OpenShiftCLI(object):
             cmd.append(template_name)
         if params:
             param_str = ["{}={}".format(key, str(value).replace("'", r'"')) for key, value in params.items()]
-            cmd.append('-v')
+            cmd.append('-p')
             cmd.extend(param_str)
 
         results = self.openshift_cmd(cmd, output=True, input_data=template_data)

roles/lib_openshift/library/oc_process.py

@@ -982,7 +982,7 @@ class OpenShiftCLI(object):
             cmd.append(template_name)
         if params:
             param_str = ["{}={}".format(key, str(value).replace("'", r'"')) for key, value in params.items()]
-            cmd.append('-v')
+            cmd.append('-p')
             cmd.extend(param_str)
 
         results = self.openshift_cmd(cmd, output=True, input_data=template_data)

roles/lib_openshift/library/oc_project.py

@@ -979,7 +979,7 @@ class OpenShiftCLI(object):
             cmd.append(template_name)
         if params:
             param_str = ["{}={}".format(key, str(value).replace("'", r'"')) for key, value in params.items()]
-            cmd.append('-v')
+            cmd.append('-p')
             cmd.extend(param_str)
 
         results = self.openshift_cmd(cmd, output=True, input_data=template_data)

roles/lib_openshift/library/oc_pvc.py

@@ -986,7 +986,7 @@ class OpenShiftCLI(object):
             cmd.append(template_name)
         if params:
             param_str = ["{}={}".format(key, str(value).replace("'", r'"')) for key, value in params.items()]
-            cmd.append('-v')
+            cmd.append('-p')
             cmd.extend(param_str)
 
         results = self.openshift_cmd(cmd, output=True, input_data=template_data)

roles/lib_openshift/library/oc_route.py

@@ -1030,7 +1030,7 @@ class OpenShiftCLI(object):
             cmd.append(template_name)
         if params:
             param_str = ["{}={}".format(key, str(value).replace("'", r'"')) for key, value in params.items()]
-            cmd.append('-v')
+            cmd.append('-p')
             cmd.extend(param_str)
 
         results = self.openshift_cmd(cmd, output=True, input_data=template_data)

roles/lib_openshift/library/oc_scale.py

@@ -968,7 +968,7 @@ class OpenShiftCLI(object):
             cmd.append(template_name)
         if params:
             param_str = ["{}={}".format(key, str(value).replace("'", r'"')) for key, value in params.items()]
-            cmd.append('-v')
+            cmd.append('-p')
             cmd.extend(param_str)
 
         results = self.openshift_cmd(cmd, output=True, input_data=template_data)

roles/lib_openshift/library/oc_secret.py

@@ -1026,7 +1026,7 @@ class OpenShiftCLI(object):
             cmd.append(template_name)
         if params:
             param_str = ["{}={}".format(key, str(value).replace("'", r'"')) for key, value in params.items()]
-            cmd.append('-v')
+            cmd.append('-p')
             cmd.extend(param_str)
 
         results = self.openshift_cmd(cmd, output=True, input_data=template_data)

roles/lib_openshift/library/oc_service.py

@@ -1033,7 +1033,7 @@ class OpenShiftCLI(object):
             cmd.append(template_name)
         if params:
             param_str = ["{}={}".format(key, str(value).replace("'", r'"')) for key, value in params.items()]
-            cmd.append('-v')
+            cmd.append('-p')
             cmd.extend(param_str)
 
         results = self.openshift_cmd(cmd, output=True, input_data=template_data)

roles/lib_openshift/library/oc_serviceaccount.py

@@ -966,7 +966,7 @@ class OpenShiftCLI(object):
             cmd.append(template_name)
         if params:
             param_str = ["{}={}".format(key, str(value).replace("'", r'"')) for key, value in params.items()]
-            cmd.append('-v')
+            cmd.append('-p')
             cmd.extend(param_str)
 
         results = self.openshift_cmd(cmd, output=True, input_data=template_data)

roles/lib_openshift/library/oc_serviceaccount_secret.py

@@ -966,7 +966,7 @@ class OpenShiftCLI(object):
             cmd.append(template_name)
         if params:
             param_str = ["{}={}".format(key, str(value).replace("'", r'"')) for key, value in params.items()]
-            cmd.append('-v')
+            cmd.append('-p')
             cmd.extend(param_str)
 
         results = self.openshift_cmd(cmd, output=True, input_data=template_data)

roles/lib_openshift/library/oc_storageclass.py

@@ -984,7 +984,7 @@ class OpenShiftCLI(object):
             cmd.append(template_name)
         if params:
             param_str = ["{}={}".format(key, str(value).replace("'", r'"')) for key, value in params.items()]
-            cmd.append('-v')
+            cmd.append('-p')
             cmd.extend(param_str)
 
         results = self.openshift_cmd(cmd, output=True, input_data=template_data)

roles/lib_openshift/library/oc_user.py

@@ -1026,7 +1026,7 @@ class OpenShiftCLI(object):
             cmd.append(template_name)
         if params:
             param_str = ["{}={}".format(key, str(value).replace("'", r'"')) for key, value in params.items()]
-            cmd.append('-v')
+            cmd.append('-p')
             cmd.extend(param_str)
 
         results = self.openshift_cmd(cmd, output=True, input_data=template_data)

roles/lib_openshift/library/oc_version.py

@@ -938,7 +938,7 @@ class OpenShiftCLI(object):
             cmd.append(template_name)
         if params:
             param_str = ["{}={}".format(key, str(value).replace("'", r'"')) for key, value in params.items()]
-            cmd.append('-v')
+            cmd.append('-p')
             cmd.extend(param_str)
 
         results = self.openshift_cmd(cmd, output=True, input_data=template_data)

roles/lib_openshift/library/oc_volume.py

@@ -1015,7 +1015,7 @@ class OpenShiftCLI(object):
             cmd.append(template_name)
         if params:
             param_str = ["{}={}".format(key, str(value).replace("'", r'"')) for key, value in params.items()]
-            cmd.append('-v')
+            cmd.append('-p')
             cmd.extend(param_str)
 
         results = self.openshift_cmd(cmd, output=True, input_data=template_data)

roles/lib_openshift/src/lib/base.py

@@ -140,7 +140,7 @@ class OpenShiftCLI(object):
             cmd.append(template_name)
         if params:
             param_str = ["{}={}".format(key, str(value).replace("'", r'"')) for key, value in params.items()]
-            cmd.append('-v')
+            cmd.append('-p')
             cmd.extend(param_str)
 
         results = self.openshift_cmd(cmd, output=True, input_data=template_data)