stackforge
/
nova-salt-formula
Code Issues Proposed changes

add compute_pkgs for redhat distribute

This commit is contained in:
Lei Zhang 2014-08-01 14:40:41 +08:00
parent 1285ee58b4
commit a5957e11ea
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nova/map.jinja
View File

@ -12,7 +12,6 @@
"nova-conductor",
"nova-consoleauth",
"nova-scheduler"],
"conntrack": "conntrack",
"all_in_one_pkgs": ["nova-api",
"nova-compute",
"nova-compute-" + salt["pillar.get"]("nova:config:libvirt:virt_type", virt_type),
@ -33,6 +32,7 @@
"nova-compute-" + salt["pillar.get"]("nova:config:libvirt:virt_type", virt_type),
],
"compute_services": ["nova-network", "nova-compute"],
"conntrack": "conntrack",
},
"RedHat": {
"name": "nova",
@ -46,6 +46,13 @@
"openstack-nova-conductor",
"openstack-nova-consoleauth",
"openstack-nova-scheduler"],
"compute_pkgs": ["openstack-nova-api",
"openstack-nova-compute",
"openstack-nova-network"],
"compute_services": ["openstack-nova-compute",
"openstack-nova-network",
"openstack-nova-metadata-api"],
"conntrack": "conntrack-tools",
}
}, merge=salt["pillar.get"]("nova:lookup")) %}

2
pillar.example
View File

@ -19,8 +19,6 @@ nova:
config:
DEFAULT:
novncproxy_base_ip:
libvirt:
virt_type: qemu
{#- vim:ft=sls
-#}