Merge pull request #1338 from flaper87/sec-groups-update

openstack: Security groups update
openshift · Mar 1, 2019 · c8b3b55 · c8b3b55
2 parents 622f828 + 4be3041
commit c8b3b55
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 5 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/pkg/asset/machines/openstack/machines.go b/pkg/asset/machines/openstack/machines.go
@@ -106,7 +106,11 @@ func provider(clusterID string, platform *openstack.Platform, mpool *openstack.M
 			},
 		},
 		AvailabilityZone: az,
-		SecurityGroups:   []string{role},
+		SecurityGroups: []openstackprovider.SecurityGroupParam{
+			{
+				Name: role,
+			},
+		},
 		// TODO(flaper87): Trunk support missing. Need to add it back
 	}, nil
 }

diff --git a/....k8s.io/cluster-api-provider-openstack/pkg/apis/openstackproviderconfig/v1alpha1/types.go b/....k8s.io/cluster-api-provider-openstack/pkg/apis/openstackproviderconfig/v1alpha1/types.go
diff --git a/...api-provider-openstack/pkg/apis/openstackproviderconfig/v1alpha1/zz_generated.deepcopy.go b/...api-provider-openstack/pkg/apis/openstackproviderconfig/v1alpha1/zz_generated.deepcopy.go