Switch _map_instances from novang to novav21
Switch _map_instances from novang to novav21 module
Change-Id: I806b6a276149320964b425ee534d80ffe1eeafef
Related-Prod: PROD-26861 (PROD:26861)
diff --git a/.kitchen.yml b/.kitchen.yml
index 4391444..5a730e3 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -61,7 +61,7 @@
suites:
<% for os_version in ['mitaka','newton','ocata','pike', 'queens', 'rocky'] %>
- - name: compute_cluster
+ - name: compute_cluster_<%=os_version%>
provisioner:
pillars-from-files:
nova.sls: tests/pillar/compute_cluster.sls
@@ -72,7 +72,7 @@
compute:
version: <%=os_version%>
- - name: control_cluster
+ - name: control_cluster_<%=os_version%>
provisioner:
pillars-from-files:
nova.sls: tests/pillar/control_cluster.sls
diff --git a/nova/controller.sls b/nova/controller.sls
index 68a9bb4..6e9a4cb 100644
--- a/nova/controller.sls
+++ b/nova/controller.sls
@@ -428,8 +428,9 @@
- sls: nova.db.offline_sync
nova_controller_map_instances:
- novang.map_instances:
+ novav21.instances_mapped_to_cell:
- name: 'cell1'
+ - timeout: {{ controller.get('mapped_instances_interval', 60) }}
{%- if grains.get('noservices') %}
- onlyif: /bin/false
{%- endif %}
@@ -486,4 +487,4 @@
{%- endif %}
-{%- endif %}
+{%- endif %}
\ No newline at end of file