Skip to content

Commit 9d7ebaf

Browse files
pierre-emmanuelJopenshift-merge-robot
authored andcommittedFeb 25, 2020
Add exoscale provider
Signed-off-by: Pierre-Emmanuel Jacquier <[email protected]> fixup! Add exoscale provider Signed-off-by: Pierre-Emmanuel Jacquier <[email protected]>
1 parent 089f7a0 commit 9d7ebaf

File tree

6 files changed

+43
-17
lines changed

6 files changed

+43
-17
lines changed
 

‎src/cmd-buildextend-exoscale

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cmd-ore-wrapper

‎src/coreos-assembler

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ cmd=${1:-}
4343
build_commands="init fetch build run prune clean list"
4444
# commands more likely to be used in a prod pipeline only
4545
advanced_build_commands="buildprep buildupload oscontainer"
46-
buildextend_commands="aws azure gcp ibmcloud installer live metal openstack qemu vmware vultr"
46+
buildextend_commands="aws azure gcp ibmcloud installer live metal openstack qemu vmware vultr exoscale"
4747
utility_commands="tag sign compress koji-upload kola aws-replicate remote-prune"
4848
other_commands="shell meta"
4949
if [ -z "${cmd}" ]; then

‎src/cosalib/cli.py

+20-16
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,29 @@
1010
aws,
1111
azure,
1212
gcp,
13-
vultr
13+
vultr,
14+
exoscale
1415
)
1516

1617
CLOUD_CLI_TARGET = {
17-
"aws": (aws.aws_cli,
18-
aws.aws_run_ore,
19-
aws.aws_run_ore_replicate),
20-
"aliyun": (aliyun.aliyun_cli,
21-
aliyun.aliyun_run_ore,
22-
aliyun.aliyun_run_ore_replicate),
23-
"azure": (azure.azure_cli,
24-
azure.azure_run_ore,
25-
azure.azure_run_ore_replicate),
26-
"gcp": (gcp.gcp_cli,
27-
gcp.gcp_run_ore,
28-
gcp.gcp_run_ore_replicate),
29-
"vultr": (vultr.vultr_cli,
30-
vultr.vultr_run_ore,
31-
vultr.vultr_run_ore_replicate),
18+
"aws": (aws.aws_cli,
19+
aws.aws_run_ore,
20+
aws.aws_run_ore_replicate),
21+
"aliyun": (aliyun.aliyun_cli,
22+
aliyun.aliyun_run_ore,
23+
aliyun.aliyun_run_ore_replicate),
24+
"azure": (azure.azure_cli,
25+
azure.azure_run_ore,
26+
azure.azure_run_ore_replicate),
27+
"gcp": (gcp.gcp_cli,
28+
gcp.gcp_run_ore,
29+
gcp.gcp_run_ore_replicate),
30+
"vultr": (vultr.vultr_cli,
31+
vultr.vultr_run_ore,
32+
vultr.vultr_run_ore_replicate),
33+
"exoscale": (exoscale.exoscale_cli,
34+
exoscale.exoscale_run_ore,
35+
exoscale.exoscale_run_ore_replicate),
3236
}
3337

3438

‎src/cosalib/exoscale.py

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
def exoscale_run_ore(build, args):
2+
"""
3+
Placeholder to upload a qcow2 image to Exoscale.
4+
"""
5+
raise Exception("not implemented yet")
6+
7+
8+
def exoscale_run_ore_replicate(*args, **kwargs):
9+
raise Exception("not implemented yet")
10+
11+
12+
def exoscale_cli(parser):
13+
"""
14+
Extend a parser with the Exoscale options
15+
"""
16+
return parser

‎src/cosalib/qemuvariants.py

+4
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@
9595
"vultr": {
9696
"image_format": "raw",
9797
"platform": "vultr",
98+
},
99+
"exoscale": {
100+
"image_format": "qcow2",
101+
"platform": "exoscale",
98102
}
99103
}
100104

‎src/schema/v1.json

+1
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@
178178
"azure",
179179
"build-url",
180180
"gcp",
181+
"exoscale",
181182
"oscontainer",
182183
"pkgdiff",
183184

0 commit comments

Comments
 (0)
Please sign in to comment.