valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #31452 from anandxoriant/develop

Browse Source 
Updated win_organization_name default value for vmware driver
This commit is contained in:
Nicole Thomas 2016-02-24 08:27:27 -07:00
commit b32dd6d332
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/topics/cloud/vmware.rst
View File

@ -476,7 +476,7 @@ Set up an initial profile at ``/etc/salt/cloud.profiles`` or
During network configuration (if network specified), it is used to specify new administrator password for the machine.
``win_organization_name``
Specify windows vm user's organization. Default organization name is blank
Specify windows vm user's organization. Default organization name is Organization
VMware vSphere documentation:
https://www.vmware.com/support/developer/vc-sdk/visdk25pubs/ReferenceGuide/vim.vm.customization.UserData.html

2
salt/cloud/clouds/vmware.py
View File

@ -2238,7 +2238,7 @@ def create(vm_):
'win_password', vm_, __opts__, search_global=False, default=None
)
win_organization_name = config.get_cloud_config_value(
'win_organization_name', vm_, __opts__, search_global=False, default=''
'win_organization_name', vm_, __opts__, search_global=False, default='Organization'
)
plain_text = config.get_cloud_config_value(
'plain_text', vm_, __opts__, search_global=False, default=False