x-move/iconograph
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Remove more --image-type

Browse Source
This commit is contained in:
Ian Gulliver
2016-03-31 17:29:10 -07:00
parent 5c84ce70cd
commit 0052478fbf
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/modules/autoimage.py
View File

@@ -27,11 +27,6 @@ parser.add_argument(
dest='device', dest='device',
action='store', action='store',
required=True) required=True)
parser.add_argument(
'--image-type',
dest='image_type',
action='store',
required=True)
parser.add_argument( parser.add_argument(
'--persistent-percent', '--persistent-percent',
dest='persistent_percent', dest='persistent_percent',
@@ -76,12 +71,11 @@ description "AutoImage"
start on filesystem start on filesystem
script script
/autoimage/server/image.py --device=%(device)s --persistent-percent=%(persistent_percent)d --ca-cert=/autoimage/config/ca.cert.pem --image-type=%(image_type)s --base-url=%(base_url)s /autoimage/server/image.py --device=%(device)s --persistent-percent=%(persistent_percent)d --ca-cert=/autoimage/config/ca.cert.pem --base-url=%(base_url)s
end script end script
""" % { """ % {
'device': FLAGS.device, 'device': FLAGS.device,
'persistent_percent': FLAGS.persistent_percent, 'persistent_percent': FLAGS.persistent_percent,
'image_type': FLAGS.image_type,
'base_url': FLAGS.base_url, 'base_url': FLAGS.base_url,
}) })

8
server/modules/iconograph.py
View File

@@ -22,11 +22,6 @@ parser.add_argument(
dest='chroot_path', dest='chroot_path',
action='store', action='store',
required=True) required=True)
parser.add_argument(
'--image-type',
dest='image_type',
action='store',
required=True)
FLAGS = parser.parse_args() FLAGS = parser.parse_args()
@@ -58,8 +53,7 @@ def main():
path = os.path.join(FLAGS.chroot_path, 'iconograph', 'client', 'flags') path = os.path.join(FLAGS.chroot_path, 'iconograph', 'client', 'flags')
with open(path, 'w') as fh: with open(path, 'w') as fh:
fh.write('--image-type=%(image_type)s --base-url=%(base_url)s\n' % { fh.write('--base-url=%(base_url)s\n' % {
'image_type': FLAGS.image_type,
'base_url': FLAGS.base_url, 'base_url': FLAGS.base_url,
}) })