Cloud provider conf

Gopkg.toml

@@ -119,3 +119,7 @@ revision = "44145f04b68cf362d9c4df2182967c2275eaefed"
 [[constraint]]
   name = "github.com/ashcrow/osrelease"
   version = "1.0.0"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/gophercloud/utils"

hack/build-go.sh

@@ -30,5 +30,5 @@ fi
 
 mkdir -p ${BIN_PATH}
 
-echo "Building ${REPO}/cmd/${WHAT} (${VERSION})"
+echo "Building ${REPO}/cmd/${WHAT} (${VERSION_OVERRIDE})"
 CGO_ENABLED=0 GOOS=${GOOS} GOARCH=${GOARCH} go build ${GOFLAGS} -ldflags "${GLDFLAGS}" -o ${BIN_PATH}/${WHAT} ${REPO}/cmd/${WHAT}

pkg/controller/template/render.go

@@ -10,6 +10,7 @@ import (
 	"sort"
 	"strings"
 	"text/template"
+    "encoding/base64"
 
 	"github.com/Masterminds/sprig"
 	ctconfig "github.com/coreos/container-linux-config-transpiler/config"
@@ -19,6 +20,8 @@ import (
 	"github.com/golang/glog"
 	mcfgv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+    install_types "github.com/openshift/installer/pkg/types"
 )
 
 // renderConfig is wrapper around ControllerConfigSpec.
@@ -268,6 +271,7 @@ func renderTemplate(config renderConfig, path string, b []byte) ([]byte, error)
 	funcs["etcdPeerCertDNSNames"] = etcdPeerCertDNSNames
 	funcs["apiServerURL"] = apiServerURL
 	funcs["cloudProvider"] = cloudProvider
+	funcs["cloudProviderConfig"] = cloudProviderConfig
 	tmpl, err := template.New(path).Funcs(funcs).Parse(string(b))
 	if err != nil {
 		return nil, fmt.Errorf("failed to parse template %s: %v", path, err)
@@ -337,6 +341,26 @@ func cloudProvider(cfg renderConfig) (interface{}, error) {
 	return "", nil
 }
 
+func cloudProviderConfig(cfg renderConfig) (interface{}, error) {
+    config, err := base64.StdEncoding.DecodeString(cfg.CloudProviderConfig)
+        if err != nil {
+                return "", err
+        }
+
+	switch cfg.Platform {
+	case "aws":
+		return "", nil
+	case "openstack":
+        var openstack *install_types.OpenStackPlatform
+        err = yaml.Unmarshal(config, &openstack)
+        if err != nil {
+                return "", err
+        }
+        return openstack, nil
+	}
+	return "", nil
+}
+
 // existsDir returns true if path exists and is a directory, false if the path
 // does not exist, and error if there is a runtime error or the path is not a directory
 func existsDir(path string) (bool, error) {

pkg/controller/template/test_data/templates/openstack/master/files/-etc-openstack-clouds.conf

@@ -0,0 +1,6 @@
+contents:
+  source: data:,%0A%0A%5BLoadBalancer%5D%0Asubnet-id%3D%0A
+  verification: {}
+filesystem: root
+mode: 420
+path: /etc/openstack/clouds.conf

pkg/controller/template/test_data/templates/openstack/worker/files/-etc-openstack-clouds.conf

@@ -0,0 +1,6 @@
+contents:
+  source: data:,%0A%0A%5BLoadBalancer%5D%0Asubnet-id%3D%0A
+  verification: {}
+filesystem: root
+mode: 420
+path: /etc/openstack/clouds.conf