Skip to content

Commit 2ba6d93

Browse files
hdamecharlaKimmo Forsshjstam
authored
Final PR for release v3.9.3.0 (#500)
* Merge from main to experimental (#490) * remove duplicate definitions * remove duplicate --------- Co-authored-by: Kimmo Forss <kimforss@microsoft.com> * Prepare for hotfix 3.9.2.0 * Add permissions for control plane SPN * Updated variable name * Change provider for network links * Undo * Change provider * Update the ref in the resources.yml (cherry picked from commit 082613a) * changes required for release 3.9.2.0 * skip resource provider * HotFix 3.9.3 * Preparation for hotfix release 3.9.3 * Add the missing exports * Update advanced state management * move second parameter * Add verbosity * Update pipeline * remove the vault * remove the quotes * add the getopt values * move the order * Don't create the configuration variables * Switch the if statement * Don't reset the step * Add the support for test only for workload zone as well * Name rationalization * Add support for multiple IP ranges * Using a list * adress space check * change the address space to list * use the correct output * Use the renamed output storageaccount_resourcegroup_name * Don't perform deployment if not logged on as SPN * format * simplify network logic * Fix the logic for deployer configuration * Fix deployer and flatten the list of vnets * Fix the list of vnets * remove the set statements * Version update and fault domain counter * Update the template * Web App updates * Variable renames * Update pipeline * Package updates * Add support for multiple address ranges * Change HTML IDs * deployment task * Update Azure Identity * More informative task names * Feng shui * change the dns creation logic * Fixes for IPs * Default upgrade packages to false * Switch to use instance metadata * Add support for extending packages, mounts etc * Rel 9.2 support * Add support for dynamically retrieval of SWPM10 * hdbuserstore updates * pacemaker updates * Load Balancer timeout updates * Format the Terraform files, add support for tags for all resources * Start documentation of variables * Add support for providing tags for all resources * Support deployerless deployments * Add missing tags * Web App updates (tag support) * Add a dependency on the private end point * Add dependency for container * Work on the dependency map * Add a dependency on the storage account network rules * Make the public access same for both storage accounts * change the dependency order * store the state file if failure when removing * Adding the missing parameters * Set permissions on variable groups * Fix the Invoke-Restmethod call * Allow resetting of PAT * Fix typo * Resetting of PAT * allow reusing of repo * Add permissions to pipelines * Simplify the query * Add a pause * Remove default access for all pipelines * Don't show Invoke-RestMethod response * Add pipelines permissions for pool * Don't set permissions on pools (yet) * Add permissions on agent pools * Use the queue id and not the pool ID * Add more info * Final version for next release * prepare for release 3.9.3.0 * install lint 6.20.3 for the workflow as we are not ready to 6.21 yet. * suppress tracing when checking variables * Lint fixes * Linting * remove extended character * Pull in main * Several improvements and additions for deploying DB2 (#496) * Bugfix nproc unlimited for dbsidadm group, not db2sidadm group * Use virtual_host from hostvars (inventory) for DB2 installation * Fixed DB2 log_dir mountpoint DB2 log_dir was mounted on /log/SID/dir instead of /db2/SID/log_dir * Fix Agent_IP variable for sap_library * Remove become and orchestration user for delegated VmAgentActions tasks * Improve 2.10-sap-notes tasks * Optimize SAP OS USERS and Group Creation (user_nw) tasks * Remove unused input-api variables * Add custom virtual_hostname variabels for db, ers, scs and pas * Add vars for ASCS/ERS NFS filesystem devices when not using AFS or ANF * Bugfix data source azuread_service_principal Error: Unsupported argument on imports.tf line 49, in data "azuread_service_principal" "sp": client_id = local.spn.client_id An argument named "client_id" is not expected here. one of `application_id,display_name,object_id` must be specified * Contain setting of HANA schema name to only execute when deploying HANA * alingment on task and set execution bit for the acss-registration shell script. --------- Co-authored-by: Kimmo Forss <kimforss@microsoft.com> Co-authored-by: Harm Jan Stam <harmjan+git@harmjan.com>
1 parent 18488ed commit 2ba6d93

49 files changed

Lines changed: 247 additions & 323 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎deploy/ansible/playbook_04_00_01_db_ha.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -587,11 +587,11 @@
587587
domain_service_password: "{{ hostvars.localhost.adsvc_password }}"
588588
witness_storage_account_name: "{{ hostvars.localhost.witness_storage_account_name }}"
589589
witness_storage_account_key: "{{ hostvars.localhost.witness_storage_account_key }}"
590-
win_sql_svc_account: '{{ sql_svc_account }}'
591-
win_sql_svc_password: '{{ sql_svc_password }}'
592-
win_sqlagent_svc_account: '{{ sql_agent_account }}'
593-
win_sqlagent_svc_password: '{{ sql_agent_password }}'
594-
scs_server_name: "{{ scs_server }}"
590+
win_sql_svc_account: "{{ sql_svc_account }}"
591+
win_sql_svc_password: "{{ sql_svc_password }}"
592+
win_sqlagent_svc_account: "{{ sql_agent_account }}"
593+
win_sqlagent_svc_password: "{{ sql_agent_password }}"
594+
scs_server_name: "{{ custom_scs_virtual_hostname | default(scs_server, true) }}"
595595
tags:
596596
- 4.4.1.0-mssql-alwayson
597597

‎deploy/ansible/playbook_05_00_00_sap_scs_install.yaml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,6 @@
222222
ansible.builtin.set_fact:
223223
tier: scs
224224
main_password: "{{ hostvars.localhost.sap_password }}"
225-
scs_high_availability: "{{ scs_high_availability }}"
226225
sapbits_location_base_path: "{{ hostvars.localhost.sapbits_location_base_path }}"
227226
sapbits_sas_token: "{{ hostvars.localhost.sapbits_sas_token }}"
228227
always_upload_jinja_templates: false
@@ -324,7 +323,6 @@
324323
svc_password: "{{ hostvars.localhost.svcadm_password }}"
325324
primary_node: "{{ ansible_play_hosts_all[0] }}"
326325
secondary_node: ""
327-
ers_virtual_hostname: "{{ sap_sid | lower }}ers{{ ers_instance_number }}cl2"
328326
loop: "{{ all_sids }}"
329327
loop_control:
330328
loop_var: sid_to_be_deployed
@@ -430,8 +428,6 @@
430428
fencing_spn_client_pwd: "{% if not use_msi_for_clusters %}{{ hostvars.localhost.sap_fencing_spn_pwd }}{% endif %}"
431429
fencing_spn_tenant_id: "{% if not use_msi_for_clusters %}{{ hostvars.localhost.sap_fencing_spn_tenant_id }}{% endif %}"
432430
always_upload_jinja_templates: false
433-
scs_virtual_hostname: "{{ sap_sid | lower }}scs{{ scs_instance_number }}cl1"
434-
ers_virtual_hostname: "{{ sap_sid | lower }}ers{{ ers_instance_number }}cl2"
435431
tags:
436432
- always
437433

@@ -507,6 +503,8 @@
507503
public: true
508504
vars:
509505
scs_instance_number: "{{ sid_to_be_deployed.ascs_inst_no }}"
506+
scs_virtual_hostname: "{{ custom_scs_virtual_hostname | default(sap_sid | lower ~ 'scs' ~ scs_instance_number ~ 'cl1', true) }}"
507+
ers_virtual_hostname: "{{ custom_ers_virtual_hostname | default(sap_sid | lower ~ 'ers' ~ ers_instance_number ~ 'cl2', true) }}"
510508
loop: "{{ all_sids }}"
511509
loop_control:
512510
loop_var: sid_to_be_deployed
@@ -625,9 +623,8 @@
625623
secondary_node_ip_ers: "{{ hostvars[ansible_play_hosts_all[1]]['ansible_eth0']['ipv4']['address'] }}"
626624
ansible_winrm_transport: credssp
627625
ansible_winrm_server_cert_validation: ignore
628-
scs_virtual_hostname: "{{ sap_sid | lower }}scs{{ scs_instance_number }}cl1"
629-
ers_virtual_hostname: "{{ sap_sid | lower }}ers{{ ers_instance_number }}cl2"
630-
626+
scs_virtual_hostname: "{{ custom_scs_virtual_hostname | default(sap_sid | lower ~ 'scs' ~ scs_instance_number ~ 'cl1', true) }}"
627+
ers_virtual_hostname: "{{ custom_ers_virtual_hostname | default(sap_sid | lower ~ 'ers' ~ ers_instance_number ~ 'cl2', true) }}"
631628
loop: "{{ all_sids }}"
632629
loop_control:
633630
loop_var: sid_to_be_deployed

‎deploy/ansible/roles-db/4.0.0-hdb-install/tasks/main.yaml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
# +------------------------------------4--------------------------------------*/
1414
- name: "SAP HANA: Set BOM facts"
1515
ansible.builtin.set_fact:
16-
sap_inifile: "hdbserver_{{ ansible_hostname }}_{{ sap_sid }}_install.rsp"
17-
hana_host: "{% if db_high_availability %}{{ ansible_hostname }}{% else %}{{ virtual_host }}{% endif %}"
16+
sap_inifile: "hdbserver_{{ virtual_host }}_{{ sap_sid }}_install.rsp"
1817
dir_params: "{{ tmp_directory }}/.params"
1918

2019
# 0x) Create hidden directory for parameter files
@@ -68,7 +67,7 @@
6867
_rsp_component_root: "../COMPONENTS"
6968
_rsp_components: "{{ hana_components }}"
7069
_rsp_sapmnt: "/hana/shared" # Default Value
71-
_rsp_hostname: "{{ hana_host }}"
70+
_rsp_hostname: "{{ virtual_host }}"
7271
_rsp_sid: "{{ db_sid | upper }}"
7372
_rsp_number: "{{ db_instance_number }}"
7473
_rsp_system_usage: "custom"
@@ -81,11 +80,11 @@
8180

8281
- name: "SAP HANA: installation"
8382
block:
84-
- name: "SAP HANA: Execute hdblcm on {{ (hana_host) }}"
83+
- name: "SAP HANA: Execute hdblcm on {{ virtual_host }}"
8584
ansible.builtin.shell: |
8685
umask {{ custom_umask | default('022') }} ;
8786
chmod 755 /usr/sap;
88-
./hdblcm --batch --action=install --hostname {{ hana_host }} --configfile='{{ dir_params }}/{{ sap_inifile }}'
87+
./hdblcm --batch --action=install --hostname {{ virtual_host }} --configfile='{{ dir_params }}/{{ sap_inifile }}'
8988
args:
9089
chdir: "{{ target_media_location }}/CD_HDBSERVER/SAP_HANA_DATABASE"
9190
creates: "/etc/sap_deployment_automation/{{ db_sid | upper }}/sap_deployment_hdb.txt"
@@ -105,13 +104,13 @@
105104
when: hana_installation.rc == 1
106105

107106

108-
- name: "SAP HANA: Re-execute hdblcm on {{ (hana_host) }} and rescue"
107+
- name: "SAP HANA: Re-execute hdblcm on {{ virtual_host }} and rescue"
109108
block:
110-
- name: "SAP HANA: Re-execute hdblcm on {{ (hana_host) }}"
109+
- name: "SAP HANA: Re-execute hdblcm on {{ virtual_host }}"
111110
ansible.builtin.shell: |
112111
umask {{ custom_umask | default('022') }} ;
113112
chmod 755 /usr/sap;
114-
./hdblcm --batch --action=install --hostname {{ hana_host }} --configfile='{{ dir_params }}/{{ sap_inifile }}'
113+
./hdblcm --batch --action=install --hostname {{ virtual_host }} --configfile='{{ dir_params }}/{{ sap_inifile }}'
115114
args:
116115
chdir: "{{ target_media_location }}/CD_HDBSERVER/SAP_HANA_DATABASE"
117116
creates: "/etc/sap_deployment_automation/{{ db_sid | upper }}/sap_deployment_hdb.txt"

0 commit comments

Comments
 (0)