Skip to content

Commit

Permalink
Release v3.10.0.0 (#512)
Browse files Browse the repository at this point in the history
* Fixes for HANA VM ppg and /etc/hosts file generation (#511)

* resolve proximity_placement_group_id for HANA db

* ensure hosts.j2 correctly places at least a single whitespace when FQDN is longer than the 50 chars and increase the alignment of the hostname at 80 chars.

* Final changes before release v3.10.0.0

---------

Co-authored-by: Steffen Bo Thomsen <[email protected]>
  • Loading branch information
hdamecharla and SteffenBoThomsen authored Dec 8, 2023
1 parent e3aba74 commit fb2c0a7
Show file tree
Hide file tree
Showing 13 changed files with 456 additions and 95 deletions.
1 change: 0 additions & 1 deletion .ansible-lint
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ skip_list:
- yaml[indentation]
- yaml[line-length]
- yaml[octal-values]
- yaml[indentation]
- name[template]
- command-instead-of-shell # csh is not supported in commands
- jinja[spacing]
5 changes: 5 additions & 0 deletions Webapp/SDAF/ParameterDetails/custom_naming.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"bastion_host": "",
"bastion_pip": "",
"cluster_disk": "",
"database_cluster_disk": "",
"db_alb": "",
"db_alb_bepool": "",
"db_alb_feip": "",
Expand Down Expand Up @@ -106,6 +107,7 @@
"scs_avset": "",
"scs_clst_feip": "",
"scs_clst_hp": "",
"scs_cluster_disk": "",
"scs_clst_rule": "",
"scs_ers_feip": "",
"scs_ers_hp": "",
Expand Down Expand Up @@ -167,6 +169,8 @@
"bastion_host": "bastion-host",
"bastion_pip": "bastion-pip",
"cluster_disk": "cluster-disks",
"database_cluster_disk": "",
"db-cluster-disk": null,
"db_alb": "db-alb",
"db_alb_bepool": "dbAlb-bePool",
"db_alb_feip": "dbAlb-feip",
Expand Down Expand Up @@ -229,6 +233,7 @@
"scs_clst_feip": "scsClst-feip",
"scs_clst_hp": "scsClst-hp",
"scs_clst_rule": "scsClst-rule",
"scs_cluster_disk" : "scs-cluster-disk",
"scs_ers_feip": "scsErs-feip",
"scs_ers_hp": "scsErs-hp",
"scs_ers_rule": "scsErs-rule",
Expand Down
12 changes: 6 additions & 6 deletions Webapp/SDAF/ParameterDetails/custom_sizes.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"app": {
"Default": {
"compute": {
"vm_size": "Standard_D4s_v3",
"vm_size": "Standard_D4s_v5",
"accelerated_networking": true
},
"storage": [
Expand All @@ -81,7 +81,7 @@
},
"Optimized": {
"compute": {
"vm_size": "Standard_D4s_v3",
"vm_size": "Standard_D4s_v5",
"accelerated_networking": true
},
"storage": [
Expand All @@ -107,7 +107,7 @@
"scs": {
"Default": {
"compute": {
"vm_size": "Standard_D4s_v3",
"vm_size": "Standard_D4s_v5",
"accelerated_networking": true
},
"storage": [
Expand All @@ -133,7 +133,7 @@
"scsha": {
"Default": {
"compute": {
"vm_size": "Standard_D4s_v3",
"vm_size": "Standard_D4s_v5",
"accelerated_networking": true
},
"storage": [
Expand All @@ -157,7 +157,7 @@
},
"Optimized": {
"compute": {
"vm_size": "Standard_D4s_v3",
"vm_size": "Standard_D4s_v5",
"accelerated_networking": true
},
"storage": [
Expand All @@ -183,7 +183,7 @@
"web": {
"Default": {
"compute": {
"vm_size": "Standard_D4s_v3",
"vm_size": "Standard_D4s_v5",
"accelerated_networking": true
},
"storage": [
Expand Down
24 changes: 12 additions & 12 deletions Webapp/SDAF/SDAFWebApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@


<ItemGroup>
<PackageReference Include="Azure.Data.Tables" Version="12.8.1" />
<PackageReference Include="Azure.Identity" Version="1.10.3" />
<PackageReference Include="Azure.ResourceManager" Version="1.8.1" />
<PackageReference Include="Azure.ResourceManager.Compute" Version="1.2.0" />
<PackageReference Include="Azure.ResourceManager.KeyVault" Version="1.1.0" />
<PackageReference Include="Azure.ResourceManager.Network" Version="1.5.0" />
<PackageReference Include="Azure.ResourceManager.Resources" Version="1.6.0" />
<PackageReference Include="Azure.ResourceManager.Storage" Version="1.1.1" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.19.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="6.0.24" />
<PackageReference Include="Azure.Data.Tables" Version="12.8.2" />
<PackageReference Include="Azure.Identity" Version="1.10.4" />
<PackageReference Include="Azure.ResourceManager" Version="1.9.0" />
<PackageReference Include="Azure.ResourceManager.Compute" Version="1.2.1" />
<PackageReference Include="Azure.ResourceManager.KeyVault" Version="1.2.0" />
<PackageReference Include="Azure.ResourceManager.Network" Version="1.6.0" />
<PackageReference Include="Azure.ResourceManager.Resources" Version="1.7.0" />
<PackageReference Include="Azure.ResourceManager.Storage" Version="1.2.0" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="6.0.25" />
<PackageReference Include="Microsoft.Extensions.Azure" Version="1.7.1" />
<PackageReference Include="Microsoft.Identity.Web" Version="2.15.3" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.15.3" />
<PackageReference Include="Microsoft.Identity.Web" Version="2.16.0" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.16.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.11" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
Expand Down
5 changes: 4 additions & 1 deletion deploy/ansible/configuration_menu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ cmd_dir="$(dirname "$(readlink -e "${BASH_SOURCE[0]}")")"
# playbook_05_01_sap_dbload.yaml \
# playbook_05_02_sap_pas_install.yaml \
# playbook_05_03_sap_app_install.yaml \
# playbook_05_04_sap_web_install.yaml
# playbook_05_04_sap_web_install.yaml \
# playbook_06_00_acss_registration.yaml

# The SAP System parameters file which should exist in the current directory
sap_params_file=sap-parameters.yaml
Expand Down Expand Up @@ -110,6 +111,7 @@ options=(
"Application Server installations"
"Web Dispatcher installations"
"HCMT"
"ACSS Registration"

# Special menu entries
"BOM Download"
Expand Down Expand Up @@ -139,6 +141,7 @@ all_playbooks=(
${cmd_dir}/playbook_05_03_sap_app_install.yaml
${cmd_dir}/playbook_05_04_sap_web_install.yaml
${cmd_dir}/playbook_04_00_02_db_hcmt.yaml
${cmd_dir}/playbook_06_00_acss_registration.yaml
${cmd_dir}/playbook_bom_downloader.yaml
${cmd_dir}/playbook_07_00_00_post_installation.yaml
)
Expand Down
113 changes: 113 additions & 0 deletions deploy/ansible/playbook_06_00_acss_registration.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
# /*---------------------------------------------------------------------------8
# | |
# | Playbook for SAP Web Dispatcher Install |
# | |
# +------------------------------------4--------------------------------------*/

# -------------------------------------+---------------------------------------8
# Role: 5.4 Web Dispatcher Installation
#
# Description:
#
# -------------------------------------+---------------------------------------8

---

- hosts: localhost
name: "ACSS Registration Playbook: - Initialization"
gather_facts: true
vars_files:
- vars/ansible-input-api.yaml # API Input template with defaults

tasks:

- name: "ACSS Registration Playbook: - Create Progress folder"
ansible.builtin.file:
path: "{{ _workspace_directory }}/.progress"
state: directory
mode: 0755

- name: "ACSS Registration Playbook: - Remove acss-registration-done flag"
ansible.builtin.file:
path: "{{ _workspace_directory }}/.progress/acss-registration-done"
state: absent

- name: "ACSS Registration Playbook: - Read/Create passwords"
ansible.builtin.include_role:
name: roles-misc/0.1-passwords
public: true
tags:
- 0.1-passwords

# /*---------------------------------------------------------------------------8
# | |
# | Playbook for SAP Web Dispatcher Install |
# | |
# +------------------------------------4--------------------------------------*/

- hosts: "{{ sap_sid | upper }}_DB :
{{ sap_sid | upper }}_SCS :
{{ sap_sid | upper }}_ERS :
{{ sap_sid | upper }}_PAS :
{{ sap_sid | upper }}_APP :
{{ sap_sid | upper }}_WEB"

name: ACSS Registration
remote_user: "{{ orchestration_ansible_user }}"
become: true
gather_facts: true # Important to collect hostvars information
vars_files:
- vars/ansible-input-api.yaml # API Input template with defaults

tasks:
# -------------------------------------+---------------------------------------8
#
# Build the list of tasks to be executed in order here.
#
# -------------------------------------+---------------------------------------8

- name: "ACSS Registration Playbook: Define this SID"
ansible.builtin.set_fact:
this_sid:
{
'sid': '{{ sap_sid | upper }}',
'web_sid': '{{ web_sid | upper }}',
'dbsid_uid': '{{ hdbadm_uid }}',
'sidadm_uid': '{{ sidadm_uid }}',
'ascs_inst_no': '{{ scs_instance_number }}',
'pas_inst_no': '{{ pas_instance_number }}' ,
'app_inst_no': '{{ app_instance_number }}'
}

- name: "ACSS Registration Playbook: Define list of SIDs"
ansible.builtin.set_fact:
all_sids: "{% if MULTI_SIDS is defined %}{{ MULTI_SIDS }}{% else %}{{ all_sids | default([]) + [this_sid] }}{% endif %}"

- name: "Run the ACSS Regisration"
when:
- acssEnvironment is defined
- acssSapProduct is defined
ansible.builtin.include_role:
name: "roles-misc/0.5-ACSS-registration"
vars:
acss_environment: "{{ acssEnvironment }}"
acss_sap_product: "{{ acssSapProduct }}"
loop: "{{ all_sids }}"
loop_control:
loop_var: sid_to_be_deployed
tags:
- 6.0-acss-registration

- name: "ACSS Registration Playbook: - Create acss-registration-done flag"
delegate_to: localhost
become: false
ansible.builtin.file:
path: "{{ _workspace_directory }}/.progress/acss-registration-done"
state: touch
mode: 0755

...

# /*---------------------------------------------------------------------------8
# | END |
# +------------------------------------4--------------------------------------*/
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ ers_virtual_hostname: "{{ sap_sid | lower }}ers{{ ers_instance_

sapcontrol_command: "sapcontrol -nr {{ scs_instance_number }}"

acss_cli_extension_url: "https://aka.ms/ACSSCLI"
acss_cli_extension_url: "https://files.pythonhosted.org/packages/ce/f3/91b1a5fdff7a7f0cc8bdfc9a7177f1c1dbab909f857a5ba4cc837650635e/azure_mgmt_workloads-1.0.0-py3-none-any.whl"

...
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@

# Validate that the SCS cluster is working as expected

- name: "0.5.1 acss registration: - Set Python version {{ distribution_id }}"
- name: "0.5.1 acss registration: - Set Python version {{ distribution_id }}"
ansible.builtin.set_fact:
python_version: "python3"
python_version: "python3"

- name: "0.5.1 acss registration: - Set Python version {{ distribution_id }}"
ansible.builtin.set_fact:
python_version: "python2"
python_version: "python2"
when: (ansible_distribution | lower ~ ansible_distribution_major_version) in ['sles_sap12']

# Get BOM bom object
Expand Down Expand Up @@ -55,7 +55,7 @@
use_proxy: false
headers:
Metadata: true
register: azure_metadata
register: azure_metadata

- name: "0.5.1 acss registration: Set variables from Azure IMDS"
ansible.builtin.set_fact:
Expand All @@ -64,10 +64,4 @@
acss_sid: "{{ sap_sid | upper }}"
acss_instance_type: "{{ instance_type }}"

# --sap-virtual-instance-name "${acss_sid}" \
# --resource-group "${acss_resource_group}" \
# --location "${acss_location}" \
# --environment "${acss_environment}" \
# --sap-product "${acss_sap_product}" \
# --configuration "${acss_configuration}"
...
Loading

0 comments on commit fb2c0a7

Please sign in to comment.