openstack
/
salt-formula-nova
Code Issues Proposed changes

Merge "extend temporary exeption for libvirtname in mirantis repo; reason: keystone formula goes against nova formula for legacy deployments"

This commit is contained in:
Jenkins 2016-12-04 10:16:18 +00:00 committed by Gerrit Code Review
parent e7e57ced1d cf1d39fb53
commit 74ee08104d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/map.jinja
View File

@ -63,7 +63,7 @@
},
}, grain='oscodename', merge=pillar.nova.get('compute', {}))) %}
{%- if salt['pillar.get']('linux:system:repo:mirantis_openstack', False) %}
{%- if salt['pillar.get']('linux:system:repo:mirantis_openstack' , False) or salt['pillar.get']('linux:system:repo:mirantis' , False) %}
{%- do compute.update({'libvirt_bin': '/etc/default/libvirtd'}) %}
{%- do compute.update({'libvirt_service': 'libvirtd'}) %}
{%- endif %}