saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

use correct template names

Browse source
This commit is contained in:
Anthony Shaw 2016-07-25 13:38:58 +10:00
parent bffdd9387d
commit 836002d3d0
No known key found for this signature in database
GPG key ID: AB4A19AE1CE85744
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
salt/utils/extend.py
View file

@ -7,9 +7,10 @@ from datetime import date
import tempfile
from shutil import copytree
import logging
log = logging.getLogger(__name__)
try:
import logging
log = logging.getLogger(__name__)
from cookiecutter.main import cookiecutter as cookie
import cookiecutter.prompt as prompt
HAS_COOKIECUTTER = True
@ -23,14 +24,15 @@ MODULE_OPTIONS = [
def run(extension=None, name=None, salt_dir='.', merge=False, temp_dir=None):
assert HAS_COOKIECUTTER, "Cookiecutter is not installed, please install using pip"
assert HAS_COOKIECUTTER, "Cookiecutter is not installed, please install using pip or " \
"from https://github.com/audreyr/cookiecutter"
if extension is None:
print('Choose which kind of extension you are developing for SaltStack')
extension_type = 'Extension type'
extension_type = prompt.read_user_choice(extension_type, MODULE_OPTIONS)
extension_type = prompt.read_user_choice(extension_type, MODULE_OPTIONS)[0]
else:
assert extension in list(zip(MODULE_OPTIONS)[0]), "Module extension option not valid"
assert extension in list(zip(*MODULE_OPTIONS))[0], "Module extension option not valid"
extension_type = extension
if name is None:
@ -39,7 +41,7 @@ def run(extension=None, name=None, salt_dir='.', merge=False, temp_dir=None):
short_description = prompt.read_user_variable('Short description of the module', '')
template_dir = 'templates/{0}'.format(extension_type[0])
template_dir = 'templates/{0}'.format(extension_type)
project_name = name
param_dict = {