Skip to content

Commit bda2f92

Browse files
author
Rick Salevsky
authored
Merge pull request #2205 from rsalevsky/ruby_version
database: Hardcode ruby version for package installation (SOC-10010)
2 parents bbc0dd8 + 6c02091 commit bda2f92

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

chef/cookbooks/mysql/recipes/client.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
package "mysql-ruby" do
2525
package_name value_for_platform_family(
2626
["rhel", "fedora"] => "ruby-mysql",
27-
"suse" => "ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-mysql2",
27+
"suse" => "ruby2.1-rubygem-mysql2",
2828
"default" => "libmysql-ruby"
2929
)
3030
action :install

chef/cookbooks/postgresql/attributes/default.rb

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126

127127
default["postgresql"]["client"]["packages"] = [
128128
"postgresql",
129-
"ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-pg"
129+
"ruby2.1-rubygem-pg"
130130
]
131131
default["postgresql"]["server"]["packages"] = ["postgresql-server"]
132132
default["postgresql"]["contrib"]["packages"] = ["postgresql-contrib"]
@@ -139,14 +139,18 @@
139139
default["postgresql"]["contrib"]["packages"] = ["postgresql-contrib"]
140140
when node["platform_version"].to_f < 12.0
141141
default["postgresql"]["version"] = "9.1"
142-
default["postgresql"]["client"]["packages"] = ["postgresql91",
143-
"ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-pg"]
142+
default["postgresql"]["client"]["packages"] = [
143+
"postgresql91",
144+
"ruby2.1-rubygem-pg"
145+
]
144146
default["postgresql"]["server"]["packages"] = ["postgresql91-server"]
145147
default["postgresql"]["contrib"]["packages"] = ["postgresql91-contrib"]
146148
when node["platform_version"].to_f == 12.0
147149
default["postgresql"]["version"] = "9.3"
148-
default["postgresql"]["client"]["packages"] = ["postgresql93",
149-
"ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-pg"]
150+
default["postgresql"]["client"]["packages"] = [
151+
"postgresql93",
152+
"ruby2.1-rubygem-pg"
153+
]
150154
default["postgresql"]["server"]["packages"] = ["postgresql93-server"]
151155
default["postgresql"]["contrib"]["packages"] = ["postgresql93-contrib"]
152156
when node["platform_version"].to_f < 12.3
@@ -168,7 +172,7 @@
168172

169173
default["postgresql"]["client"]["packages"] = [
170174
"postgresql",
171-
"ruby#{node["languages"]["ruby"]["version"].to_f}-rubygem-pg"
175+
"ruby2.1-rubygem-pg"
172176
]
173177
default["postgresql"]["server"]["packages"] = ["postgresql-server"]
174178
default["postgresql"]["contrib"]["packages"] = ["postgresql-contrib"]

0 commit comments

Comments
 (0)