openstack
/
salt-formula-nova
Code Issues Proposed changes

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

Change-Id: Icdae88f804cf9eab2205475a31d0c424ff239707
This commit is contained in:
Petr Michalec 2016-12-02 21:04:43 +01:00
parent 3a3a1545c8
commit cf1d39fb53
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/map.jinja
View File

@ -57,7 +57,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 %}
{%- endif %}