Skip to content

Bug 1816995: OpenStack: create server group only once #3355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Mar 27, 2020
Merged

Bug 1816995: OpenStack: create server group only once #3355

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions pkg/asset/machines/openstack/machines.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine
provider := generateProvider(clusterID, platform, pool.Platform.OpenStack, osImage, az, role, userDataSecret, trunk)

if role == "master" {
sg, err := createServerGroup(platform.Cloud, clusterID+"-"+role, "soft-anti-affinity")
sg, err := getOrCreateServerGroup(platform.Cloud, clusterID+"-"+role, "soft-anti-affinity")
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -145,11 +145,11 @@ func trunkSupportBoolean(trunkSupport string) (result bool) {
return
}

// createServerGroup creates a Nova server group with the given name and
// policy.
// getOrCreateServerGroup gets a Nova server group with the given name and
// policy or creates a new one if it doesn't exist.
//
// https://docs.openstack.org/api-ref/compute/?expanded=create-server-group-detail#server-groups-os-server-groups
func createServerGroup(cloud, serverGroupName, policy string) (*servergroups.ServerGroup, error) {
func getOrCreateServerGroup(cloud, serverGroupName, policy string) (*servergroups.ServerGroup, error) {
conn, err := clientconfig.NewServiceClient(
"compute",
&clientconfig.ClientOpts{
Expand All @@ -164,6 +164,25 @@ func createServerGroup(cloud, serverGroupName, policy string) (*servergroups.Ser
// Note that microversions starting from "2.64" use a new field
// accepting policies as a string instead of an array.
conn.Microversion = "2.15"

allPages, err := servergroups.List(conn).AllPages()
if err != nil {
return nil, err
}

allServerGroups, err := servergroups.ExtractServerGroups(allPages)
if err != nil {
return nil, err
}

for _, serverGroup := range allServerGroups {
// Reuse the server group if it already exists and is empty
if serverGroup.Name == serverGroupName && len(serverGroup.Members) == 0 {
return &serverGroup, nil
}
}

// Create a new group otherwise
return servergroups.Create(conn, &servergroups.CreateOpts{
Name: serverGroupName,
Policies: []string{policy},
Expand Down