Merge pull request #488 from Fedosin/openstack_cloud_provider

Re-enable OpenStack cloud provider
openshift · Jul 31, 2019 · 752c63b · 752c63b
2 parents 148bdd1 + 5d21639
commit 752c63b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/operator/configobserver/cloudprovider/observe_cloudprovider.go b/pkg/operator/configobserver/cloudprovider/observe_cloudprovider.go
@@ -152,8 +152,7 @@ func getPlatformName(platformType configv1.PlatformType, recorder events.Recorde
 		cloudProvider = "gce"
 	case configv1.LibvirtPlatformType:
 	case configv1.OpenStackPlatformType:
-		// TODO(flaper87): Enable this once we've figured out a way to write the cloud provider config in the master nodes
-		//cloudProvider = "openstack"
+		cloudProvider = "openstack"
 	case configv1.NonePlatformType:
 	default:
 		// the new doc on the infrastructure fields requires that we treat an unrecognized thing the same bare metal.

diff --git a/pkg/operator/configobserver/cloudprovider/observe_cloudprovider_test.go b/pkg/operator/configobserver/cloudprovider/observe_cloudprovider_test.go
@@ -63,7 +63,8 @@ func TestObserveCloudProviderNames(t *testing.T) {
 		cloudProviderCount: 0,
 	}, {
 		platform:           configv1.OpenStackPlatformType,
-		cloudProviderCount: 0,
+		expected:           "openstack",
+		cloudProviderCount: 1,
 	}, {
 		platform:           configv1.GCPPlatformType,
 		expected:           "gce",