Skip to content
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

Jump to bottom

Upgrade to use the Glance API instead of Nova for images #1615

Merged
merged 1 commit into from
Oct 18, 2023
Merged

Upgrade to use the Glance API instead of Nova for images #1615

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion openstack/data_source_openstack_compute_instance_v2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,10 @@ func dataSourceComputeInstanceV2Read(ctx context.Context, d *schema.ResourceData
if err != nil {
return diag.Errorf("Error creating OpenStack compute client: %s", err)
}
imageClient, err := config.ImageV2Client(GetRegion(d, config))
if err != nil {
return diag.Errorf("Error creating OpenStack image client: %s", err)
}

id := d.Get("id").(string)
log.Printf("[DEBUG] Attempting to retrieve server %s", id)
Expand Down Expand Up @@ -207,7 +211,7 @@ func dataSourceComputeInstanceV2Read(ctx context.Context, d *schema.ResourceData
d.Set("flavor_name", flavor.Name)

// Set the instance's image information appropriately
if err := setImageInformation(computeClient, server, d); err != nil {
if err := setImageInformation(imageClient, server, d); err != nil {
return diag.FromErr(err)
}

Expand Down
12 changes: 8 additions & 4 deletions openstack/resource_openstack_compute_instance_v2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (
"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/startstop"
"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/tags"
"github.com/gophercloud/gophercloud/openstack/compute/v2/flavors"
"github.com/gophercloud/gophercloud/openstack/compute/v2/images"
"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
"github.com/gophercloud/gophercloud/openstack/imageservice/v2/images"
flavorsutils "github.com/gophercloud/utils/openstack/compute/v2/flavors"
imagesutils "github.com/gophercloud/utils/openstack/imageservice/v2/images"
"github.com/gophercloud/utils/terraform/hashcode"
Expand Down Expand Up @@ -672,6 +672,10 @@ func resourceComputeInstanceV2Read(_ context.Context, d *schema.ResourceData, me
if err != nil {
return diag.Errorf("Error creating OpenStack compute client: %s", err)
}
imageClient, err := config.ImageV2Client(GetRegion(d, config))
if err != nil {
return diag.Errorf("Error creating OpenStack image client: %s", err)
}

server, err := servers.Get(computeClient, d.Id()).Extract()
if err != nil {
Expand Down Expand Up @@ -756,7 +760,7 @@ func resourceComputeInstanceV2Read(_ context.Context, d *schema.ResourceData, me
}

// Set the instance's image information appropriately
if err := setImageInformation(computeClient, server, d); err != nil {
if err := setImageInformation(imageClient, server, d); err != nil {
return diag.FromErr(err)
}

Expand Down Expand Up @@ -1487,7 +1491,7 @@ func getImageIDFromConfig(imageClient *gophercloud.ServiceClient, d *schema.Reso
return "", fmt.Errorf("Neither a boot device, image ID, or image name were able to be determined")
}

func setImageInformation(computeClient *gophercloud.ServiceClient, server *servers.Server, d *schema.ResourceData) error {
func setImageInformation(imageClient *gophercloud.ServiceClient, server *servers.Server, d *schema.ResourceData) error {
// If block_device was used, an Image does not need to be specified, unless an image/local
// combination was used. This emulates normal boot behavior. Otherwise, ignore the image altogether.
if vL, ok := d.GetOk("block_device"); ok {
Expand All @@ -1508,7 +1512,7 @@ func setImageInformation(computeClient *gophercloud.ServiceClient, server *serve
imageID := server.Image["id"].(string)
if imageID != "" {
d.Set("image_id", imageID)
image, err := images.Get(computeClient, imageID).Extract()
image, err := images.Get(imageClient, imageID).Extract()
if err != nil {
if _, ok := err.(gophercloud.ErrDefault404); ok {
// If the image name can't be found, set the value to "Image not found".
Expand Down