lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

virt: Authentication support

Browse Source 
Signed-off-by: Vinzenz Feenstra <vfeenstr@redhat.com>
This commit is contained in:
Vinzenz Feenstra
2016-11-04 13:31:14 +01:00
parent de5ada30b7
commit eef9abf0bf
1 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
resources/virt.go
View File

@@ -47,6 +47,12 @@ const (
lxcURI lxcURI
) )
// VirtAuth is used to pass credentials to libvirt.
type VirtAuth struct {
Username string `yaml:"username"`
Password string `yaml:"password"`
}
// VirtRes is a libvirt resource. A transient virt resource, which has its state // VirtRes is a libvirt resource. A transient virt resource, which has its state
// set to `shutoff` is one which does not exist. The parallel equivalent is a // set to `shutoff` is one which does not exist. The parallel equivalent is a
// file resource which removes a particular path. // file resource which removes a particular path.
@@ -63,6 +69,7 @@ type VirtRes struct {
CDRom []cdRomDevice `yaml:"cdrom"` CDRom []cdRomDevice `yaml:"cdrom"`
Network []networkDevice `yaml:"network"` Network []networkDevice `yaml:"network"`
Filesystem []filesystemDevice `yaml:"filesystem"` Filesystem []filesystemDevice `yaml:"filesystem"`
Auth *VirtAuth `yaml:"auth"`
conn libvirt.VirConnection conn libvirt.VirConnection
absent bool // cached state absent bool // cached state
@@ -93,13 +100,14 @@ func (obj *VirtRes) Init() error {
} }
libvirtInitialized = true libvirtInitialized = true
} }
if u, err := url.Parse(obj.URI); err != nil { var u *url.URL
return fmt.Errorf("%s[%s]: Parsing URI failed: %s Error: %s", obj.Kind(), obj.GetName(), obj.URI, err.Error()) var err error
} else { if u, err = url.Parse(obj.URI); err != nil {
switch u.Scheme { return errwrap.Wrapf(err, "%s[%s]: Parsing URI failed: %s", obj.Kind(), obj.GetName(), obj.URI)
case "lxc": }
obj.uriScheme = lxcURI switch u.Scheme {
} case "lxc":
obj.uriScheme = lxcURI
} }
obj.absent = (obj.Transient && obj.State == "shutoff") // machine shouldn't exist obj.absent = (obj.Transient && obj.State == "shutoff") // machine shouldn't exist
@@ -113,6 +121,16 @@ func (obj *VirtRes) Validate() error {
return nil return nil
} }
func (obj *VirtRes) connect() (conn libvirt.VirConnection, err error) {
if obj.Auth != nil {
conn, err = libvirt.NewVirConnectionWithAuth(obj.URI, obj.Auth.Username, obj.Auth.Password)
}
if obj.Auth == nil || err != nil {
conn, err = libvirt.NewVirConnection(obj.URI)
}
return
}
// Watch is the primary listener for this resource and it outputs events. // Watch is the primary listener for this resource and it outputs events.
func (obj *VirtRes) Watch(processChan chan event.Event) error { func (obj *VirtRes) Watch(processChan chan event.Event) error {
if obj.IsWatching() { if obj.IsWatching() {
@@ -132,7 +150,7 @@ func (obj *VirtRes) Watch(processChan chan event.Event) error {
return time.After(time.Duration(500) * time.Millisecond) // 1/2 the resolution of converged timeout return time.After(time.Duration(500) * time.Millisecond) // 1/2 the resolution of converged timeout
} }
conn, err := libvirt.NewVirConnection(obj.URI) conn, err := obj.connect()
if err != nil { if err != nil {
return fmt.Errorf("Connection to libvirt failed with: %s", err) return fmt.Errorf("Connection to libvirt failed with: %s", err)
} }
@@ -368,7 +386,7 @@ func (obj *VirtRes) CheckApply(apply bool) (bool, error) {
} }
var err error var err error
obj.conn, err = libvirt.NewVirConnection(obj.URI) obj.conn, err = obj.connect()
if err != nil { if err != nil {
return false, fmt.Errorf("Connection to libvirt failed with: %s", err) return false, fmt.Errorf("Connection to libvirt failed with: %s", err)
} }