Merge pull request rancher#21 from rawmind0/openstack

Fix on cluster resource for rke_config argument openstack cloud_provider

go.mod

@@ -6,8 +6,8 @@ require (
 	github.com/go-ini/ini v1.23.1 // indirect
 	github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect
 	github.com/hashicorp/terraform v0.12.0
-	github.com/rancher/norman v0.0.0-20190411163419-01a996623771
-	github.com/rancher/types v0.0.0-20190419232237-0aaea5ae1a60
+	github.com/rancher/norman v0.0.0-20190503155902-ea122abac582
+	github.com/rancher/types v0.0.0-20190524211942-2361355c4c51
 	github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a // indirect
 	golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734
 	k8s.io/apimachinery v0.0.0-20181022183627-f71dbbc36e12 // indirect

go.sum

@@ -298,10 +298,14 @@ github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7q
 github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/rancher/norman v0.0.0-20190411163419-01a996623771 h1:1bTIw66/xfxn8YUk7YjdMKekP2D0oO+rKnzMv99E1xE=
 github.com/rancher/norman v0.0.0-20190411163419-01a996623771/go.mod h1:CgWdUHi0tUimz2RgS6WoC/cDHFSLx9G7EBhlp6wE0ck=
+github.com/rancher/norman v0.0.0-20190503155902-ea122abac582 h1:YqE0M4iq2pWwIUkqIhJhnTWXsAXwfcpmLwyYfq0VyMA=
+github.com/rancher/norman v0.0.0-20190503155902-ea122abac582/go.mod h1:CgWdUHi0tUimz2RgS6WoC/cDHFSLx9G7EBhlp6wE0ck=
 github.com/rancher/terraform-provider-rancher2 v0.2.0-rc5 h1:X+irwoAf9a/g+1+tkOel8ynedRKr7uZ7Yqe1d9TxOm4=
 github.com/rancher/terraform-provider-rancher2 v0.2.0-rc5/go.mod h1:2RR5xWbkZ1VbWRjnJdV01FaCmlaNlffYNawteVsbfUg=
 github.com/rancher/types v0.0.0-20190419232237-0aaea5ae1a60 h1:rd98DhPCZG4waQpCjJOc5u9iyOvpSgIVaeG31Q8B8gA=
 github.com/rancher/types v0.0.0-20190419232237-0aaea5ae1a60/go.mod h1:ePTc7xKI37jRSwgLsg63ITTADceptutuNVG8Fj33QaE=
+github.com/rancher/types v0.0.0-20190524211942-2361355c4c51 h1:+QdNZeRXDZ3EyydMo+UHOcU3mQntEQUAokLeVDx9EdQ=
+github.com/rancher/types v0.0.0-20190524211942-2361355c4c51/go.mod h1:ePTc7xKI37jRSwgLsg63ITTADceptutuNVG8Fj33QaE=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/satori/go.uuid v0.0.0-20160927100844-b061729afc07 h1:DEZDfcCVq3xDJrjqdCgyN/dHYVoqR92MCsdqCdxmnhM=
 github.com/satori/go.uuid v0.0.0-20160927100844-b061729afc07/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=

rancher2/schema_cluster_rke_config_cloud_provider_openstack.go

@@ -5,9 +5,9 @@ import (
 )
 
 const (
-	openstackLBMonitorDelay      = 60
+	openstackLBMonitorDelay      = "60s"
 	openstackLBMonitorMaxRetries = 5
-	openstackLBMonitorTimeout    = 30
+	openstackLBMonitorTimeout    = "30s"
 	cloudProviderOpenstackName   = "openstack"
 )
 
@@ -126,7 +126,7 @@ func clusterRKEConfigCloudProviderOpenstackLoadBalancerFields() map[string]*sche
 			Computed: true,
 		},
 		"monitor_delay": {
-			Type:     schema.TypeInt,
+			Type:     schema.TypeString,
 			Optional: true,
 			Default:  openstackLBMonitorDelay,
 		},
@@ -136,7 +136,7 @@ func clusterRKEConfigCloudProviderOpenstackLoadBalancerFields() map[string]*sche
 			Default:  openstackLBMonitorMaxRetries,
 		},
 		"monitor_timeout": {
-			Type:     schema.TypeInt,
+			Type:     schema.TypeString,
 			Optional: true,
 			Default:  openstackLBMonitorTimeout,
 		},

rancher2/structure_cluster_rke_config_cloud_provider_openstack.go

