Merge "Panko api wsgi changed path for Ubuntu"

manifests/params.pp

@@ -19,7 +19,7 @@ class panko::params {
       $api_package_name         = 'panko-api'
       $api_service_name         = 'panko-api'
       $panko_wsgi_script_path   = '/usr/lib/cgi-bin/panko'
-      $panko_wsgi_script_source = '/usr/share/panko-common/app.wsgi'
+      $panko_wsgi_script_source = '/usr/lib/python2.7/dist-packages/panko/api/app.wsgi'
     }
     default: {
       fail("Unsupported osfamily: ${::osfamily} operatingsystem")

spec/acceptance/basic_panko_spec.rb

@@ -17,39 +17,27 @@ describe 'basic panko' do
       class { '::panko::keystone::auth':
         password => 'a_big_secret',
       }
-
-      case $::osfamily {
-        'Debian': {
-          warning('Panko is not yet packaged on Ubuntu systems.')
-        }
-        'RedHat': {
-          class { '::panko::logging':
-            debug => true,
-          }
-          include ::panko
-          class { '::panko::db':
-            database_connection => 'mysql+pymysql://panko:a_big_secret@127.0.0.1/panko?charset=utf8',
-          }
-          class { '::panko::keystone::authtoken':
-            password => 'a_big_secret',
-          }
-          class { '::panko::api':
-            enabled      => true,
-            service_name => 'httpd',
-            sync_db      => true,
-          }
-          include ::apache
-          class { '::panko::wsgi::apache':
-            ssl => false,
-          }
-        }
-        default: {
-          fail("Unsupported osfamily (${::osfamily})")
-        }
+      class { '::panko::logging':
+        debug => true,
+      }
+      include ::panko
+      class { '::panko::db':
+        database_connection => 'mysql+pymysql://panko:a_big_secret@127.0.0.1/panko?charset=utf8',
+      }
+      class { '::panko::keystone::authtoken':
+        password => 'a_big_secret',
+      }
+      class { '::panko::api':
+        enabled      => true,
+        service_name => 'httpd',
+        sync_db      => true,
+      }
+      include ::apache
+      class { '::panko::wsgi::apache':
+        ssl => false,
       }
       EOS
 
-
       # Run it twice and test for idempotency
       apply_manifest(pp, :catch_failures => true)
       apply_manifest(pp, :catch_changes => true)

spec/classes/panko_wsgi_apache_spec.rb

@@ -93,7 +93,7 @@ describe 'panko::wsgi::apache' do
             :httpd_service_name => 'apache2',
             :httpd_ports_file   => '/etc/apache2/ports.conf',
             :wsgi_script_path   => '/usr/lib/cgi-bin/panko',
-            :wsgi_script_source => '/usr/share/panko-common/app.wsgi'
+            :wsgi_script_source => '/usr/lib/python2.7/dist-packages/panko/api/app.wsgi'
           }
         when 'RedHat'
           {