Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions openstack/clientconfig/results.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ type Cloud struct {
IdentityAPIVersion string `yaml:"identity_api_version,omitempty" json:"identity_api_version,omitempty"`
VolumeAPIVersion string `yaml:"volume_api_version,omitempty" json:"volume_api_version,omitempty"`

// Service default microversion overrides.
ComputeDefaultMicroversion string `yaml:"compute_default_microversion,omitempty" json:"compute_default_microversion,omitempty"`

// Verify whether or not SSL API requests should be verified.
Verify *bool `yaml:"verify,omitempty" json:"verify,omitempty"`

Expand Down
3 changes: 3 additions & 0 deletions openstack/clientconfig/testing/clouds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ clouds:
project_name: "Some Project"
domain_name: "default"
region_name: "HNL"
compute_default_microversion: "2.87"
florida:
interface: "admin"
auth:
Expand Down Expand Up @@ -139,11 +140,13 @@ clouds:
username: "jdoe"
password: "password"
project_name: "Some Project"
compute_default_microversion: "2.87"
regions:
- name: PHL1
values:
auth:
auth_url: "https://phl1.example.com:5000/v3"
compute_default_microversion: "2.79"
- PHL2
virginia:
auth_type: "v3applicationcredential"
Expand Down
19 changes: 14 additions & 5 deletions openstack/clientconfig/testing/fixtures.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,14 @@ var PhiladelphiaComplexPhl1CloudYAML = clientconfig.Cloud{
Password: "password",
ProjectName: "Some Project",
},
ComputeDefaultMicroversion: "2.79",
Regions: []clientconfig.Region{
{
Name: "PHL1",
Values: clientconfig.Cloud{AuthInfo: &clientconfig.AuthInfo{AuthURL: "https://phl1.example.com:5000/v3"}},
Name: "PHL1",
Values: clientconfig.Cloud{
AuthInfo: &clientconfig.AuthInfo{AuthURL: "https://phl1.example.com:5000/v3"},
ComputeDefaultMicroversion: "2.79",
},
},
{
Name: "PHL2",
Expand All @@ -71,10 +75,14 @@ var PhiladelphiaComplexPhl2CloudYAML = clientconfig.Cloud{
Password: "password",
ProjectName: "Some Project",
},
ComputeDefaultMicroversion: "2.87",
Regions: []clientconfig.Region{
{
Name: "PHL1",
Values: clientconfig.Cloud{AuthInfo: &clientconfig.AuthInfo{AuthURL: "https://phl1.example.com:5000/v3"}},
Name: "PHL1",
Values: clientconfig.Cloud{
AuthInfo: &clientconfig.AuthInfo{AuthURL: "https://phl1.example.com:5000/v3"},
ComputeDefaultMicroversion: "2.79",
},
},
{
Name: "PHL2",
Expand Down Expand Up @@ -170,7 +178,8 @@ var ChicagoCloudUseProfileYAML = clientconfig.Cloud{
}

var HawaiiCloudYAML = clientconfig.Cloud{
RegionName: "HNL",
RegionName: "HNL",
ComputeDefaultMicroversion: "2.87",
AuthInfo: &clientconfig.AuthInfo{
AuthURL: "https://hi.example.com:5000/v3",
Username: "jdoe",
Expand Down
1 change: 1 addition & 0 deletions openstack/clientconfig/testing/results_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ var HawaiiExpected = `clouds:
project_name: Some Project
domain_name: default
region_name: HNL
compute_default_microversion: "2.87"
verify: true
`

Expand Down