Merge "Switch _map_instances from novang to novav21" into release/2019.2.0
diff --git a/nova/controller.sls b/nova/controller.sls
index 2b0a669..013f40d 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 %}
diff --git a/tests/pillar/repo_mcp_openstack_queens.sls b/tests/pillar/repo_mcp_openstack_queens.sls
new file mode 100644
index 0000000..65fb320
--- /dev/null
+++ b/tests/pillar/repo_mcp_openstack_queens.sls
@@ -0,0 +1,12 @@
+linux:
+ system:
+ enabled: true
+ repo:
+ mirantis_openstack_repo:
+ source: "deb http://mirror.mirantis.com/nightly/openstack-queens/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} main"
+ architectures: amd64
+ key_url: "http://mirror.mirantis.com/nightly/openstack-queens/{{ grains.get('oscodename') }}/archive-queens.key"
+ pin:
+ - pin: 'release l=queens'
+ priority: 1050
+ package: '*'