@@ -103,16 +103,16 @@ func flattenClusterRKEConfigCloudProviderOpenstackLoadBalancer(in *managementCli
 
 	obj["manage_security_groups"] = in.ManageSecurityGroups
 
-	if in.MonitorDelay > 0 {
-		obj["monitor_delay"] = int(in.MonitorDelay)
+	if len(in.MonitorDelay) > 0 {
+		obj["monitor_delay"] = in.MonitorDelay
 	}
 
 	if in.MonitorMaxRetries > 0 {
 		obj["monitor_max_retries"] = int(in.MonitorMaxRetries)
 	}
 
-	if in.MonitorTimeout > 0 {
-		obj["monitor_timeout"] = int(in.MonitorTimeout)
+	if len(in.MonitorTimeout) > 0 {
+		obj["monitor_timeout"] = in.MonitorTimeout
 	}
 
 	if len(in.SubnetID) > 0 {
@@ -318,16 +318,16 @@ func expandClusterRKEConfigCloudProviderOpenstackLoadBalancer(p []interface{}) (
 		obj.ManageSecurityGroups = v
 	}
 
-	if v, ok := in["monitor_delay"].(int); ok && v > 0 {
-		obj.MonitorDelay = int64(v)
+	if v, ok := in["monitor_delay"].(string); ok && len(v) > 0 {
+		obj.MonitorDelay = v
 	}
 
 	if v, ok := in["monitor_max_retries"].(int); ok && v > 0 {
 		obj.MonitorMaxRetries = int64(v)
 	}
 
-	if v, ok := in["monitor_timeout"].(int); ok && v > 0 {
-		obj.MonitorTimeout = int64(v)
+	if v, ok := in["monitor_timeout"].(string); ok && len(v) > 0 {
+		obj.MonitorTimeout = v
 	}
 
 	if v, ok := in["subnet_id"].(string); ok && len(v) > 0 {

rancher2/structure_cluster_rke_config_cloud_provider_openstack_test.go

@@ -68,9 +68,9 @@ func init() {
 		LBProvider:           "provider",
 		LBVersion:            "version",
 		ManageSecurityGroups: true,
-		MonitorDelay:         30,
+		MonitorDelay:         "30s",
 		MonitorMaxRetries:    5,
-		MonitorTimeout:       10,
+		MonitorTimeout:       "10s",
 		SubnetID:             "subnet",
 		UseOctavia:           true,
 	}
@@ -82,9 +82,9 @@ func init() {
 			"lb_provider":            "provider",
 			"lb_version":             "version",
 			"manage_security_groups": true,
-			"monitor_delay":          30,
+			"monitor_delay":          "30s",
 			"monitor_max_retries":    5,
-			"monitor_timeout":        10,
+			"monitor_timeout":        "10s",
 			"subnet_id":              "subnet",
 			"use_octavia":            true,
 		},

vendor/modules.txt

@@ -218,7 +218,7 @@ github.com/posener/complete
 github.com/posener/complete/cmd/install
 github.com/posener/complete/cmd
 github.com/posener/complete/match
-# github.com/rancher/norman v0.0.0-20190411163419-01a996623771
+# github.com/rancher/norman v0.0.0-20190503155902-ea122abac582
 github.com/rancher/norman/clientbase
 github.com/rancher/norman/types
 github.com/rancher/norman/httperror
@@ -227,7 +227,7 @@ github.com/rancher/norman/types/convert
 github.com/rancher/norman/types/definition
 github.com/rancher/norman/types/slice
 github.com/rancher/norman/types/values
-# github.com/rancher/types v0.0.0-20190419232237-0aaea5ae1a60
+# github.com/rancher/types v0.0.0-20190524211942-2361355c4c51
 github.com/rancher/types/client/cluster/v3
 github.com/rancher/types/client/management/v3
 github.com/rancher/types/client/project/v3

website/docs/r/cluster.html.markdown

@@ -273,9 +273,9 @@ The following attributes are exported:
 * `lb_provider` - (Optional/Computed) (string)
 * `lb_version` - (Optional/Computed) (string)
 * `manage_security_groups` - (Optional/Computed) (bool)
-* `monitor_delay` - (Optional/Computed) Default `60` (int)
-* `monitor_max_retries` - (Optional/Computed) Default `5` (int)
-* `monitor_timeout` - (Optional/Computed) Default `30` (int)
+* `monitor_delay` - (Optional/Computed) Default `60s` (string)
+* `monitor_max_retries` - (Optional/Computed) Default 5 (int)
+* `monitor_timeout` - (Optional/Computed) Default `30s` (string)
 * `subnet_id` - (Optional/Computed) (string)
 * `use_octavia` - (Optional/Computed) (bool)