openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "deploy neutron with SSL & IPv6"

Browse Source
This commit is contained in:
Jenkins 2016-06-06 15:35:25 +00:00 committed by Gerrit Code Review
commit cba6f3e243
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
manifests/neutron.pp
View File

@ -10,6 +10,15 @@ class openstack_integration::neutron (
) { ) {
include ::openstack_integration::config include ::openstack_integration::config
include ::openstack_integration::params
if $::openstack_integration::config::ssl {
openstack_integration::ssl_key { 'neutron':
notify => Service['neutron-server'],
require => Package['neutron'],
}
Exec['update-ca-certificates'] ~> Service['neutron-server']
}
rabbitmq_user { 'neutron': rabbitmq_user { 'neutron':
admin => true, admin => true,
@ -86,9 +95,9 @@ class openstack_integration::neutron (
password => 'neutron', password => 'neutron',
} }
class { '::neutron::keystone::auth': class { '::neutron::keystone::auth':
public_url => "http://${::openstack_integration::config::ip_for_url}:9696", public_url => "${::openstack_integration::config::base_url}:9696",
internal_url => "http://${::openstack_integration::config::ip_for_url}:9696", internal_url => "${::openstack_integration::config::base_url}:9696",
admin_url => "http://${::openstack_integration::config::ip_for_url}:9696", admin_url => "${::openstack_integration::config::base_url}:9696",
password => 'a_big_secret', password => 'a_big_secret',
} }
class { '::neutron': class { '::neutron':
@ -102,6 +111,9 @@ class openstack_integration::neutron (
service_plugins => ['router', 'metering', 'firewall'], service_plugins => ['router', 'metering', 'firewall'],
debug => true, debug => true,
bind_host => $::openstack_integration::config::host, bind_host => $::openstack_integration::config::host,
use_ssl => $::openstack_integration::config::ssl,
cert_file => $::openstack_integration::params::cert_path,
key_file => "/etc/neutron/ssl/private/${::fqdn}.pem",
} }
class { '::neutron::client': } class { '::neutron::client': }
class { '::neutron::server': class { '::neutron::server':

2
manifests/nova.pp
View File

@ -117,7 +117,7 @@ class openstack_integration::nova (
class { '::nova::network::neutron': class { '::nova::network::neutron':
neutron_auth_url => "${::openstack_integration::config::keystone_admin_uri}/v3", neutron_auth_url => "${::openstack_integration::config::keystone_admin_uri}/v3",
neutron_url => "http://${::openstack_integration::config::ip_for_url}:9696", neutron_url => "${::openstack_integration::config::base_url}:9696",
neutron_password => 'a_big_secret', neutron_password => 'a_big_secret',
} }