Skip to content

Quotes #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 24, 2018
Merged

Quotes #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c917f54
whitespace
kplimack Apr 12, 2017
a9c3d9a
quotes
kplimack Apr 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ cloudstack CHANGELOG

This file is used to list changes made in each version of the co-cloudstack cookbook.

4.0.8
-----
- put mysql password in single-quotes, otherwise some hardened passwords are not interpreted correctly and logins fail.

4.0.7
-----
- pdion891 - add support for CentOS 7 for ACS 4.10 with JDK8
Expand Down
2 changes: 1 addition & 1 deletion metadata.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
license 'Apache 2.0'
description 'Installs/Configures cloudstack'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '4.0.7'
version '4.0.8'

source_url 'https://github.com/cloudops/cookbook_cloudstack'
issues_url 'https://github.com/cloudops/cookbook_cloudstack/issues'
Expand Down
5 changes: 2 additions & 3 deletions providers/system_template.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
def load_current_resource
@current_resource = Chef::Resource::CloudstackSystemTemplate.new(@new_resource.name)
@current_resource.name(@new_resource.name)
@current_resource.url(@new_resource.url)
@current_resource.url(@new_resource.url)
@current_resource.hypervisor(@new_resource.hypervisor)
@current_resource.nfs_path(@new_resource.nfs_path)
@current_resource.nfs_server(@new_resource.nfs_server)
Expand All @@ -55,7 +55,7 @@ def load_current_resource
else
if db_exist?(@current_resource.db_host, @current_resource.db_user, @current_resource.db_password)
if @current_resource.url.nil?
cmd = Mixlib::ShellOut.new("mysql -h #{@current_resource.db_host} --user=#{@current_resource.db_user} --password=#{@current_resource.db_password} --skip-column-names -U cloud -e 'select max(url) from cloud.vm_template where type = \"SYSTEM\" and hypervisor_type = \"#{@current_resource.hypervisor}\" and removed is null'")
cmd = Mixlib::ShellOut.new("mysql -h #{@current_resource.db_host} --user=#{@current_resource.db_user} --password='#{@current_resource.db_password}' --skip-column-names -U cloud -e 'select max(url) from cloud.vm_template where type = \"SYSTEM\" and hypervisor_type = \"#{@current_resource.hypervisor}\" and removed is null'")
cmd.run_command
cmd.error!
@current_resource.url(cmd.stdout.chomp)
Expand All @@ -74,4 +74,3 @@ def load_current_resource
end

end