openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "scenario003: enable IPv6 on centos7"

Browse Source
This commit is contained in:
Jenkins 2016-04-05 11:42:02 +00:00 committed by Gerrit Code Review
commit aa98d797ce
6 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -34,7 +34,7 @@ scenario](#All-In-One).
| - | scenario001 | scenario002 | scenario003 | scenario-aio |
|:----------:|:-----------:|:-----------:|:-----------:|:-------------:
| ssl | yes | yes | yes | no |
| ipv6 | centos7 | centos7 | no | no |
| ipv6 | centos7 | centos7 | centos7 | no |
| keystone | X | X | X | X |
| glance | rbd | swift | file | file |
| nova | rbd | X | X | X |

5
fixtures/scenario003.pp
View File

@ -16,11 +16,13 @@
case $::osfamily {
'Debian': {
$ipv6 = false
# sahara is broken for Ubuntu Trusty and Debian
# ConfigParser.NoSectionError: No section: 'alembic'
$sahara_enabled = false
}
'RedHat': {
$ipv6 = true
$sahara_enabled = true
}
default: {
@ -30,7 +32,8 @@ case $::osfamily {
include ::openstack_integration
class { '::openstack_integration::config':
ssl => true,
ipv6 => $ipv6,
ssl => true,
}
include ::openstack_integration::cacert
include ::openstack_integration::rabbitmq

3
manifests/heat.pp
View File

@ -59,6 +59,7 @@ class openstack_integration::heat {
Keystone_user_role['heat_admin::heat@::heat'] -> File['/root/openrc']
class { '::heat::client': }
class { '::heat::api':
bind_host => $::openstack_integration::config::host,
workers => '2',
use_ssl => $::openstack_integration::config::ssl,
cert_file => $crt_file,
@ -71,12 +72,14 @@ class openstack_integration::heat {
heat_watch_server_url => "${::openstack_integration::config::base_url}:8003",
}
class { '::heat::api_cloudwatch':
bind_host => $::openstack_integration::config::host,
workers => '2',
use_ssl => $::openstack_integration::config::ssl,
cert_file => $crt_file,
key_file => $key_file,
}
class { '::heat::api_cfn':
bind_host => $::openstack_integration::config::host,
workers => '2',
use_ssl => $::openstack_integration::config::ssl,
cert_file => $crt_file,

1
manifests/horizon.pp
View File

@ -30,7 +30,6 @@ class openstack_integration::horizon {
class { '::horizon':
secret_key => 'big_secret',
servername => $::openstack_integration::config::ip_for_url,
allowed_hosts => $::openstack_integration::config::ip_for_url,
listen_ssl => $::openstack_integration::config::ssl,
ssl_redirect => $::openstack_integration::config::ssl,

1
manifests/sahara.pp
View File

@ -29,6 +29,7 @@ class openstack_integration::sahara {
password => 'a_big_secret',
}
class { '::sahara':
host => $::openstack_integration::config::host,
database_connection => 'mysql+pymysql://sahara:sahara@127.0.0.1/sahara?charset=utf8',
rabbit_userid => 'sahara',
rabbit_password => 'an_even_bigger_secret',

1
manifests/trove.pp
View File

@ -49,6 +49,7 @@ class openstack_integration::trove {
admin_url => "${::openstack_integration::config::base_url}:8779/v1.0/%(tenant_id)s",
}
class { '::trove::api':
bind_host => $::openstack_integration::config::host,
keystone_password => 'a_big_secret',
auth_uri => $::openstack_integration::config::keystone_auth_uri,
identity_uri => $::openstack_integration::config::keystone_admin_uri,