Merge b98e6df into a6b8de7

voxpupuli · Mar 12, 2019 · d9316a6 · d9316a6
2 parents a6b8de7 + b98e6df
commit d9316a6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/manifests/repo.pp b/manifests/repo.pp
@@ -9,31 +9,31 @@
       'Debian': {
         case $proxysql::repo_version {
           '2.0.x': {
-            create_resources('apt::source', { 'proxysql_repo' => $proxysql::repo20})
+            create_resources('apt::source', { 'proxysql_repo' => $proxysql::params::repo20})
           }
           '1.4.x': {
-            create_resources('apt::source', { 'proxysql_repo' => $proxysql::repo14})
+            create_resources('apt::source', { 'proxysql_repo' => $proxysql::params::repo14})
           }
           default: {
-            create_resources('apt::source', { 'proxysql_repo' => $proxysql::repo14})
+            create_resources('apt::source', { 'proxysql_repo' => $proxysql::params::repo14})
           }
         }
       }
       'RedHat': {
         case $proxysql::repo_version {
           '2.0.x': {
             yumrepo { 'proxysql_repo':
-            * => $proxysql::repo20,
+            * => $proxysql::params::repo20,
             }
           }
           '1.4.x': {
             yumrepo { 'proxysql_repo':
-            * => $proxysql::repo14,
+            * => $proxysql::params::repo14,
             }
           }
           default: {
             yumrepo { 'proxysql_repo':
-            * => $proxysql::repo14,
+            * => $proxysql::params::repo14,
             }
           }
         }

diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
@@ -15,6 +15,7 @@ class { 'proxysql': }
 
     describe package('proxysql') do
       it { is_expected.to be_installed }
+      its('version') { is_expected.to include '1.4.*' }
     end
 
     describe service('proxysql') do
@@ -29,6 +30,7 @@ class { 'proxysql': }
       pp = <<-EOS
       class { 'proxysql':
         listen_port              => 3306,
+        repo_version             => '2.0.x',
         admin_username           => 'admin',
         admin_password           => Sensitive('654321'),
         monitor_username         => 'monitor',
@@ -131,6 +133,7 @@ class { 'proxysql':
 
     describe package('proxysql') do
       it { is_expected.to be_installed }
+      its('version') { is_expected.to include '2.0.*' }
     end
 
     describe service('proxysql') do