Add environment varibles for OpenStack flags
Some flags for the OpenStack driver did not have a corresponding environment variable. Among others, this is needed to run bats core tests with the OpenStack driver. Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
This commit is contained in:
Guillaume Giamarchi
parent
59545198ab
commit
a93aabadff
|
|
@ -41,28 +41,28 @@ Options:
|
||||||
|
|
||||||
Environment variables and default values:
|
Environment variables and default values:
|
||||||
|
|
||||||
| CLI option | Environment variable | Default |
|
| CLI option | Environment variable | Default |
|
||||||
|----------------------------------|------------------------|---------|
|
|----------------------------------|------------------------|-------------|
|
||||||
| `--openstack-auth-url` | `OS_AUTH_URL` | - |
|
| `--openstack-auth-url` | `OS_AUTH_URL` | - |
|
||||||
| `--openstack-flavor-name` | - | - |
|
| `--openstack-flavor-name` | `OS_FLAVOR_NAME` | - |
|
||||||
| `--openstack-flavor-id` | - | - |
|
| `--openstack-flavor-id` | `OS_FLAVOR_ID` | - |
|
||||||
| `--openstack-image-name` | - | - |
|
| `--openstack-image-name` | `OS_IMAGE_NAME` | - |
|
||||||
| `--openstack-image-id` | - | - |
|
| `--openstack-image-id` | `OS_IMAGE_ID` | - |
|
||||||
| `--openstack-insecure` | - | - |
|
| `--openstack-insecure` | `OS_INSECURE` | `false` |
|
||||||
| `--openstack-domain-name` | `OS_DOMAIN_NAME` | - |
|
| `--openstack-domain-name` | `OS_DOMAIN_NAME` | - |
|
||||||
| `--openstack-domain-id` | `OS_DOMAIN_ID` | - |
|
| `--openstack-domain-id` | `OS_DOMAIN_ID` | - |
|
||||||
| `--openstack-username` | `OS_USERNAME` | - |
|
| `--openstack-username` | `OS_USERNAME` | - |
|
||||||
| `--openstack-password` | `OS_PASSWORD` | - |
|
| `--openstack-password` | `OS_PASSWORD` | - |
|
||||||
| `--openstack-tenant-name` | `OS_TENANT_NAME` | - |
|
| `--openstack-tenant-name` | `OS_TENANT_NAME` | - |
|
||||||
| `--openstack-tenant-id` | `OS_TENANT_ID` | - |
|
| `--openstack-tenant-id` | `OS_TENANT_ID` | - |
|
||||||
| `--openstack-region` | `OS_REGION_NAME` | - |
|
| `--openstack-region` | `OS_REGION_NAME` | - |
|
||||||
| `--openstack-availability-zone` | `OS_AVAILABILITY_ZONE` | - |
|
| `--openstack-availability-zone` | `OS_AVAILABILITY_ZONE` | - |
|
||||||
| `--openstack-endpoint-type` | `OS_ENDPOINT_TYPE` | - |
|
| `--openstack-endpoint-type` | `OS_ENDPOINT_TYPE` | `publicURL` |
|
||||||
| `--openstack-net-name` | - | - |
|
| `--openstack-net-name` | `OS_NETWORK_NAME` | - |
|
||||||
| `--openstack-net-id` | - | - |
|
| `--openstack-net-id` | `OS_NETWORK_ID` | - |
|
||||||
| `--openstack-sec-groups` | - | - |
|
| `--openstack-sec-groups` | `OS_SECURITY_GROUPS` | - |
|
||||||
| `--openstack-floatingip-pool` | - | - |
|
| `--openstack-floatingip-pool` | `OS_FLOATINGIP_POOL` | - |
|
||||||
| `--openstack-ip-version` | `OS_IP_VERSION` | `4` |
|
| `--openstack-ip-version` | `OS_IP_VERSION` | `4` |
|
||||||
| `--openstack-ssh-user` | - | `root` |
|
| `--openstack-ssh-user` | `OS_SSH_USER` | `root` |
|
||||||
| `--openstack-ssh-port` | - | `22` |
|
| `--openstack-ssh-port` | `OS_SSH_PORT` | `22` |
|
||||||
| `--openstack-active-timeout` | - | `200` |
|
| `--openstack-active-timeout` | `OS_ACTIVE_TIMEOUT` | `200` |
|
||||||
|
|
|
||||||
|
|
@ -64,8 +64,9 @@ func GetCreateFlags() []cli.Flag {
|
||||||
Value: "",
|
Value: "",
|
||||||
},
|
},
|
||||||
cli.BoolFlag{
|
cli.BoolFlag{
|
||||||
Name: "openstack-insecure",
|
EnvVar: "OS_INSECURE",
|
||||||
Usage: "Disable TLS credential checking.",
|
Name: "openstack-insecure",
|
||||||
|
Usage: "Disable TLS credential checking.",
|
||||||
},
|
},
|
||||||
cli.StringFlag{
|
cli.StringFlag{
|
||||||
EnvVar: "OS_DOMAIN_ID",
|
EnvVar: "OS_DOMAIN_ID",
|
||||||
|
|
@ -122,44 +123,52 @@ func GetCreateFlags() []cli.Flag {
|
||||||
Value: "",
|
Value: "",
|
||||||
},
|
},
|
||||||
cli.StringFlag{
|
cli.StringFlag{
|
||||||
Name: "openstack-flavor-id",
|
EnvVar: "OS_FLAVOR_ID",
|
||||||
Usage: "OpenStack flavor id to use for the instance",
|
Name: "openstack-flavor-id",
|
||||||
Value: "",
|
Usage: "OpenStack flavor id to use for the instance",
|
||||||
|
Value: "",
|
||||||
},
|
},
|
||||||
cli.StringFlag{
|
cli.StringFlag{
|
||||||
Name: "openstack-flavor-name",
|
EnvVar: "OS_FLAVOR_NAME",
|
||||||
Usage: "OpenStack flavor name to use for the instance",
|
Name: "openstack-flavor-name",
|
||||||
Value: "",
|
Usage: "OpenStack flavor name to use for the instance",
|
||||||
|
Value: "",
|
||||||
},
|
},
|
||||||
cli.StringFlag{
|
cli.StringFlag{
|
||||||
Name: "openstack-image-id",
|
EnvVar: "OS_IMAGE_ID",
|
||||||
Usage: "OpenStack image id to use for the instance",
|
Name: "openstack-image-id",
|
||||||
Value: "",
|
Usage: "OpenStack image id to use for the instance",
|
||||||
|
Value: "",
|
||||||
},
|
},
|
||||||
cli.StringFlag{
|
cli.StringFlag{
|
||||||
Name: "openstack-image-name",
|
EnvVar: "OS_IMAGE_NAME",
|
||||||
Usage: "OpenStack image name to use for the instance",
|
Name: "openstack-image-name",
|
||||||
Value: "",
|
Usage: "OpenStack image name to use for the instance",
|
||||||
|
Value: "",
|
||||||
},
|
},
|
||||||
cli.StringFlag{
|
cli.StringFlag{
|
||||||
Name: "openstack-net-id",
|
EnvVar: "OS_NETWORK_ID",
|
||||||
Usage: "OpenStack network id the machine will be connected on",
|
Name: "openstack-net-id",
|
||||||
Value: "",
|
Usage: "OpenStack network id the machine will be connected on",
|
||||||
|
Value: "",
|
||||||
},
|
},
|
||||||
cli.StringFlag{
|
cli.StringFlag{
|
||||||
Name: "openstack-net-name",
|
EnvVar: "OS_NETWORK_NAME",
|
||||||
Usage: "OpenStack network name the machine will be connected on",
|
Name: "openstack-net-name",
|
||||||
Value: "",
|
Usage: "OpenStack network name the machine will be connected on",
|
||||||
|
Value: "",
|
||||||
},
|
},
|
||||||
cli.StringFlag{
|
cli.StringFlag{
|
||||||
Name: "openstack-sec-groups",
|
EnvVar: "OS_SECURITY_GROUPS",
|
||||||
Usage: "OpenStack comma separated security groups for the machine",
|
Name: "openstack-sec-groups",
|
||||||
Value: "",
|
Usage: "OpenStack comma separated security groups for the machine",
|
||||||
|
Value: "",
|
||||||
},
|
},
|
||||||
cli.StringFlag{
|
cli.StringFlag{
|
||||||
Name: "openstack-floatingip-pool",
|
EnvVar: "OS_FLOATINGIP_POOL",
|
||||||
Usage: "OpenStack floating IP pool to get an IP from to assign to the instance",
|
Name: "openstack-floatingip-pool",
|
||||||
Value: "",
|
Usage: "OpenStack floating IP pool to get an IP from to assign to the instance",
|
||||||
|
Value: "",
|
||||||
},
|
},
|
||||||
cli.IntFlag{
|
cli.IntFlag{
|
||||||
EnvVar: "OS_IP_VERSION",
|
EnvVar: "OS_IP_VERSION",
|
||||||
|
|
@ -168,19 +177,22 @@ func GetCreateFlags() []cli.Flag {
|
||||||
Value: 4,
|
Value: 4,
|
||||||
},
|
},
|
||||||
cli.StringFlag{
|
cli.StringFlag{
|
||||||
Name: "openstack-ssh-user",
|
EnvVar: "OS_SSH_USER",
|
||||||
Usage: "OpenStack SSH user",
|
Name: "openstack-ssh-user",
|
||||||
Value: defaultSSHUser,
|
Usage: "OpenStack SSH user",
|
||||||
|
Value: defaultSSHUser,
|
||||||
},
|
},
|
||||||
cli.IntFlag{
|
cli.IntFlag{
|
||||||
Name: "openstack-ssh-port",
|
EnvVar: "OS_SSH_PORT",
|
||||||
Usage: "OpenStack SSH port",
|
Name: "openstack-ssh-port",
|
||||||
Value: defaultSSHPort,
|
Usage: "OpenStack SSH port",
|
||||||
|
Value: defaultSSHPort,
|
||||||
},
|
},
|
||||||
cli.IntFlag{
|
cli.IntFlag{
|
||||||
Name: "openstack-active-timeout",
|
EnvVar: "OS_ACTIVE_TIMEOUT",
|
||||||
Usage: "OpenStack active timeout",
|
Name: "openstack-active-timeout",
|
||||||
Value: defaultActiveTimeout,
|
Usage: "OpenStack active timeout",
|
||||||
|
Value: defaultActiveTimeout,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue