Merge branch 'main' into update-libvirt-docs

pillar_examples/automatic/hana/cluster.sls

@@ -90,6 +90,13 @@ cluster:
         instance: {{ hana.hana.nodes[0].instance }}
         scale_out: {{ grains['hana_scale_out_enabled']|default(False) }}
         majority_maker: {{ grains['majority_maker_node']|default("") }}
+        {% if grains['hana_scale_out_enabled']|default(False) %}
+        resources_maintenance:
+          - msl_SAPHanaController_{{ hana.hana.nodes[0].sid.upper() }}_HDB{{ '{:0>2}'.format(hana.hana.nodes[0].instance) }}
+        {% else %}
+        resources_maintenance:
+          - msl_SAPHana_{{ hana.hana.nodes[0].sid.upper() }}_HDB{{ '{:0>2}'.format(hana.hana.nodes[0].instance) }}
+        {% endif %}
         {% if grains['provider'] == 'aws' %}
         route_table: {{ grains['route_table'] }}
         cluster_profile: {{ grains['aws_cluster_profile'] }}

requirements.yml

@@ -1,21 +1,21 @@
 ---
 hana_node:
-  python-shaptools: 0.3.12+git.1619007514.1951d23
-  python3-shaptools: 0.3.12+git.1619007514.1951d23
-  salt-shaptools: 0.3.16+git.1651132315.e44edee
-  habootstrap-formula: 0.4.4+git.1644311144.3dc7a98
-  saphanabootstrap-formula: 0.9.0+git.1644311138.1ee99f3
+  python-shaptools: 0.3.13+git.1651505455.cee9bd8
+  python3-shaptools: 0.3.13+git.1651505455.cee9bd8
+  salt-shaptools: 0.3.17+git.1651504665.6e49c5b
+  habootstrap-formula: 0.4.6+git.1654259322.51cd7c2
+  saphanabootstrap-formula: 0.10.1+git.1654591537.734ff97
 drbd_node:
-  python-shaptools: 0.3.12+git.1619007514.1951d23
-  python3-shaptools: 0.3.12+git.1619007514.1951d23
-  salt-shaptools: 0.3.16+git.1651132315.e44edee
-  habootstrap-formula: 0.4.4+git.1644311144.3dc7a98
+  python-shaptools: 0.3.13+git.1651505455.cee9bd8
+  python3-shaptools: 0.3.13+git.1651505455.cee9bd8
+  salt-shaptools: 0.3.17+git.1651504665.6e49c5b
+  habootstrap-formula: 0.4.6+git.1654259322.51cd7c2
   drbd-formula: 0.5.0+git.1637569723.cf85049
 netweaver_node:
-  python-shaptools: 0.3.12+git.1619007514.1951d23
-  python3-shaptools: 0.3.12+git.1619007514.1951d23
-  salt-shaptools: 0.3.16+git.1651132315.e44edee
-  habootstrap-formula: 0.4.4+git.1644311144.3dc7a98
+  python-shaptools: 0.3.13+git.1651505455.cee9bd8
+  python3-shaptools: 0.3.13+git.1651505455.cee9bd8
+  salt-shaptools: 0.3.17+git.1651504665.6e49c5b
+  habootstrap-formula: 0.4.6+git.1654259322.51cd7c2
   sapnwbootstrap-formula: 0.7.4+git.1646147057.78b198a
 iscsi_srv:
   iscsi-formula: 1.1.1

salt/cluster_node/init.sls

@@ -10,7 +10,3 @@ include:
   - cluster_node.aws_add_credentials
   - cluster_node.aws_data_provider
   {%- endif %}
-  # make sure cloud_provider grains is set in this salt run (to be available in provisioning run)
-  # currently we have possible race condition here https://github.com/saltstack/salt/issues/54331 with salt >=3003
-  # SLES 15 SP4 uses salt-3004
-  - cluster.cloud_detection