From 40fdb15d036ea6fd45fceba3a73b485707869174 Mon Sep 17 00:00:00 2001
From: Jen Spinney <jen.spinney@hp.com>
Date: Fri, 30 Jan 2015 18:02:59 -0800
Subject: [PATCH] Support user variables for all OpenStack string config
 options

---
 builder/openstack/run_config.go | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/builder/openstack/run_config.go b/builder/openstack/run_config.go
index a1ca0f0ae..1e5bdc178 100644
--- a/builder/openstack/run_config.go
+++ b/builder/openstack/run_config.go
@@ -68,10 +68,13 @@ func (c *RunConfig) Prepare(t *packer.ConfigTemplate) []error {
 	}
 
 	templates := map[string]*string{
-		"flavor":       &c.Flavor,
-		"ssh_timeout":  &c.RawSSHTimeout,
-		"ssh_username": &c.SSHUsername,
-		"source_image": &c.SourceImage,
+		"flavor":             &c.Flavor,
+		"ssh_timeout":        &c.RawSSHTimeout,
+		"ssh_username":       &c.SSHUsername,
+		"source_image":       &c.SourceImage,
+		"openstack_provider": &c.OpenstackProvider,
+		"floating_ip_pool":   &c.FloatingIpPool,
+		"floating_ip":        &c.FloatingIp,
 	}
 
 	for n, ptr := range templates {