Skip to content

Commit 98f2aae

Browse files
Enable terraform peering for Azure
1 parent a94b072 commit 98f2aae

3 files changed

Lines changed: 9 additions & 1 deletion

File tree

data/sles4sap/qe_sap_deployment/sles4sap_azure_generic_maintenance.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ terraform:
1919
public_key: '%SLES4SAP_PUBSSHKEY%'
2020
os_image: '%SLES4SAP_OS_IMAGE_NAME%'
2121

22+
# IBSM PEERING VARIABLES
23+
ibsm_rg: '%IBSM_RG%'
24+
ibsm_vnet_name: '%IBSM_VNET%'
25+
2226
# REMOTE PYTHON
2327
hana_remote_python: '%ANSIBLE_REMOTE_PYTHON%'
2428
iscsi_remote_python: '%ANSIBLE_REMOTE_PYTHON%'

lib/qesapdeployment.pm

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2171,6 +2171,10 @@ sub qesap_az_simple_peering_delete {
21712171

21722172
sub qesap_az_vnet_peering_delete {
21732173
my (%args) = @_;
2174+
if get_var('IBSM_VNET') {
2175+
record_info('PEERING MANAGED', 'Peering will be destroyed by terraform destroy');
2176+
return;
2177+
}
21742178
croak 'Missing mandatory target_group argument' unless $args{target_group};
21752179
$args{timeout} //= bmwqemu::scale_timeout(300);
21762180

tests/sles4sap/publiccloud/hana_sr_schedule_deployment.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ sub run {
3636
loadtest('sles4sap/publiccloud/qesap_terraform', name => 'deploy_qesap_terraform', run_args => $run_args, @_);
3737
if (check_var('IS_MAINTENANCE', 1)) {
3838
loadtest('sles4sap/publiccloud/clean_leftover_peerings', name => 'clean_leftover_peerings', run_args => $run_args, @_);
39-
loadtest('sles4sap/publiccloud/network_peering', name => 'network_peering', run_args => $run_args, @_);
39+
loadtest('sles4sap/publiccloud/network_peering', name => 'network_peering', run_args => $run_args, @_) unless get_var('IBSM_VNET');
4040
loadtest('sles4sap/publiccloud/add_server_to_hosts', name => 'add_server_to_hosts', run_args => $run_args, @_);
4141
loadtest('sles4sap/publiccloud/cluster_add_repos', name => 'cluster_add_repos', run_args => $run_args, @_);
4242
}

0 commit comments

Comments
 (0)