Update Salt version to 2017.7

[fuel.git] / mcp / reclass / classes / cluster / all-mcp-arch-common / infra / config_pdf.yml.j2

diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2
index 677f0c9..a12e156 100644 (file)
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2
@@ -7,29 +7,94 @@
 ##############################################################################
 {%- import 'net_map.j2' as nm with context %}
 ---
+classes:
+  - service.git.client
+  - system.linux.system.repo.mcp.salt
+  - system.reclass.storage.salt
+{%- if nm.cluster.has_baremetal_nodes %}
+  - system.reclass.storage.system.infra_maas_single
+{%- endif %}
+  - system.salt.master.api
+  - system.salt.master.pkg
+  - system.salt.minion.ca.salt_master
 parameters:
+  _param:
+    salt_master_environment_repository: "https://github.com/tcpcloud"
+    salt_master_environment_revision: master
+    reclass_data_repository: local
+    salt_master_base_environment: prd
+    # yamllint disable-line rule:line-length
+    salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
+  salt:
+    master:
+      accept_policy: open_mode
+      file_recv: true
   reclass:
     storage:
+      data_source:
+        engine: local
       node:
-        # NOTE: Until SDF is in place, assume all computes are identical
-        openstack_compute_node01: &openstack_compute_node01
+        # We support per-node (not only per-role) compute configuration via IDF
+{%- for cmp in range(1, nm.cmp_nodes + 1) %}
+  {%- set n = '%02d' | format(cmp) %}
+  {%- set i = nm.cmp001.idx + cmp - 1 %}
+
+  {%- set admin = nm.net_admin_hosts | length + nm.start_ip[nm.net_admin] + loop.index %}
+  {%- set mgmt = nm.net_mgmt_hosts | length + nm.start_ip[nm.net_mgmt] + loop.index %}
+  {%- set pub = nm.net_public_hosts | length + nm.start_ip[nm.net_public] + loop.index %}
+  {%- set pri = nm.net_private_hosts | length + nm.start_ip[nm.net_private] + loop.index %}
+        openstack_compute_node{{ n }}:
+          name: cmp{{ '%03d' | format(cmp) }}
+          domain: ${_param:cluster_domain}
+          classes:
+            - cluster.${_param:cluster_name}.openstack.compute
           params:
-{#- No partial defaults, all or nothing. Defaults tuned for lf-pod2. #}
-{%- if conf.idf.fuel.reclass is defined %}
-{%- if conf.idf.fuel.reclass.node[nm.cmp001.idx].compute_params.common is defined %}
-{%- set _common = conf.idf.fuel.reclass.node[nm.cmp001.idx].compute_params.common %}
-{%- for _i in _common %}
+            pxe_admin_address: {{ nm.net_admin | ipnet_hostaddr(admin) }}
+            single_address: {{ nm.net_mgmt | ipnet_hostaddr(mgmt) }}
+            tenant_address: {{ nm.net_private | ipnet_hostaddr(pri) }}
+            external_address: {{ nm.net_public | ipnet_hostaddr(pub) }}
+            salt_master_host: ${_param:reclass_config_master}
+            linux_system_codename: xenial
+
+  {#- No partial defaults, all or nothing. Defaults tuned for lf-pod2. #}
+  {%- if 'dpdk' in conf.cluster.domain or conf.MCP_DPDK_MODE %}
+    {%- if conf.idf.fuel.reclass is defined %}
+      {%- if conf.idf.fuel.reclass.node[i].compute_params.dpdk is defined %}
+        {#- Can't dump json here due to dpdk0_* below, explicitly create yaml #}
+        {%- set _dpdk = conf.idf.fuel.reclass.node[i].compute_params.dpdk %}
+        {%- for _i in _dpdk %}
+            {{ _i }}: '"{{ _dpdk[_i] }}"'
+        {%- endfor %}
+      {%- endif %}
+    {%- else %}
+            compute_hugepages_size: 2M
+            compute_hugepages_count: 8192
+            compute_hugepages_mount: /mnt/hugepages_2M
+            compute_kernel_isolcpu: 2,3,10,11
+            compute_dpdk_driver: uio
+            compute_ovs_pmd_cpu_mask: '"0xc04"'
+            compute_ovs_dpdk_socket_mem: '"2048,2048"'
+            compute_ovs_dpdk_lcore_mask: '"0x8"'
+            compute_ovs_memory_channels: '"2"'
+            dpdk0_driver: igb_uio
+            dpdk0_n_rxq: 2
+    {%- endif %}
+            dpdk0_name: {{ conf.idf.fuel.network.node[i].interfaces[nm.idx_private] }}
+            dpdk0_pci: '"{{ conf.idf.fuel.network.node[i].busaddr[nm.idx_private] }}"'
+  {%- else %}
+    {%- if conf.idf.fuel.reclass is defined %}
+      {%- if conf.idf.fuel.reclass.node[i].compute_params.common is defined %}
+        {%- set _common = conf.idf.fuel.reclass.node[i].compute_params.common %}
+        {%- for _i in _common %}
             {{ _i }}: '"{{ _common[_i] }}"'
-{%- endfor %}
-{%- else %}
+        {%- endfor %}
+      {%- else %}
             dummy_value: ~
-{%- endif %}
-{%- else %}
-            nova_cpu_pinning: '"1,2,3,4,5,7,8,9,10,11"'
+      {%- endif %}
+    {%- else %}
             compute_hugepages_size: 1G
             compute_hugepages_count: 16
             compute_hugepages_mount: /mnt/hugepages_1G
-            compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
-{%- endif %}
-        openstack_compute_node02:
-          <<: *openstack_compute_node01
+    {%- endif %}
+  {%- endif %}
+{%- endfor %}