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

fix lp:1884794: vsphere values for show-cloud --include-config #13031

Merged
merged 4 commits into from
Jun 3, 2021
Merged

fix lp:1884794: vsphere values for show-cloud --include-config #13031

merged 4 commits into from
Jun 3, 2021

Conversation

hmlanigan
Copy link
Member

Implement the ConfigSchemaSource interfaced use by show-cloud --include-config in the vSphere provider. The config key descriptions are new also.

QA steps

# Configure a vsphere cloud.  Bootstrap is not necessary for this command to run.
$ juju show-cloud <vsphere-cloud> --include-config

Client cloud "vsphere":

defined: local
type: vsphere
auth-types: [userpass]
endpoint: x.x.x.x
credential-count: 1
regions:
  QA: {}
config:
  datastore: datastore1


The available config options specific to vsphere clouds are:
datastore:
  type: string
  description: The datastore in which to create VMs. If this is not specified, the
    process will abort unless there is only one datastore available.
disk-provisioning-type:
  type: string
  description: 'Specify how the disk should be provisioned when cloning the VM template.
    Allowed values are: thickEagerZero (default), thick and thin.'
enable-disk-uuid:
  type: bool
  description: Expose consistent disk UUIDs to the VM, equivalent to disk.EnableUUID.
    The default is True.
external-network:
  type: string
  description: An external network that VMs will be connected to. The resulting IP
    address for a VM will be used as its public address.
force-vm-hardware-version:
  type: int
  description: The HW compatibility version to use when cloning a VM template to create
    a VM. The version must be supported by the remote compute resource, and greater
    or equal to the template’s version.
primary-network:
  type: string
  description: The primary network that VMs will be connected to. If this is not specified,
    Juju will look for a network named VM Network.

Bug reference

https://bugs.launchpad.net/juju/+bug/1884794

@hmlanigan hmlanigan added the 2.9 label May 27, 2021
hmlanigan added 2 commits May 28, 2021 09:44
@hmlanigan
Allow show-cloud --include-config to work for vsphere.
aa60d33 
Fixes LP:1884794

Use environschema for configSchema, providing enhanced information
about possible config.  Implement ConfigSchema, ConfigDefaults from
the ConfigSchemaSource interface. Implement Schema.
@hmlanigan
Sometimes golangci-lint version starts with a v, sometimes it does not.
c3d1a4f
manadart
manadart approved these changes Jun 2, 2021
View reviewed changes
Copy link
Member

@manadart manadart left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

provider/vsphere/config.go Outdated Show resolved Hide resolved
@hmlanigan
Copy link
Member Author

$$merge$$

@jujubot jujubot merged commit c950ff6 into juju:2.9 Jun 3, 2021
@hmlanigan hmlanigan deleted the vsphere-config branch June 3, 2021 17:35
@wallyworld wallyworld mentioned this pull request Jun 4, 2021
Merged
jujubot added a commit that referenced this pull request Jun 6, 2021
@jujubot
Merge pull request #13050 from wallyworld/merge-2.9-20210604
0cf55ea 
#13050

Merge 2.9

#12859 Fix windows userdata
#12986 Prevent contention error when switching charms that drop peer relations
#13001 Charmhub: Improve download logging on failure
#13003 Only run upgrade-charm hook once when k8s charm upgraded
#13004 Update Pebble: enable "pebble run --verbose" logging and starting services as different user/group
#13007 Lp1920820 dashboard proxy support
#13002 CLI: Fix panic in upgrade-series with older controllers
#13036 Use mongo storage for external identity macaroon keys
#13040 Integration tests: Extend timeout
#13033 Remove stand-alone unit agent concerns
#13037 Handle SIGTERM and stop hook on sidecar deploys
#13038 Use the address CIDRs when populating machine addresses in the instance-poller
#13039 Fixes error with ensure ClusterRole
#13041 Update apt mirrors on all nodes when model value changes
#13043 Integration tests: Manual test charm selection
#13045 Fix race in caasunitterminationworker tests
#13044 Do not attempt downgrades in the upgrade-steps worker
#13046 Fix display of scale and workload version in status
#13048 Data race state/logdb tests
#13049 Report service address for sidecar k8s charms
#13031 vsphere values for show-cloud --include-config


```
# Conflicts:
# apiserver/facades/client/application/update_series_mocks_test.go
# apiserver/facades/client/bundle/bundle.go
# apiserver/facades/client/machinemanager/types_mock_test.go
# cmd/juju/application/bundle/bundle.go
# cmd/juju/application/bundle/bundle_test.go
# cmd/juju/application/deployer/bundlehandler.go
# cmd/juju/application/diffbundle.go
# cmd/juju/dashboard/dashboard.go
# featuretests/upgrade_test.go
# go.mod
# go.sum
# scripts/win-installer/setup.iss
# snap/snapcraft.yaml
# state/action_test.go
# version/version.go
# worker/uniter/resolver/loop.go
```

## QA steps

See PRs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@manadart manadart manadart approved these changes

Assignees
No one assigned
Labels
2.9
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@hmlanigan @manadart @jujubot