Skip to content

Commit e5ae657

Browse files
committed
Update gsb format and enhance gsb check function.
1 parent c769401 commit e5ae657

File tree

6 files changed

+39
-262
lines changed

6 files changed

+39
-262
lines changed

gemini_solution_builder/templates/base/LICENSE

Lines changed: 0 additions & 202 deletions
This file was deleted.

gemini_solution_builder/templates/base/configure/salt/logstash/files/linux/logstash-forwarder.conf

Lines changed: 0 additions & 24 deletions
This file was deleted.

gemini_solution_builder/templates/base/configure/salt/salt_config.sls

Lines changed: 0 additions & 36 deletions
This file was deleted.
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
create_site:
2+
- parameter: private_network
3+
forms: ChoiceField
4+
label: Network
5+
# TODO We need to define general syntex on YAML for network
6+
widget:
7+
forms: Select
8+
attrs:
9+
- class: form-control
10+
- required: required
11+
- parameter: image
12+
forms: ChoiceField
13+
label: VM Image
14+
choices:
15+
- Windows7-2017.2.0: Windows7-2017.2.0
16+
- Ubuntu14.04-2017.2.0: Ubuntu14.04-2017.2.0
17+
widget:
18+
forms: Select
19+
attrs:
20+
- class: form-control
21+
- parameter: flavor
22+
forms: ChoiceField
23+
label: Server Size
24+
choices:
25+
- 1core2GBmemory20GBdisk: 1core2GBmemory20GBdisk
26+
- 2cores4GBmemory40GBdisk: 2cores4GBmemory40GBdisk
27+
- 4cores8GBmemory80GBdisk: 4cores8GBmemory80GBdisk
28+
- 8cores16GBmemory160GBdisk: 8cores16GBmemory160GBdisk
29+
widget:
30+
forms: Select
31+
attrs:
32+
- class: form-control

gemini_solution_builder/templates/base/template/heat/deploy.yaml renamed to gemini_solution_builder/templates/base/site.yaml.mako

File renamed without changes.

gemini_solution_builder/version_mapping.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,13 @@ def get_version_mapping_from_solution(solution_path):
6868
if not utils.exists(meta_path):
6969
errors.WrongSolutionDirectoryError(
7070
'Wrong path to the solution, cannot find "%s" file', meta_path)
71+
raise Exception('cannot find %s file' % meta_path)
72+
73+
site_path = join_path(solution_path, 'site.yaml')
74+
if not utils.exists(site_path):
75+
errors.WrongSolutionDirectoryError(
76+
'Wrong path to the solution, cannot find "%s" file', site_path)
77+
raise Exception('cannot find %s file' % site_path)
7178

7279
meta = utils.parse_yaml(meta_path)
7380
package_version = meta.get('version')

0 commit comments

Comments
 (0)