Merge branch 'cherry-pick-9244acd1' into 'release-20.4'

release-20.4:Backport!4766

See merge request noc/noc!5471

ansible/molecule/debian10/inv.yml

@@ -42,6 +42,7 @@ all:
           correlator_loglevel: info
           correlator_max_threads: 10
           correlator_power: 1
+          correlator_backup_power: 1
           datastream_loglevel: info
           datastream_power: 2
           datastream_mode: wait

ansible/molecule/debian9/inv.yml

@@ -42,6 +42,7 @@ all:
           correlator_loglevel: info
           correlator_max_threads: 10
           correlator_power: 1
+          correlator_backup_power: 1
           datastream_loglevel: info
           datastream_power: 2
           datastream_mode: wait

ansible/molecule/freebsd/inv.yml

@@ -43,6 +43,7 @@ all:
           correlator_loglevel: info
           correlator_max_threads: 10
           correlator_power: 1
+          correlator_backup_power: 1
           datastream_loglevel: info
           datastream_power: 2
           datastream_mode: wait

ansible/molecule/oel7/inv.yml

@@ -42,6 +42,7 @@ all:
           correlator_loglevel: info
           correlator_max_threads: 10
           correlator_power: 1
+          correlator_backup_power: 1
           datastream_loglevel: info
           datastream_power: 2
           datastream_mode: wait

ansible/molecule/ubuntu16/inv.yml

@@ -42,6 +42,7 @@ all:
           correlator_loglevel: info
           correlator_max_threads: 10
           correlator_power: 1
+          correlator_backup_power: 1
           datastream_loglevel: info
           datastream_power: 2
           datastream_mode: wait

ansible/molecule/ubuntu18/inv.yml

@@ -42,6 +42,7 @@ all:
           correlator_loglevel: info
           correlator_max_threads: 10
           correlator_power: 1
+          correlator_backup_power: 1
           datastream_loglevel: info
           datastream_power: 2
           datastream_mode: wait

ansible/noc_roles/correlator/meta/tower.yml

@@ -14,6 +14,12 @@ forms:
       type: int
       max: 1
       min: 0
+    backup_power:
+      default: 1
+      label: "Additional Instances"
+      type: int
+      max: 16
+      min: 0
     loglevel:
       default: info
       label: Loglevel

ansible/noc_roles/migrate/tasks/configure_consul.yml

@@ -42,3 +42,17 @@
   with_items: "{{ hostvars |json_query('*.noc_services[] | [].pool') |unique }}"
   tags:
     - classifier
+
+- name: call consul to setup correlator
+  run_once: "True"
+  include_role:
+    name: consul
+    tasks_from: service_config_update
+  vars:
+    consul_service_key: "noc/slots/correlator-{{ item }}/manifest"
+    consul_service_internal_key: "Limit"
+    consul_service_value: "{{ hostvars |json_query(\"*.noc_services[] | [?name=='correlator'].{n:pool,num:config.power} | [?n=='\"+item+\"'] | sum([].num)\") }}"  # noqa 204
+    consul_service_token: None
+  with_items: "{{ hostvars |json_query('*.noc_services[] | [].pool') |unique }}"
+  tags:
+    - correlator