aboutsummaryrefslogtreecommitdiffstats
path: root/yardstick/orchestrator/heat.py
diff options
context:
space:
mode:
Diffstat (limited to 'yardstick/orchestrator/heat.py')
-rw-r--r--yardstick/orchestrator/heat.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/yardstick/orchestrator/heat.py b/yardstick/orchestrator/heat.py
index beb63b421..c21a47473 100644
--- a/yardstick/orchestrator/heat.py
+++ b/yardstick/orchestrator/heat.py
@@ -21,7 +21,7 @@ import logging
import socket
import time
-import heatclient
+import heatclient.client
import pkg_resources
from oslo_utils import encodeutils
@@ -316,7 +316,9 @@ name (i.e. %s).\
'enable_dhcp': enable_dhcp,
}
}
- if gateway_ip is not None:
+ if gateway_ip == 'null':
+ self.resources[name]['properties']['gateway_ip'] = None
+ elif gateway_ip is not None:
self.resources[name]['properties']['gateway_ip'] = gateway_ip
self._template['outputs'][name] = {