forked from openstack-k8s-operators/octavia-operator
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for system-scope Compute client. Ensure that 2 nova flavors are created: - octavia-amphora: 1 vCPU, 1GB RAM, 3GB disk - octavia-amphora-4vcpus: 4 vCPU, 4GB RAM, 3GB disk octavia-amphora is the default flavor in Octavia
- Loading branch information
1 parent
57226ee
commit 60cabfa
Showing
5 changed files
with
165 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| /* | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package amphoracontrollers | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "strings" | ||
|
|
||
| "github.com/go-logr/logr" | ||
| "github.com/gophercloud/gophercloud" | ||
| "github.com/gophercloud/gophercloud/openstack/compute/v2/flavors" | ||
| keystonev1 "github.com/openstack-k8s-operators/keystone-operator/api/v1beta1" | ||
| "github.com/openstack-k8s-operators/lib-common/modules/common/helper" | ||
| "github.com/openstack-k8s-operators/lib-common/modules/openstack" | ||
| octaviav1 "github.com/openstack-k8s-operators/octavia-operator/api/v1beta1" | ||
| "github.com/openstack-k8s-operators/octavia-operator/pkg/octavia" | ||
| ) | ||
|
|
||
| func ensureNovaFlavors(osclient *openstack.OpenStack, log *logr.Logger) (string, error) { | ||
| client, err := octavia.GetComputeClient(osclient) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
|
|
||
| // Get Octavia flavors | ||
| listOpts := flavors.ListOpts{ | ||
| AccessType: flavors.AllAccess, | ||
| } | ||
| allPages, err := flavors.ListDetail(client, listOpts).AllPages() | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
| allFlavors, err := flavors.ExtractFlavors(allPages) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
| amphoraFlavors := make(map[string]flavors.Flavor) | ||
| for _, flavor := range allFlavors { | ||
| if strings.HasPrefix(flavor.Name, "octavia-") { | ||
| amphoraFlavors[flavor.Name] = flavor | ||
| } | ||
| } | ||
|
|
||
| isPublic := false | ||
| defaultFlavorsCreateOpts := []flavors.CreateOpts{ | ||
| { | ||
| Name: "octavia-amphora", | ||
| VCPUs: 1, | ||
| RAM: 1024, | ||
| Disk: gophercloud.IntToPointer(3), | ||
| RxTxFactor: 1.0, | ||
| IsPublic: &isPublic, | ||
| }, { | ||
| Name: "octavia-amphora-4vcpus", | ||
| VCPUs: 4, | ||
| RAM: 4096, | ||
| Disk: gophercloud.IntToPointer(3), | ||
| RxTxFactor: 1.0, | ||
| IsPublic: &isPublic, | ||
| }, | ||
| } | ||
| defaultFlavorID := "" | ||
| defaultFlavorName := defaultFlavorsCreateOpts[0].Name | ||
|
|
||
| // Default flavor already exists, get its ID | ||
| if flavor, ok := amphoraFlavors[defaultFlavorName]; ok { | ||
| defaultFlavorID = flavor.ID | ||
| } | ||
|
|
||
| // Create missing flavors | ||
| for idx, defaultFlavorOpts := range defaultFlavorsCreateOpts { | ||
| if _, ok := amphoraFlavors[defaultFlavorOpts.Name]; !ok { | ||
| log.Info(fmt.Sprintf("Creating Amphora flavor \"%s\"", defaultFlavorOpts.Name)) | ||
| flavor, err := flavors.Create(client, defaultFlavorOpts).Extract() | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
| if idx == 0 { | ||
| defaultFlavorID = flavor.ID | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return defaultFlavorID, nil | ||
| } | ||
|
|
||
| // EnsureFlavors - enable that the Nova flavors for the amphora VMs are created | ||
| // | ||
| // returns the UUID of the default Nova flavor | ||
| func EnsureFlavors(ctx context.Context, instance *octaviav1.OctaviaAmphoraController, log *logr.Logger, helper *helper.Helper) (string, error) { | ||
| keystoneAPI, err := keystonev1.GetKeystoneAPI(ctx, helper, instance.Namespace, map[string]string{}) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
| osclient, _, err := octavia.GetAdminServiceClient(ctx, helper, keystoneAPI, octavia.ClientOpts{SystemScope: false}) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
|
|
||
| defaultNovaFlavorID, err := ensureNovaFlavors(osclient, log) | ||
| if err != nil { | ||
| return "", err | ||
|
|
||
| } | ||
|
|
||
| // TODO(gthiemonge) Create Octavia flavorprofiles and flavors when gophercloud support them | ||
|
|
||
| return defaultNovaFlavorID, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters