Merge "Add support for kubernetes deployment"

diff --combined apex/overcloud/deploy.py
index c7a8e40,92b42ff..db7e42c
--- 1/apex/overcloud/deploy.py
--- 2/apex/overcloud/deploy.py
+++ b/apex/overcloud/deploy.py
@@@ -204,6 -204,11 +204,11 @@@ def create_deploy_cmd(ds, ns, inv, tmp_
      if ds_opts['sriov']:
          prep_sriov_env(ds, tmp_dir)
  
+     # Check for 'k8s' here intentionally, as we may support other values
+     # such as openstack/openshift for 'vim' option.
+     if ds_opts['vim'] == 'k8s':
+         deploy_options.append('kubernetes-environment.yaml')
+ 
      if virtual:
          deploy_options.append('virtual-environment.yaml')
      else:
@@@ -405,11 -410,6 +410,11 @@@ def prep_image(ds, ns, img, tmp_dir, ro
              {con.VIRT_RUN_CMD: 'systemctl daemon-reload'},
              {con.VIRT_RUN_CMD: 'systemctl enable losetup.service'},
          ])
 +    # TODO(trozet) remove this after LP#173474 is fixed
 +    dhcp_unit = '/usr/lib/systemd/system/dhcp-interface@.service'
 +    virt_cmds.append(
 +        {con.VIRT_RUN_CMD: "crudini --del {} Unit "
 +                           "ConditionPathExists".format(dhcp_unit)})
      virt_utils.virt_customize(virt_cmds, tmp_oc_image)
      logging.info("Overcloud image customization complete")
      return patched_containers