diff --git a/SOURCES/bz1479851-fence_compute-fence_scsi-fix-parameters.patch b/SOURCES/bz1479851-fence_compute-fence_scsi-fix-parameters.patch
new file mode 100644
index 0000000..e1b8b80
--- /dev/null
+++ b/SOURCES/bz1479851-fence_compute-fence_scsi-fix-parameters.patch
@@ -0,0 +1,100 @@
+diff -uNr a/fence/agents/compute/fence_compute.py b/fence/agents/compute/fence_compute.py
+--- a/fence/agents/compute/fence_compute.py	2017-07-24 12:16:11.193996848 +0200
++++ b/fence/agents/compute/fence_compute.py	2017-07-24 12:18:18.012271280 +0200
+@@ -367,7 +367,7 @@
+ 	logging.warning("Couldn't obtain a supported connection to nova, tried: %s\n" % repr(versions))
+ 
+ def define_new_opts():
+-	all_opt["endpoint-type"] = {
++	all_opt["endpoint_type"] = {
+ 		"getopt" : "e:",
+ 		"longopt" : "endpoint-type",
+ 		"help" : "-e, --endpoint-type=[endpoint] Nova Endpoint type (publicURL, internalURL, adminURL)",
+@@ -376,7 +376,7 @@
+ 		"default" : "internalURL",
+ 		"order": 1,
+ 	}
+-	all_opt["tenant-name"] = {
++	all_opt["tenant_name"] = {
+ 		"getopt" : "t:",
+ 		"longopt" : "tenant-name",
+ 		"help" : "-t, --tenant-name=[tenant]     Keystone Admin Tenant",
+@@ -385,7 +385,7 @@
+ 		"default" : "",
+ 		"order": 1,
+ 	}
+-	all_opt["auth-url"] = {
++	all_opt["auth_url"] = {
+ 		"getopt" : "k:",
+ 		"longopt" : "auth-url",
+ 		"help" : "-k, --auth-url=[url]           Keystone Admin Auth URL",
+@@ -394,7 +394,7 @@
+ 		"default" : "",
+ 		"order": 1,
+ 	}
+-	all_opt["region-name"] = {
++	all_opt["region_name"] = {
+ 		"getopt" : "",
+ 		"longopt" : "region-name",
+ 		"help" : "--region-name=[region]         Region Name",
+@@ -420,7 +420,7 @@
+ 		"shortdesc" : "DNS domain in which hosts live",
+ 		"order": 5,
+ 	}
+-	all_opt["record-only"] = {
++	all_opt["record_only"] = {
+ 		"getopt" : "r:",
+ 		"longopt" : "record-only",
+ 		"help" : "--record-only                  Record the target as needing evacuation but as yet do not intiate it",
+@@ -429,7 +429,7 @@
+ 		"default" : "False",
+ 		"order": 5,
+ 	}
+-	all_opt["instance-filtering"] = {
++	all_opt["instance_filtering"] = {
+ 		"getopt" : "",
+ 		"longopt" : "instance-filtering",
+ 		"help" : "--instance-filtering           Allow instances created from images and flavors with evacuable=true to be evacuated (or all if no images/flavors have been tagged)",
+@@ -438,7 +438,7 @@
+ 		"default" : "True",
+ 		"order": 5,
+ 	}
+-	all_opt["no-shared-storage"] = {
++	all_opt["no_shared_storage"] = {
+ 		"getopt" : "",
+ 		"longopt" : "no-shared-storage",
+ 		"help" : "--no-shared-storage            Disable functionality for shared storage",
+@@ -452,9 +452,9 @@
+ 	global override_status
+ 	atexit.register(atexit_handler)
+ 
+-	device_opt = ["login", "passwd", "tenant-name", "auth-url", "fabric_fencing", 
+-		"no_login", "no_password", "port", "domain", "no-shared-storage", "endpoint-type",
+-		"record-only", "instance-filtering", "insecure", "region-name"]
++	device_opt = ["login", "passwd", "tenant_name", "auth_url", "fabric_fencing", 
++		"no_login", "no_password", "port", "domain", "no_shared_storage", "endpoint_type",
++		"record_only", "instance_filtering", "insecure", "region_name"]
+ 	define_new_opts()
+ 	all_opt["shell_timeout"]["default"] = "180"
+ 
+diff -uNr a/fence/agents/scsi/fence_scsi.py b/fence/agents/scsi/fence_scsi.py
+--- a/fence/agents/scsi/fence_scsi.py	2017-07-24 12:16:11.135997637 +0200
++++ b/fence/agents/scsi/fence_scsi.py	2017-07-24 12:20:21.987584397 +0200
+@@ -332,7 +332,7 @@
+ 		"shortdesc" : "Log output (stdout and stderr) to file",
+ 		"order": 5
+ 	}
+-	all_opt["corosync-cmap_path"] = {
++	all_opt["corosync_cmap_path"] = {
+ 		"getopt" : "Z:",
+ 		"longopt" : "corosync-cmap-path",
+ 		"help" : "--corosync-cmap-path=[path]    Path to corosync-cmapctl binary",
+@@ -416,7 +416,7 @@
+ 	atexit.register(atexit_handler)
+ 
+ 	device_opt = ["no_login", "no_password", "devices", "nodename", "key",\
+-	"aptpl", "fabric_fencing", "on_target", "corosync-cmap_path",\
++	"aptpl", "fabric_fencing", "on_target", "corosync_cmap_path",\
+ 	"sg_persist_path", "sg_turs_path", "logfile", "vgs_path", "force_on"]
+ 
+ 	define_new_opts()
diff --git a/SPECS/fence-agents.spec b/SPECS/fence-agents.spec
index 785e25e..be476e8 100644
--- a/SPECS/fence-agents.spec
+++ b/SPECS/fence-agents.spec
@@ -16,7 +16,7 @@
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
 Version: 4.0.11
-Release: 66%{?alphatag:.%{alphatag}}%{?dist}
+Release: 66%{?alphatag:.%{alphatag}}%{?dist}.1
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sourceware.org/cluster/wiki/
@@ -136,6 +136,7 @@ Patch111: bz1377972-2-CI-dont-test-paths-in-metadata.patch
 Patch112: bz1426693-1-fence_compute-project_id-to-project_name.patch
 Patch113: bz1426693-2-fence_compute-project_id-to-project_name.patch
 Patch114: bz1459199-fence_vmware_soap-fix-for-selfsigned-certificate.patch
+Patch115: bz1479851-fence_compute-fence_scsi-fix-parameters.patch
 
 %if 0%{?rhel}
 %global supportedagents apc apc_snmp bladecenter brocade cisco_mds cisco_ucs compute drac5 eaton_snmp emerson eps hpblade ibmblade ifmib ilo ilo_moonshot ilo_mp ilo_ssh intelmodular ipdu ipmilan mpath kdump rhevm rsa rsb sbd scsi vmware_soap wti
@@ -280,6 +281,7 @@ BuildRequires: autoconf automake libtool
 %patch112 -p1 -b .bz1426693-1
 %patch113 -p1 -b .bz1426693-2
 %patch114 -p1 -b .bz1459199
+%patch115 -p1 -b .bz1479851
 
 %build
 ./autogen.sh
@@ -869,6 +871,10 @@ The fence-agents-zvm package contains a fence agent for z/VM hypervisors
 %endif
 
 %changelog
+* Thu Aug 10 2017 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.0.11-66.1
+- fence_compute/fence_scsi: fix issue with some parameters
+  Resolves: rhbz#1479851
+
 * Fri Jun 16 2017 Marek Grac <mgrac@redhat.com> - 4.0.11-66
 - Set SELinux booleans even when SELinux is disabled
   Resolves: rhbz#1457887