- Expand ARM resource naming to 3 digits
This commit is contained in:
Fred Park 2018-02-24 18:30:02 -08:00
Родитель e74ebcde90
Коммит e7c815810b
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 3C4D545F457737EB
3 изменённых файлов: 20 добавлений и 9 удалений

Просмотреть файл

@ -2,6 +2,17 @@
## [Unreleased]
### Changed
- Expand node error details
- Name resources for RemoteFS with 3 digits (e.g., 000 instead of 0) for
improved alpha ordering
### Fixed
- Remote FS cluster del with disks error
- Unintended interaction between native mode and custom images
- Update packer scripts and fix typos
- Minor doc updates
## [3.2.0] - 2018-02-21
### Added
- Custom Linux Mount support for `shared_data_volumes`. Please see the

Просмотреть файл

@ -1830,7 +1830,7 @@ def delete_storage_cluster(
continue
if len(data_disks) > 0:
async_ops['data_disks'].append(delete_managed_disks(
compute_client, config, data_disks,
resource_client, compute_client, config, data_disks,
resource_group=rfs.managed_disks.resource_group, wait=False))
# delete os disks
async_ops['os_disk'] = []
@ -1839,7 +1839,7 @@ def delete_storage_cluster(
if util.is_none_or_empty(os_disk):
continue
async_ops['os_disk'].append(delete_managed_disks(
compute_client, config, os_disk,
resource_client, compute_client, config, os_disk,
resource_group=rfs.storage_cluster.resource_group, wait=False,
confirm_override=True))
# delete nsg

Просмотреть файл

@ -3821,7 +3821,7 @@ def generate_virtual_machine_name(sc, i):
:rtype: str
:return: vm name
"""
return '{}-vm{}'.format(sc.hostname_prefix, i)
return '{}-vm{}'.format(sc.hostname_prefix, str(i).zfill(3))
def get_offset_from_virtual_machine_name(vm_name):
@ -3841,7 +3841,7 @@ def generate_virtual_machine_extension_name(sc, i):
:rtype: str
:return: vm extension name
"""
return '{}-vmext{}'.format(sc.hostname_prefix, i)
return '{}-vmext{}'.format(sc.hostname_prefix, str(i).zfill(3))
def generate_network_security_group_name(sc):
@ -3861,7 +3861,7 @@ def generate_network_security_inbound_rule_name(rule_name, i):
:rtype: str
:return: inbound rule name
"""
return '{}_in-{}'.format(rule_name, i)
return '{}_in-{}'.format(rule_name, str(i).zfill(3))
def generate_network_security_inbound_rule_description(rule_name, i):
@ -3871,7 +3871,7 @@ def generate_network_security_inbound_rule_description(rule_name, i):
:rtype: str
:return: inbound description
"""
return '{} inbound ({})'.format(rule_name, i)
return '{} inbound ({})'.format(rule_name, str(i).zfill(3))
def generate_public_ip_name(sc, i):
@ -3881,7 +3881,7 @@ def generate_public_ip_name(sc, i):
:rtype: str
:return: public ip name
"""
return '{}-pip{}'.format(sc.hostname_prefix, i)
return '{}-pip{}'.format(sc.hostname_prefix, str(i).zfill(3))
def generate_hostname(sc, i):
@ -3891,7 +3891,7 @@ def generate_hostname(sc, i):
:rtype: str
:return: hostname
"""
return '{}{}'.format(sc.hostname_prefix, i)
return '{}{}'.format(sc.hostname_prefix, str(i).zfill(3))
def generate_network_interface_name(sc, i):
@ -3901,7 +3901,7 @@ def generate_network_interface_name(sc, i):
:rtype: str
:return: network interface name
"""
return '{}-ni{}'.format(sc.hostname_prefix, i)
return '{}-ni{}'.format(sc.hostname_prefix, str(i).zfill(3))
def get_file_server_glusterfs_volume_name(sc):