add dbus_service name for different platforms
on redhat6.4/centos, the dbus_service name is messagebus, and on other platforms, it's dbus. So I enhanced it, and updated the CHANGELOG.md and metadata.rb . Change-Id: I5548acc38b5e2cbf5e1d5d482cadbd876392daa4 Closes-Bug: #1244574
This commit is contained in:
parent
17200b0831
commit
3274d27857
10
CHANGELOG.md
10
CHANGELOG.md
|
@ -1,15 +1,19 @@
|
|||
# CHANGELOG for cookbook-openstack-common
|
||||
# CHANGELOG for cookbook-openstack-compute
|
||||
|
||||
This file is used to list changes made in each version of cookbook-openstack-common.
|
||||
This file is used to list changes made in each version of cookbook-openstack-compute.
|
||||
|
||||
## 7.0.2:
|
||||
* add the new attribute dbus_service settings for different OS platform.
|
||||
|
||||
## 7.0.1:
|
||||
* Adding attributes for libvirtd.conf settings (max_clients, max_workers,
|
||||
max_requests, max_client_requests).
|
||||
|
||||
## 7.0.0:
|
||||
* Initial release of cookbook-openstack-common.
|
||||
* Initial release of cookbook-openstack-compute.
|
||||
|
||||
- - -
|
||||
Check the [Markdown Syntax Guide](http://daringfireball.net/projects/markdown/syntax) for help with Markdown.
|
||||
|
||||
The [Github Flavored Markdown page](http://github.github.com/github-flavored-markdown/) describes the differences between markdown on github and standard markdown.
|
||||
|
||||
|
|
|
@ -240,12 +240,14 @@ License and Author
|
|||
| **Author** | Craig Tracey (<craigtracey@gmail.com>) |
|
||||
| **Author** | Sean Gallagher (<sean.gallagher@att.com>) |
|
||||
| **Author** | Ionut Artarisi (<iartarisi@suse.cz>) |
|
||||
| **Author** | JieHua Jin (<jinjhua@cn.ibm.com>) |
|
||||
| | |
|
||||
| **Copyright** | Copyright (c) 2012-2013, Rackspace US, Inc. |
|
||||
| **Copyright** | Copyright (c) 2012-2013, Opscode, Inc. |
|
||||
| **Copyright** | Copyright (c) 2012-2013, AT&T Services, Inc. |
|
||||
| **Copyright** | Copyright (c) 2013, Craig Tracey |
|
||||
| **Copyright** | Copyright (c) 2013, SUSE Linux GmbH |
|
||||
| **Copyright** | Copyright (c) 2013, IBM Corp. |
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -282,6 +282,7 @@ when "fedora", "redhat", "centos", "suse" # :pragma-foodcritic: ~FC024 - won't f
|
|||
"compute_vncproxy_consoleauth_process_name" => "nova-console",
|
||||
"libvirt_packages" => ["libvirt"],
|
||||
"libvirt_service" => "libvirtd",
|
||||
"dbus_service" => "dbus",
|
||||
"compute_cert_packages" => ["openstack-nova-cert"],
|
||||
"compute_cert_service" => "openstack-nova-cert",
|
||||
"mysql_service" => "mysqld",
|
||||
|
@ -290,6 +291,9 @@ when "fedora", "redhat", "centos", "suse" # :pragma-foodcritic: ~FC024 - won't f
|
|||
"nfs_packages" => ["nfs-utils", "nfs-utils-lib"],
|
||||
"package_overrides" => ""
|
||||
}
|
||||
if platform == "redhat" || platform == "centos"
|
||||
default["openstack"]["compute"]["platform"]["dbus_service"] = "messagebus"
|
||||
end
|
||||
if platform == "suse"
|
||||
default["openstack"]["compute"]["platform"]["common_packages"] = ["openstack-nova"]
|
||||
default["openstack"]["compute"]["platform"]["kvm_packages"] = ["kvm"]
|
||||
|
@ -325,6 +329,7 @@ when "ubuntu"
|
|||
"compute_vncproxy_consoleauth_process_name" => "nova-consoleauth",
|
||||
"libvirt_packages" => ["libvirt-bin"],
|
||||
"libvirt_service" => "libvirt-bin",
|
||||
"dbus_service" => "dbus",
|
||||
"compute_cert_packages" => ["nova-cert"],
|
||||
"compute_cert_service" => "nova-cert",
|
||||
"mysql_service" => "mysql",
|
||||
|
|
|
@ -143,6 +143,9 @@ link "/usr/bin/qemu-system-x86_64" do
|
|||
end
|
||||
|
||||
service "dbus" do
|
||||
service_name platform_options["dbus_service"]
|
||||
supports :status => true, :restart => true
|
||||
|
||||
action [:enable, :start]
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue