Merge "Support Debian warning"
This commit is contained in:
commit
06acfd21a6
@ -5,10 +5,6 @@ class openstack_integration::ec2api {
|
||||
include ::openstack_integration::config
|
||||
include ::openstack_integration::params
|
||||
|
||||
# Ec2api resources
|
||||
class { '::ec2api::logging':
|
||||
debug => true,
|
||||
}
|
||||
class { '::ec2api::keystone::auth':
|
||||
public_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':
|
||||
password => 'ec2api',
|
||||
}
|
||||
class { '::ec2api::db::sync': }
|
||||
case $::osfamily {
|
||||
'RedHat': {
|
||||
class { '::ec2api::db':
|
||||
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::keystone::authtoken':
|
||||
password => 'a_big_secret',
|
||||
@ -36,6 +35,9 @@ class openstack_integration::ec2api {
|
||||
}
|
||||
include ::ec2api::metadata
|
||||
}
|
||||
'Debian': {
|
||||
warning('ec2api is not yet packaged on Ubuntu systems.')
|
||||
}
|
||||
default: {
|
||||
fail("Unsupported osfamily (${::osfamily})")
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user