add cacert config to specify custom CA certificate file
This commit is contained in:
parent
c909a27e7b
commit
67ce2da59e
|
@ -9,6 +9,8 @@ import (
|
||||||
"github.com/gophercloud/gophercloud"
|
"github.com/gophercloud/gophercloud"
|
||||||
"github.com/gophercloud/gophercloud/openstack"
|
"github.com/gophercloud/gophercloud/openstack"
|
||||||
"github.com/hashicorp/packer/template/interpolate"
|
"github.com/hashicorp/packer/template/interpolate"
|
||||||
|
"io/ioutil"
|
||||||
|
"crypto/x509"
|
||||||
)
|
)
|
||||||
|
|
||||||
// AccessConfig is for common configuration related to openstack access
|
// AccessConfig is for common configuration related to openstack access
|
||||||
|
@ -24,6 +26,7 @@ type AccessConfig struct {
|
||||||
Insecure bool `mapstructure:"insecure"`
|
Insecure bool `mapstructure:"insecure"`
|
||||||
Region string `mapstructure:"region"`
|
Region string `mapstructure:"region"`
|
||||||
EndpointType string `mapstructure:"endpoint_type"`
|
EndpointType string `mapstructure:"endpoint_type"`
|
||||||
|
CACertFile string `mapstructure:"cacert"`
|
||||||
ClientCertFile string `mapstructure:"cert"`
|
ClientCertFile string `mapstructure:"cert"`
|
||||||
ClientKeyFile string `mapstructure:"key"`
|
ClientKeyFile string `mapstructure:"key"`
|
||||||
|
|
||||||
|
@ -55,6 +58,9 @@ func (c *AccessConfig) Prepare(ctx *interpolate.Context) []error {
|
||||||
if c.Username == "" {
|
if c.Username == "" {
|
||||||
c.Username = os.Getenv("SDK_USERNAME")
|
c.Username = os.Getenv("SDK_USERNAME")
|
||||||
}
|
}
|
||||||
|
if c.CACertFile == "" {
|
||||||
|
c.CACertFile = os.Getenv("OS_CACERT")
|
||||||
|
}
|
||||||
if c.ClientCertFile == "" {
|
if c.ClientCertFile == "" {
|
||||||
c.ClientCertFile = os.Getenv("OS_CERT")
|
c.ClientCertFile = os.Getenv("OS_CERT")
|
||||||
}
|
}
|
||||||
|
@ -95,6 +101,16 @@ func (c *AccessConfig) Prepare(ctx *interpolate.Context) []error {
|
||||||
|
|
||||||
tls_config := &tls.Config{}
|
tls_config := &tls.Config{}
|
||||||
|
|
||||||
|
if c.CACertFile != "" {
|
||||||
|
caCert, err := ioutil.ReadFile(c.CACertFile)
|
||||||
|
if err != nil {
|
||||||
|
return []error{err}
|
||||||
|
}
|
||||||
|
caCertPool := x509.NewCertPool()
|
||||||
|
caCertPool.AppendCertsFromPEM(caCert)
|
||||||
|
tls_config.RootCAs = caCertPool
|
||||||
|
}
|
||||||
|
|
||||||
// If we have insecure set, then create a custom HTTP client that
|
// If we have insecure set, then create a custom HTTP client that
|
||||||
// ignores SSL errors.
|
// ignores SSL errors.
|
||||||
if c.Insecure {
|
if c.Insecure {
|
||||||
|
|
|
@ -76,6 +76,9 @@ builder.
|
||||||
server in. If this isn't specified, the default enforced by your OpenStack
|
server in. If this isn't specified, the default enforced by your OpenStack
|
||||||
cluster will be used. This may be required for some OpenStack clusters.
|
cluster will be used. This may be required for some OpenStack clusters.
|
||||||
|
|
||||||
|
- `cacert` (string) - Custom CA certificate file path.
|
||||||
|
If ommited the OS_CACERT environment variable can be used.
|
||||||
|
|
||||||
- `config_drive` (boolean) - Whether or not nova should use ConfigDrive for
|
- `config_drive` (boolean) - Whether or not nova should use ConfigDrive for
|
||||||
cloud-init metadata.
|
cloud-init metadata.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue