Fix kitchen tests
Change-Id: If567f09c6853631ec743a755c1a15604ffe6e6db
diff --git a/.kitchen.yml b/.kitchen.yml
index 418d93e..d0d8c0d 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -34,7 +34,7 @@
- nova
- release
pillars-from-files:
- linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%= ENV['OS_VERSION'] || 'mitaka' %>.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%= ENV['OS_VERSION'] || 'ocata' %>.sls
verifier:
name: inspec
@@ -48,7 +48,7 @@
suites:
- - name: compute_cluster
+ - name: compute_cluster_<%= ENV['OS_VERSION'] || 'ocata' %>
provisioner:
pillars-from-files:
nova.sls: tests/pillar/compute_cluster.sls
@@ -56,9 +56,9 @@
release.sls:
nova:
compute:
- version: <%= ENV['OS_VERSION'] || 'mitaka' %>
+ version: <%= ENV['OS_VERSION'] || 'ocata' %>
- - name: control_cluster
+ - name: control_cluster_<%= ENV['OS_VERSION'] || 'ocata' %>
provisioner:
pillars-from-files:
nova.sls: tests/pillar/control_cluster.sls
@@ -66,6 +66,6 @@
release.sls:
nova:
controller:
- version: <%= ENV['OS_VERSION'] || 'mitaka' %>
+ version: <%= ENV['OS_VERSION'] || 'ocata' %>
# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
diff --git a/nova/controller.sls b/nova/controller.sls
index 73cc55d..15531f2 100644
--- a/nova/controller.sls
+++ b/nova/controller.sls
@@ -145,6 +145,9 @@
novang.online_data_migrations_present:
- api_db_version: "20"
- db_version: "334"
+ {%- if grains.get('noservices') %}
+ - onlyif: /bin/false
+ {%- endif %}
- require:
- novang: nova_controller_api_db_sync_version_20
- novang: nova_controller_db_sync_version_334