Skip to content

Commit

Permalink
Final PR for release v3.9.3.0 (#500)
Browse files Browse the repository at this point in the history 
* Merge from main to experimental (#490)

* remove duplicate definitions

* remove duplicate

---------

Co-authored-by: Kimmo Forss <[email protected]>

* 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 2408620)

* 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 <[email protected]>
Co-authored-by: Harm Jan Stam <[email protected]>
  • Loading branch information
@hdamecharla @hjstam
3 people authored Oct 27, 2023
1 parent 5e0764e commit fffac8c
Show file tree
Hide file tree
Showing 49 changed files with 247 additions and 323 deletions.
10 changes: 5 additions & 5 deletions deploy/ansible/playbook_04_00_01_db_ha.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -587,11 +587,11 @@
domain_service_password: "{{ hostvars.localhost.adsvc_password }}"
witness_storage_account_name: "{{ hostvars.localhost.witness_storage_account_name }}"
witness_storage_account_key: "{{ hostvars.localhost.witness_storage_account_key }}"
win_sql_svc_account: '{{ sql_svc_account }}'
win_sql_svc_password: '{{ sql_svc_password }}'
win_sqlagent_svc_account: '{{ sql_agent_account }}'
win_sqlagent_svc_password: '{{ sql_agent_password }}'
scs_server_name: "{{ scs_server }}"
win_sql_svc_account: "{{ sql_svc_account }}"
win_sql_svc_password: "{{ sql_svc_password }}"
win_sqlagent_svc_account: "{{ sql_agent_account }}"
win_sqlagent_svc_password: "{{ sql_agent_password }}"
scs_server_name: "{{ custom_scs_virtual_hostname | default(scs_server, true) }}"
tags:
- 4.4.1.0-mssql-alwayson

Expand Down
11 changes: 4 additions & 7 deletions deploy/ansible/playbook_05_00_00_sap_scs_install.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,6 @@
ansible.builtin.set_fact:
tier: scs
main_password: "{{ hostvars.localhost.sap_password }}"
scs_high_availability: "{{ scs_high_availability }}"
sapbits_location_base_path: "{{ hostvars.localhost.sapbits_location_base_path }}"
sapbits_sas_token: "{{ hostvars.localhost.sapbits_sas_token }}"
always_upload_jinja_templates: false
Expand Down Expand Up @@ -324,7 +323,6 @@
svc_password: "{{ hostvars.localhost.svcadm_password }}"
primary_node: "{{ ansible_play_hosts_all[0] }}"
secondary_node: ""
ers_virtual_hostname: "{{ sap_sid | lower }}ers{{ ers_instance_number }}cl2"
loop: "{{ all_sids }}"
loop_control:
loop_var: sid_to_be_deployed
Expand Down Expand Up @@ -430,8 +428,6 @@
fencing_spn_client_pwd: "{% if not use_msi_for_clusters %}{{ hostvars.localhost.sap_fencing_spn_pwd }}{% endif %}"
fencing_spn_tenant_id: "{% if not use_msi_for_clusters %}{{ hostvars.localhost.sap_fencing_spn_tenant_id }}{% endif %}"
always_upload_jinja_templates: false
scs_virtual_hostname: "{{ sap_sid | lower }}scs{{ scs_instance_number }}cl1"
ers_virtual_hostname: "{{ sap_sid | lower }}ers{{ ers_instance_number }}cl2"
tags:
- always

Expand Down Expand Up @@ -507,6 +503,8 @@
public: true
vars:
scs_instance_number: "{{ sid_to_be_deployed.ascs_inst_no }}"
scs_virtual_hostname: "{{ custom_scs_virtual_hostname | default(sap_sid | lower ~ 'scs' ~ scs_instance_number ~ 'cl1', true) }}"
ers_virtual_hostname: "{{ custom_ers_virtual_hostname | default(sap_sid | lower ~ 'ers' ~ ers_instance_number ~ 'cl2', true) }}"
loop: "{{ all_sids }}"
loop_control:
loop_var: sid_to_be_deployed
Expand Down Expand Up @@ -625,9 +623,8 @@
secondary_node_ip_ers: "{{ hostvars[ansible_play_hosts_all[1]]['ansible_eth0']['ipv4']['address'] }}"
ansible_winrm_transport: credssp
ansible_winrm_server_cert_validation: ignore
scs_virtual_hostname: "{{ sap_sid | lower }}scs{{ scs_instance_number }}cl1"
ers_virtual_hostname: "{{ sap_sid | lower }}ers{{ ers_instance_number }}cl2"

scs_virtual_hostname: "{{ custom_scs_virtual_hostname | default(sap_sid | lower ~ 'scs' ~ scs_instance_number ~ 'cl1', true) }}"
ers_virtual_hostname: "{{ custom_ers_virtual_hostname | default(sap_sid | lower ~ 'ers' ~ ers_instance_number ~ 'cl2', true) }}"
loop: "{{ all_sids }}"
loop_control:
loop_var: sid_to_be_deployed
Expand Down
15 changes: 7 additions & 8 deletions deploy/ansible/roles-db/4.0.0-hdb-install/tasks/main.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
# +------------------------------------4--------------------------------------*/
- name: "SAP HANA: Set BOM facts"
ansible.builtin.set_fact:
sap_inifile: "hdbserver_{{ ansible_hostname }}_{{ sap_sid }}_install.rsp"
hana_host: "{% if db_high_availability %}{{ ansible_hostname }}{% else %}{{ virtual_host }}{% endif %}"
sap_inifile: "hdbserver_{{ virtual_host }}_{{ sap_sid }}_install.rsp"
dir_params: "{{ tmp_directory }}/.params"

# 0x) Create hidden directory for parameter files
Expand Down Expand Up @@ -68,7 +67,7 @@
_rsp_component_root: "../COMPONENTS"
_rsp_components: "{{ hana_components }}"
_rsp_sapmnt: "/hana/shared" # Default Value
_rsp_hostname: "{{ hana_host }}"
_rsp_hostname: "{{ virtual_host }}"
_rsp_sid: "{{ db_sid | upper }}"
_rsp_number: "{{ db_instance_number }}"
_rsp_system_usage: "custom"
Expand All @@ -81,11 +80,11 @@

- name: "SAP HANA: installation"
block:
- name: "SAP HANA: Execute hdblcm on {{ (hana_host) }}"
- name: "SAP HANA: Execute hdblcm on {{ virtual_host }}"
ansible.builtin.shell: |
umask {{ custom_umask | default('022') }} ;
chmod 755 /usr/sap;
./hdblcm --batch --action=install --hostname {{ hana_host }} --configfile='{{ dir_params }}/{{ sap_inifile }}'
./hdblcm --batch --action=install --hostname {{ virtual_host }} --configfile='{{ dir_params }}/{{ sap_inifile }}'
args:
chdir: "{{ target_media_location }}/CD_HDBSERVER/SAP_HANA_DATABASE"
creates: "/etc/sap_deployment_automation/{{ db_sid | upper }}/sap_deployment_hdb.txt"
Expand All @@ -105,13 +104,13 @@
when: hana_installation.rc == 1


- name: "SAP HANA: Re-execute hdblcm on {{ (hana_host) }} and rescue"
- name: "SAP HANA: Re-execute hdblcm on {{ virtual_host }} and rescue"
block:
- name: "SAP HANA: Re-execute hdblcm on {{ (hana_host) }}"
- name: "SAP HANA: Re-execute hdblcm on {{ virtual_host }}"
ansible.builtin.shell: |
umask {{ custom_umask | default('022') }} ;
chmod 755 /usr/sap;
./hdblcm --batch --action=install --hostname {{ hana_host }} --configfile='{{ dir_params }}/{{ sap_inifile }}'
./hdblcm --batch --action=install --hostname {{ virtual_host }} --configfile='{{ dir_params }}/{{ sap_inifile }}'
args:
chdir: "{{ target_media_location }}/CD_HDBSERVER/SAP_HANA_DATABASE"
creates: "/etc/sap_deployment_automation/{{ db_sid | upper }}/sap_deployment_hdb.txt"
Expand Down
Loading

0 comments on commit fffac8c

Please sign in to comment.