openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Support Debian warning"

Browse Source
This commit is contained in:
Zuul 2018-03-16 22:39:51 +00:00 committed by Gerrit Code Review
commit 06acfd21a6
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/ec2api.pp
View File

@ -5,10 +5,6 @@ class openstack_integration::ec2api {
include ::openstack_integration::config include ::openstack_integration::config
include ::openstack_integration::params include ::openstack_integration::params
# Ec2api resources
class { '::ec2api::logging':
debug => true,
}
class { '::ec2api::keystone::auth': class { '::ec2api::keystone::auth':
public_url => "${::openstack_integration::config::base_url}:8788", public_url => "${::openstack_integration::config::base_url}:8788",
internal_url => "${::openstack_integration::config::base_url}:8788", internal_url => "${::openstack_integration::config::base_url}:8788",
@ -18,12 +14,15 @@ class openstack_integration::ec2api {
class { '::ec2api::db::mysql': class { '::ec2api::db::mysql':
password => 'ec2api', password => 'ec2api',
} }
class { '::ec2api::db::sync': }
case $::osfamily { case $::osfamily {
'RedHat': { 'RedHat': {
class { '::ec2api::db': class { '::ec2api::db':
database_connection => 'mysql+pymysql://ec2api:ec2api@127.0.0.1/ec2api?charset=utf8', database_connection => 'mysql+pymysql://ec2api:ec2api@127.0.0.1/ec2api?charset=utf8',
} }
class { '::ec2api::db::sync': }
class { '::ec2api::logging':
debug => true,
}
class { '::ec2api': } class { '::ec2api': }
class { '::ec2api::keystone::authtoken': class { '::ec2api::keystone::authtoken':
password => 'a_big_secret', password => 'a_big_secret',
@ -36,6 +35,9 @@ class openstack_integration::ec2api {
} }
include ::ec2api::metadata include ::ec2api::metadata
} }
'Debian': {
warning('ec2api is not yet packaged on Ubuntu systems.')
}
default: { default: {
fail("Unsupported osfamily (${::osfamily})") fail("Unsupported osfamily (${::osfamily})")
} }