Merge "Add argument types for deploy.py"

diff --combined apex/deploy.py
index 7900170,c374e2e..6866945
--- 1/apex/deploy.py
--- 2/apex/deploy.py
+++ b/apex/deploy.py
@@@ -64,8 -64,7 +64,8 @@@ def validate_cross_settings(deploy_sett
      # "$tenant_nic_mapping_compute_members
  
  
 -def build_vms(inventory, network_settings):
 +def build_vms(inventory, network_settings,
 +              template_dir='/usr/share/opnfv-apex'):
      """
      Creates VMs and configures vbmc and host
      :param inventory:
@@@ -83,8 -82,7 +83,8 @@@
              name, volume_path,
              baremetal_interfaces=network_settings.enabled_network_list,
              memory=node['memory'], cpus=node['cpu'],
 -            macs=[node['mac_address']])
 +            macs=[node['mac_address']],
 +            template_dir=template_dir)
          virt_utils.host_setup({name: node['pm_port']})
  
  
@@@ -125,22 -123,26 +125,26 @@@ def create_deploy_parser()
      deploy_parser.add_argument('--virtual-computes',
                                 dest='virt_compute_nodes',
                                 default=1,
+                                type=int,
                                 help='Number of Virtual Compute nodes to create'
                                      ' and use during deployment (defaults to 1'
                                      ' for noha and 2 for ha)')
      deploy_parser.add_argument('--virtual-cpus',
                                 dest='virt_cpus',
                                 default=4,
+                                type=int,
                                 help='Number of CPUs to use per Overcloud VM in'
                                      ' a virtual deployment (defaults to 4)')
      deploy_parser.add_argument('--virtual-default-ram',
                                 dest='virt_default_ram',
                                 default=8,
+                                type=int,
                                 help='Amount of default RAM to use per '
                                      'Overcloud VM in GB (defaults to 8).')
      deploy_parser.add_argument('--virtual-compute-ram',
                                 dest='virt_compute_ram',
                                 default=None,
+                                type=int,
                                 help='Amount of RAM to use per Overcloud '
                                      'Compute VM in GB (defaults to 8). '
                                      'Overrides --virtual-default-ram arg for '
@@@ -286,7 -288,7 +290,7 @@@ def main()
              uc_external = True
          if args.virtual:
              # create all overcloud VMs
 -            build_vms(inventory, net_settings)
 +            build_vms(inventory, net_settings, args.deploy_dir)
          else:
              # Attach interfaces to jumphost for baremetal deployment
              jump_networks = ['admin']
@@@ -313,7 -315,6 +317,7 @@@
          else:
              root_pw = None
          undercloud = uc_lib.Undercloud(args.image_dir,
 +                                       args.deploy_dir,
                                         root_pw=root_pw,
                                         external_network=uc_external)
          undercloud.start()