Resolve errors in puppet runs

This commit resolves errors that are being
triggered in puppet runs for the App Catalog
hosted on OpenStack Infra by removing the
unnecessary commands to create directories
and by checking for OS disto codename before
attempting to install the zopfli package.

Change-Id: I9444087c3aa1001616af88303d8ce04fc7050b47
Closes-bug: 1495648
This commit is contained in:
Christopher Aedo 2015-09-14 11:37:36 -07:00
parent d0551caf67
commit fb6c041ffc
1 changed files with 5 additions and 11 deletions

View File

@ -55,20 +55,14 @@ class apps_site (
}
}
if ! defined(Package['zopfli']) {
package { 'zopfli':
ensure => present,
if ($::lsbdistcodename == 'trusty') {
if ! defined(Package['zopfli']) {
package { 'zopfli':
ensure => present,
}
}
}
file { "${root_dir}/openstack_catalog/web/api":
ensure => directory,
}
file { "${root_dir}/openstack_catalog/web/api/v1":
ensure => directory,
}
exec { 'make_assets_json' :
command => "${root_dir}/tools/update_assets.sh",
path => '/usr/local/bin:/usr/bin:/bin',