x/packstack
Code Issues Proposed changes

Making Packstack Compatible with Puppet 4.x

Browse Source 
http://docs.puppetlabs.com/puppet/3.7/reference/deprecated_language.html

Change-Id: I5695ec4e5d26fe809bcc4b5b99c46904d016cfb4
Signed-off-by: Gael Chamoulaud <gchamoul@redhat.com>
This commit is contained in:
Gael Chamoulaud
2015-03-31 16:33:27 +02:00
parent 3e0d51396c
commit 1e7c162103
108 changed files with 320 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Gemfile
View File

@@ -2,10 +2,18 @@ source ENV["GEM_SOURCE"] || "https://rubygems.org"
group :development, :test do
gem 'puppetlabs_spec_helper', :require => false
gem 'puppet-lint', '~> 1.1'
gem 'puppet-lint-param-docs', '1.1.0'
gem 'puppet-syntax'
gem 'rake', '10.1.1'
gem 'puppet-lint-param-docs'
gem 'puppet-lint-absolute_classname-check'
gem 'puppet-lint-absolute_template_path'
gem 'puppet-lint-trailing_newline-check'
# Puppet 4.x related lint checks
gem 'puppet-lint-unquoted_string-check'
gem 'puppet-lint-leading_zero-check'
gem 'puppet-lint-variable_contains_upcase'
gem 'puppet-lint-numericvariable'
end
if puppetversion = ENV['PUPPET_GEM_VERSION']

28
packstack/puppet/templates/amqp.pp
View File

@@ -20,7 +20,7 @@ define enable_rabbitmq {
ensure => 'installed',
}
if $amqp_enable_ssl {
if $::amqp_enable_ssl {
$kombu_ssl_ca_certs = hiera('CONFIG_AMQP_SSL_CACERT_FILE')
$kombu_ssl_keyfile = hiera('CONFIG_AMQP_SSL_KEY_FILE')
@@ -34,10 +34,10 @@ define enable_rabbitmq {
notify => Service['rabbitmq-server'],
}
class {"rabbitmq":
class { '::rabbitmq':
ssl_port => hiera('CONFIG_AMQP_SSL_PORT'),
ssl_only => true,
ssl => $amqp_enable_ssl,
ssl => $::amqp_enable_ssl,
ssl_cacert => $kombu_ssl_ca_certs,
ssl_cert => $kombu_ssl_certfile,
ssl_key => $kombu_ssl_keyfile,
@@ -48,22 +48,22 @@ define enable_rabbitmq {
# FIXME: it's ugly to not to require client certs
ssl_fail_if_no_peer_cert => false,
config_variables => {
'tcp_listen_options' => "[binary,{packet, raw},{reuseaddr, true},{backlog, 128},{nodelay, true},{exit_on_close, false},{keepalive, true}]",
'loopback_users' => "[]",
}
'tcp_listen_options' => '[binary,{packet, raw},{reuseaddr, true},{backlog, 128},{nodelay, true},{exit_on_close, false},{keepalive, true}]',
'loopback_users' => '[]',
},
}
} else {
class {"rabbitmq":
class { '::rabbitmq':
port => hiera('CONFIG_AMQP_CLIENTS_PORT'),
ssl => $amqp_enable_ssl,
ssl => $::amqp_enable_ssl,
default_user => hiera('CONFIG_AMQP_AUTH_USER'),
default_pass => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
package_provider => 'yum',
admin_enable => false,
config_variables => {
'tcp_listen_options' => "[binary,{packet, raw},{reuseaddr, true},{backlog, 128},{nodelay, true},{exit_on_close, false},{keepalive, true}]",
'loopback_users' => "[]",
}
config_variables => {
'tcp_listen_options' => '[binary,{packet, raw},{reuseaddr, true},{backlog, 128},{nodelay, true},{exit_on_close, false},{keepalive, true}]',
'loopback_users' => '[]',
},
}
}
@@ -93,12 +93,12 @@ define enable_qpid($enable_ssl = 'n', $enable_auth = 'n') {
}
}
class { 'qpid::server':
class { '::qpid::server':
config_file => $config,
auth => $enable_auth ? {
'y' => 'yes',
default => 'no',
},
},
clustered => false,
ssl_port => hiera('CONFIG_AMQP_SSL_PORT'),
ssl => hiera('CONFIG_AMQP_ENABLE_SSL'),

16
packstack/puppet/templates/ceilometer.pp
View File

@@ -24,32 +24,32 @@ if $config_ceilometer_coordination_backend == 'redis' {
$coordination_url = ''
}
class { 'ceilometer::db':
class { '::ceilometer::db':
database_connection => "mongodb://${config_mongodb_host}:27017/ceilometer",
}
class { 'ceilometer::collector': }
class { '::ceilometer::collector': }
class { 'ceilometer::agent::notification': }
class { '::ceilometer::agent::notification': }
$config_controller_host = hiera('CONFIG_CONTROLLER_HOST')
class { 'ceilometer::agent::auth':
class { '::ceilometer::agent::auth':
auth_url => "http://${config_controller_host}:35357/v2.0",
auth_password => hiera('CONFIG_CEILOMETER_KS_PW'),
}
class { 'ceilometer::agent::central':
class { '::ceilometer::agent::central':
coordination_url => $coordination_url,
}
class { 'ceilometer::alarm::notifier':}
class { '::ceilometer::alarm::notifier':}
class { 'ceilometer::alarm::evaluator':
class { '::ceilometer::alarm::evaluator':
coordination_url => $coordination_url,
}
class { 'ceilometer::api':
class { '::ceilometer::api':
keystone_host => hiera('CONFIG_CONTROLLER_HOST'),
keystone_password => hiera('CONFIG_CEILOMETER_KS_PW'),
}

2
packstack/puppet/templates/ceilometer_qpid.pp
View File

@@ -1,4 +1,4 @@
class { 'ceilometer':
class { '::ceilometer':
metering_secret => hiera('CONFIG_CEILOMETER_SECRET'),
qpid_hostname => hiera('CONFIG_AMQP_HOST'),
qpid_username => hiera('CONFIG_AMQP_AUTH_USER'),

2
packstack/puppet/templates/ceilometer_rabbitmq.pp
View File

@@ -1,4 +1,4 @@
class { 'ceilometer':
class { '::ceilometer':
metering_secret => hiera('CONFIG_CEILOMETER_SECRET'),
verbose => true,
debug => hiera('CONFIG_DEBUG_MODE'),

10
packstack/puppet/templates/cinder.pp
View File

@@ -6,18 +6,18 @@ package { 'python-keystone':
notify => Class['cinder::api'],
}
class { 'cinder::api':
class { '::cinder::api':
keystone_password => hiera('CONFIG_CINDER_KS_PW'),
keystone_tenant => 'services',
keystone_user => 'cinder',
keystone_auth_host => hiera('CONFIG_CONTROLLER_HOST'),
}
class { 'cinder::scheduler': }
class { '::cinder::scheduler': }
class { 'cinder::volume': }
class { '::cinder::volume': }
class { 'cinder::client': }
class { '::cinder::client': }
$cinder_config_controller_host = hiera('CONFIG_CONTROLLER_HOST')
@@ -29,6 +29,6 @@ Cinder::Type {
os_auth_url => "http://${cinder_config_controller_host}:5000/v2.0/",
}
class { 'cinder::backends':
class { '::cinder::backends':
enabled_backends => hiera_array('CONFIG_CINDER_BACKEND'),
}

4
packstack/puppet/templates/cinder_backup.pp
View File

@@ -1,8 +1,8 @@
class { 'cinder::backup': }
class { '::cinder::backup': }
$cinder_backup_conf_ctrl_host = hiera('CONFIG_CONTROLLER_HOST')
class { 'cinder::backup::swift':
class { '::cinder::backup::swift':
backup_swift_url => "http://${cinder_config_controller_host}:8080/v1/AUTH_",
}

2
packstack/puppet/templates/cinder_ceilometer.pp
View File

@@ -1,2 +1,2 @@
class { 'cinder::ceilometer': }
class { '::cinder::ceilometer': }

2
packstack/puppet/templates/cinder_lvm.pp
View File

@@ -1,7 +1,7 @@
$create_cinder_volume = hiera('CONFIG_CINDER_VOLUMES_CREATE')
if $create_cinder_volume == 'y' {
class { 'cinder::setup_test_volume':
class { '::cinder::setup_test_volume':
size => hiera('CONFIG_CINDER_VOLUMES_SIZE'),
loopback_device => '/dev/loop2',
volume_path => '/var/lib/cinder',

60
packstack/puppet/templates/cinder_netapp.pp
View File

@@ -26,15 +26,15 @@ if $netapp_storage_family == 'ontap_cluster' {
}
elsif $netapp_storage_protocol == 'iscsi' {
cinder::backend::netapp { $netapp_backend_name:
netapp_login => hiera('CONFIG_CINDER_NETAPP_LOGIN'),
netapp_password => hiera('CONFIG_CINDER_NETAPP_PASSWORD'),
netapp_server_hostname => hiera('CONFIG_CINDER_NETAPP_HOSTNAME'),
netapp_server_port => hiera('CONFIG_CINDER_NETAPP_SERVER_PORT'),
netapp_size_multiplier => hiera('CONFIG_CINDER_NETAPP_SIZE_MULTIPLIER'),
netapp_storage_family => hiera('CONFIG_CINDER_NETAPP_STORAGE_FAMILY'),
netapp_storage_protocol => hiera('CONFIG_CINDER_NETAPP_STORAGE_PROTOCOL'),
netapp_transport_type => hiera('CONFIG_CINDER_NETAPP_TRANSPORT_TYPE'),
netapp_vserver => hiera('CONFIG_CINDER_NETAPP_VSERVER'),
netapp_login => hiera('CONFIG_CINDER_NETAPP_LOGIN'),
netapp_password => hiera('CONFIG_CINDER_NETAPP_PASSWORD'),
netapp_server_hostname => hiera('CONFIG_CINDER_NETAPP_HOSTNAME'),
netapp_server_port => hiera('CONFIG_CINDER_NETAPP_SERVER_PORT'),
netapp_size_multiplier => hiera('CONFIG_CINDER_NETAPP_SIZE_MULTIPLIER'),
netapp_storage_family => hiera('CONFIG_CINDER_NETAPP_STORAGE_FAMILY'),
netapp_storage_protocol => hiera('CONFIG_CINDER_NETAPP_STORAGE_PROTOCOL'),
netapp_transport_type => hiera('CONFIG_CINDER_NETAPP_TRANSPORT_TYPE'),
netapp_vserver => hiera('CONFIG_CINDER_NETAPP_VSERVER'),
}
package { 'iscsi-initiator-utils': ensure => present }
@@ -61,16 +61,16 @@ elsif $netapp_storage_family == 'ontap_7mode' {
}
elsif $netapp_storage_protocol == 'iscsi' {
cinder::backend::netapp { $netapp_backend_name:
netapp_login => hiera('CONFIG_CINDER_NETAPP_LOGIN'),
netapp_password => hiera('CONFIG_CINDER_NETAPP_PASSWORD'),
netapp_server_hostname => hiera('CONFIG_CINDER_NETAPP_HOSTNAME'),
netapp_server_port => hiera('CONFIG_CINDER_NETAPP_SERVER_PORT'),
netapp_size_multiplier => hiera('CONFIG_CINDER_NETAPP_SIZE_MULTIPLIER'),
netapp_storage_family => hiera('CONFIG_CINDER_NETAPP_STORAGE_FAMILY'),
netapp_storage_protocol => hiera('CONFIG_CINDER_NETAPP_STORAGE_PROTOCOL'),
netapp_transport_type => hiera('CONFIG_CINDER_NETAPP_TRANSPORT_TYPE'),
netapp_vfiler => hiera('CONFIG_CINDER_NETAPP_VFILER'),
netapp_volume_list => hiera('CONFIG_CINDER_NETAPP_VOLUME_LIST'),
netapp_login => hiera('CONFIG_CINDER_NETAPP_LOGIN'),
netapp_password => hiera('CONFIG_CINDER_NETAPP_PASSWORD'),
netapp_server_hostname => hiera('CONFIG_CINDER_NETAPP_HOSTNAME'),
netapp_server_port => hiera('CONFIG_CINDER_NETAPP_SERVER_PORT'),
netapp_size_multiplier => hiera('CONFIG_CINDER_NETAPP_SIZE_MULTIPLIER'),
netapp_storage_family => hiera('CONFIG_CINDER_NETAPP_STORAGE_FAMILY'),
netapp_storage_protocol => hiera('CONFIG_CINDER_NETAPP_STORAGE_PROTOCOL'),
netapp_transport_type => hiera('CONFIG_CINDER_NETAPP_TRANSPORT_TYPE'),
netapp_vfiler => hiera('CONFIG_CINDER_NETAPP_VFILER'),
netapp_volume_list => hiera('CONFIG_CINDER_NETAPP_VOLUME_LIST'),
}
package { 'iscsi-initiator-utils': ensure => present }
@@ -78,17 +78,17 @@ elsif $netapp_storage_family == 'ontap_7mode' {
}
elsif $netapp_storage_family == 'eseries' {
cinder::backend::netapp { $netapp_backend_name:
netapp_login => hiera('CONFIG_CINDER_NETAPP_LOGIN'),
netapp_password => hiera('CONFIG_CINDER_NETAPP_PASSWORD'),
netapp_server_hostname => hiera('CONFIG_CINDER_NETAPP_HOSTNAME'),
netapp_server_port => hiera('CONFIG_CINDER_NETAPP_SERVER_PORT'),
netapp_storage_family => hiera('CONFIG_CINDER_NETAPP_STORAGE_FAMILY'),
netapp_storage_protocol => hiera('CONFIG_CINDER_NETAPP_STORAGE_PROTOCOL'),
netapp_transport_type => hiera('CONFIG_CINDER_NETAPP_TRANSPORT_TYPE'),
netapp_controller_ips => hiera('CONFIG_CINDER_NETAPP_CONTROLLER_IPS'),
netapp_sa_password => hiera('CONFIG_CINDER_NETAPP_SA_PASSWORD'),
netapp_storage_pools => hiera('CONFIG_CINDER_NETAPP_STORAGE_POOLS'),
netapp_webservice_path => hiera('CONFIG_CINDER_NETAPP_WEBSERVICE_PATH'),
netapp_login => hiera('CONFIG_CINDER_NETAPP_LOGIN'),
netapp_password => hiera('CONFIG_CINDER_NETAPP_PASSWORD'),
netapp_server_hostname => hiera('CONFIG_CINDER_NETAPP_HOSTNAME'),
netapp_server_port => hiera('CONFIG_CINDER_NETAPP_SERVER_PORT'),
netapp_storage_family => hiera('CONFIG_CINDER_NETAPP_STORAGE_FAMILY'),
netapp_storage_protocol => hiera('CONFIG_CINDER_NETAPP_STORAGE_PROTOCOL'),
netapp_transport_type => hiera('CONFIG_CINDER_NETAPP_TRANSPORT_TYPE'),
netapp_controller_ips => hiera('CONFIG_CINDER_NETAPP_CONTROLLER_IPS'),
netapp_sa_password => hiera('CONFIG_CINDER_NETAPP_SA_PASSWORD'),
netapp_storage_pools => hiera('CONFIG_CINDER_NETAPP_STORAGE_POOLS'),
netapp_webservice_path => hiera('CONFIG_CINDER_NETAPP_WEBSERVICE_PATH'),
}
package { 'iscsi-initiator-utils': ensure => present }

2
packstack/puppet/templates/cinder_qpid.pp
View File

@@ -1,7 +1,7 @@
$cinder_qpid_cfg_cinder_db_pw = hiera('CONFIG_CINDER_DB_PW')
$cinder_qpid_cfg_mariadb_host = hiera('CONFIG_MARIADB_HOST')
class {'cinder':
class { '::cinder':
rpc_backend => 'cinder.openstack.common.rpc.impl_qpid',
qpid_hostname => hiera('CONFIG_AMQP_HOST'),
qpid_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),

2
packstack/puppet/templates/cinder_rabbitmq.pp
View File

@@ -1,7 +1,7 @@
$cinder_rab_cfg_cinder_db_pw = hiera('CONFIG_CINDER_DB_PW')
$cinder_rab_cfg_mariadb_host = hiera('CONFIG_MARIADB_HOST')
class {'cinder':
class { '::cinder':
rabbit_host => hiera('CONFIG_AMQP_HOST'),
rabbit_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),
rabbit_use_ssl => hiera('CONFIG_AMQP_ENABLE_SSL'),

6
packstack/puppet/templates/glance.pp
View File

@@ -2,7 +2,7 @@ $glance_ks_pw = hiera('CONFIG_GLANCE_DB_PW')
$glance_mariadb_host = hiera('CONFIG_MARIADB_HOST')
$glance_cfg_ctrl_host = hiera('CONFIG_CONTROLLER_HOST')
class { 'glance::api':
class { '::glance::api':
auth_uri => "http://${glance_cfg_ctrl_host}:5000/",
identity_uri => "http://${glance_cfg_ctrl_host}:35357",
keystone_tenant => 'services',
@@ -12,10 +12,10 @@ class { 'glance::api':
database_connection => "mysql://glance:${glance_ks_pw}@${glance_mariadb_host}/glance",
verbose => true,
debug => hiera('CONFIG_DEBUG_MODE'),
os_region_name => hiera('CONFIG_KEYSTONE_REGION')
os_region_name => hiera('CONFIG_KEYSTONE_REGION'),
}
class { 'glance::registry':
class { '::glance::registry':
auth_uri => "http://${glance_cfg_ctrl_host}:5000/",
identity_uri => "http://${glance_cfg_ctrl_host}:35357",
keystone_tenant => 'services',

2
packstack/puppet/templates/glance_ceilometer_qpid.pp
View File

@@ -1,5 +1,5 @@
class { 'glance::notify::qpid':
class { '::glance::notify::qpid':
qpid_password => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
qpid_username => hiera('CONFIG_AMQP_AUTH_USER'),
qpid_hostname => hiera('CONFIG_AMQP_HOST'),

2
packstack/puppet/templates/glance_ceilometer_rabbitmq.pp
View File

@@ -1,5 +1,5 @@
class { 'glance::notify::rabbitmq':
class { '::glance::notify::rabbitmq':
rabbit_host => hiera('CONFIG_AMQP_HOST'),
rabbit_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),
rabbit_use_ssl => hiera('CONFIG_AMQP_ENABLE_SSL'),

2
packstack/puppet/templates/glance_file.pp
View File

@@ -1,5 +1,5 @@
# TO-DO: Make this configurable
class { 'glance::backend::file':
class { '::glance::backend::file':
filesystem_store_datadir => '/var/lib/glance/images/',
}

2
packstack/puppet/templates/glance_swift.pp
View File

@@ -1,6 +1,6 @@
$gla_bd_ct_h = hiera('CONFIG_CONTROLLER_HOST')
class { 'glance::backend::swift':
class { '::glance::backend::swift':
swift_store_user => 'services:glance',
swift_store_key => hiera('CONFIG_GLANCE_KS_PW'),
swift_store_auth_address => "http://${gla_bd_ct_h}:35357/v2.0/",

6
packstack/puppet/templates/heat.pp
View File

@@ -1,9 +1,9 @@
class { 'heat::api': }
class { '::heat::api': }
$heat_cfg_ctrl_host = hiera('CONFIG_CONTROLLER_HOST')
class { 'heat::engine':
class { '::heat::engine':
heat_metadata_server_url => "http://${heat_cfg_ctrl_host}:8000",
heat_waitcondition_server_url => "http://${heat_cfg_ctrl_host}:8000/v1/waitcondition",
heat_watch_server_url => "http://${heat_cfg_ctrl_host}:8003",
@@ -17,7 +17,7 @@ keystone_user_role { 'admin@admin':
require => Class['heat::engine'],
}
class { 'heat::keystone::domain':
class { '::heat::keystone::domain':
auth_url => "http://${heat_cfg_ctrl_host}:35357/v2.0",
keystone_admin => 'admin',
keystone_password => hiera('CONFIG_KEYSTONE_ADMIN_PW'),

4
packstack/puppet/templates/heat_cfn.pp
View File

@@ -1,9 +1,9 @@
class { 'heat::api_cfn': }
class { '::heat::api_cfn': }
$heat_cfn_cfg_ctrl_host = hiera('CONFIG_CONTROLLER_HOST')
class { 'heat::keystone::auth_cfn':
class { '::heat::keystone::auth_cfn':
admin_address => $heat_cfn_cfg_ctrl_host,
public_address => $heat_cfn_cfg_ctrl_host,
internal_address => $heat_cfn_cfg_ctrl_host,

2
packstack/puppet/templates/heat_cloudwatch.pp
View File

@@ -1,3 +1,3 @@
class { 'heat::api_cloudwatch': }
class { '::heat::api_cloudwatch': }

2
packstack/puppet/templates/heat_qpid.pp
View File

@@ -2,7 +2,7 @@ $heat_qpid_cfg_ctrl_host = hiera('CONFIG_CONTROLLER_HOST')
$heat_qpid_cfg_heat_db_pw = hiera('CONFIG_HEAT_DB_PW')
$heat_qpid_cfg_mariadb_host = hiera('CONFIG_MARIADB_HOST')
class { 'heat':
class { '::heat':
keystone_host => $heat_cfn_cfg_ctrl_host,
keystone_password => hiera('CONFIG_HEAT_KS_PW'),
auth_uri => "http://${heat_qpid_cfg_ctrl_host}:35357/v2.0",

2
packstack/puppet/templates/heat_rabbitmq.pp
View File

@@ -2,7 +2,7 @@ $heat_rabbitmq_cfg_ctrl_host = hiera('CONFIG_CONTROLLER_HOST')
$heat_rabbitmq_cfg_heat_db_pw = hiera('CONFIG_HEAT_DB_PW')
$heat_rabbitmq_cfg_mariadb_host = hiera('CONFIG_MARIADB_HOST')
class { 'heat':
class { '::heat':
keystone_host => $heat_rabbitmq_cfg_ctrl_host,
keystone_password => hiera('CONFIG_HEAT_KS_PW'),
auth_uri => "http://${heat_rabbitmq_cfg_ctrl_host}:35357/v2.0",

34
packstack/puppet/templates/horizon.pp
View File

@@ -1,4 +1,4 @@
include packstack::apache_common
include ::packstack::apache_common
$keystone_host = hiera('CONFIG_CONTROLLER_HOST')
@@ -14,23 +14,23 @@ $is_django_debug = hiera('CONFIG_DEBUG_MODE') ? {
false => 'False',
}
class {'horizon':
class {'::horizon':
secret_key => hiera('CONFIG_HORIZON_SECRET_KEY'),
keystone_url => "http://${keystone_host}:5000/v2.0",
keystone_default_role => '_member_',
server_aliases => [hiera('CONFIG_CONTROLLER_HOST'), "$::fqdn", 'localhost'],
allowed_hosts => '*',
hypervisor_options => {'can_set_mount_point' => false, },
compress_offline => false,
django_debug => $is_django_debug,
file_upload_temp_dir => '/var/tmp',
listen_ssl => hiera('CONFIG_HORIZON_SSL'),
horizon_cert => '/etc/pki/tls/certs/ssl_ps_server.crt',
horizon_key => '/etc/pki/tls/private/ssl_ps_server.key',
horizon_ca => '/etc/pki/tls/certs/ssl_ps_chain.crt',
neutron_options => {
'enable_lb' => hiera('CONFIG_HORIZON_NEUTRON_LB'),
'enable_firewall' => hiera('CONFIG_HORIZON_NEUTRON_FW'),
server_aliases => [hiera('CONFIG_CONTROLLER_HOST'), $::fqdn, 'localhost'],
allowed_hosts => '*',
hypervisor_options => {'can_set_mount_point' => false, },
compress_offline => false,
django_debug => $is_django_debug,
file_upload_temp_dir => '/var/tmp',
listen_ssl => hiera('CONFIG_HORIZON_SSL'),
horizon_cert => '/etc/pki/tls/certs/ssl_ps_server.crt',
horizon_key => '/etc/pki/tls/private/ssl_ps_server.key',
horizon_ca => '/etc/pki/tls/certs/ssl_ps_chain.crt',
neutron_options => {
'enable_lb' => hiera('CONFIG_HORIZON_NEUTRON_LB'),
'enable_firewall' => hiera('CONFIG_HORIZON_NEUTRON_FW'),
},
}
@@ -38,7 +38,7 @@ $is_horizon_ssl = hiera('CONFIG_HORIZON_SSL')
if $is_horizon_ssl == true {
file {'/etc/pki/tls/certs/ps_generate_ssl_certs.ssh':
ensure => present,
ensure => file,
content => template('packstack/ssl/generate_ssl_certs.sh.erb'),
mode => '0755',
}
@@ -68,7 +68,7 @@ if $is_horizon_ssl == true {
}
}
class { 'memcached': }
class { '::memcached': }
$firewall_port = hiera('CONFIG_HORIZON_PORT')

6
packstack/puppet/templates/ironic.pp
View File

@@ -2,11 +2,11 @@ ironic_config {
'glance/glance_host': value => hiera('CONFIG_STORAGE_HOST');
}
class { 'ironic::api':
class { '::ironic::api':
auth_host => hiera('CONFIG_CONTROLLER_HOST'),
admin_password => hiera('CONFIG_IRONIC_KS_PW'),
}
class { 'ironic::client': }
class { '::ironic::client': }
class { 'ironic::conductor': }
class { '::ironic::conductor': }

2
packstack/puppet/templates/ironic_qpid.pp
View File

@@ -1,7 +1,7 @@
$ironic_qpid_cfg_ironic_db_pw = hiera('CONFIG_IRONIC_DB_PW')
$ironic_qpid_cfg_mariadb_host = hiera('CONFIG_MARIADB_HOST')
class { 'ironic':
class { '::ironic':
rpc_backend => 'ironic.openstack.common.rpc.impl_qpid',
qpid_hostname => hiera('CONFIG_AMQP_HOST'),
qpid_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),

2
packstack/puppet/templates/ironic_rabbitmq.pp
View File

@@ -1,7 +1,7 @@
$ironic_rabbitmq_cfg_ironic_db_pw = hiera('CONFIG_IRONIC_DB_PW')
$ironic_rabbitmq_cfg_mariadb_host = hiera('CONFIG_MARIADB_HOST')
class { 'ironic':
class { '::ironic':
rpc_backend => 'ironic.openstack.common.rpc.impl_kombu',
rabbit_host => hiera('CONFIG_AMQP_HOST'),
rabbit_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),

96
packstack/puppet/templates/keystone.pp
View File

@@ -8,7 +8,7 @@ $keystone_api_version_str = hiera('CONFIG_KEYSTONE_API_VERSION')
$keystone_url = "http://${keystone_endpoint_cfg_ctrl_host}:5000/${keystone_api_version_str}"
$keystone_admin_url = "http://${keystone_endpoint_cfg_ctrl_host}:35357/${keystone_api_version_str}"
class { 'keystone':
class { '::keystone':
admin_token => hiera('CONFIG_KEYSTONE_ADMIN_TOKEN'),
database_connection => "mysql://keystone_admin:${keystone_cfg_ks_db_pw}@${keystone_cfg_mariadb_host}/keystone",
token_provider => "keystone.token.providers.${keystone_token_provider_str}.Provider",
@@ -19,14 +19,14 @@ class { 'keystone':
}
if $keystone_service_name == 'httpd' {
include packstack::apache_common
include ::packstack::apache_common
class { 'keystone::wsgi::apache':
class { '::keystone::wsgi::apache':
ssl => $keystone_use_ssl,
}
}
class { 'keystone::roles::admin':
class { '::keystone::roles::admin':
email => 'root@localhost',
password => hiera('CONFIG_KEYSTONE_ADMIN_PW'),
admin_tenant => 'admin',
@@ -44,7 +44,7 @@ keystone::resource::service_identity { 'keystone':
}
# default assignment driver is SQL
$assignment_driver = "keystone.assignment.backends.sql.Assignment"
$assignment_driver = 'keystone.assignment.backends.sql.Assignment'
if hiera('CONFIG_KEYSTONE_IDENTITY_BACKEND') == 'ldap' {
@@ -56,49 +56,49 @@ if hiera('CONFIG_KEYSTONE_IDENTITY_BACKEND') == 'ldap' {
# should be supported and enabled in the next release of puppet-keystone
# user_enabled_invert => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_ENABLED_INVERT'),
class {"keystone::ldap":
url => hiera_undef('CONFIG_KEYSTONE_LDAP_URL', undef),
user => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_DN', undef),
password => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_PASSWORD', undef),
suffix => hiera_undef('CONFIG_KEYSTONE_LDAP_SUFFIX', undef),
query_scope => hiera_undef('CONFIG_KEYSTONE_LDAP_QUERY_SCOPE', undef),
page_size => hiera_undef('CONFIG_KEYSTONE_LDAP_PAGE_SIZE', undef),
user_tree_dn => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_SUBTREE', undef),
user_filter => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_FILTER', undef),
user_objectclass => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_OBJECTCLASS', undef),
user_id_attribute => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_ID_ATTRIBUTE', undef),
user_name_attribute => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_NAME_ATTRIBUTE', undef),
user_mail_attribute => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_MAIL_ATTRIBUTE', undef),
user_enabled_attribute => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_ENABLED_ATTRIBUTE', undef),
user_enabled_mask => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_ENABLED_MASK', undef),
user_enabled_default => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_ENABLED_DEFAULT', undef),
user_attribute_ignore => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_ATTRIBUTE_IGNORE', undef),
user_default_project_id_attribute => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_DEFAULT_PROJECT_ID_ATTRIBUTE', undef),
user_allow_create => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_ALLOW_CREATE', undef),
user_allow_update => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_ALLOW_UPDATE', undef),
user_allow_delete => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_ALLOW_DELETE', undef),
user_pass_attribute => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_PASS_ATTRIBUTE', undef),
user_enabled_emulation => $user_enabled_emulation,
user_enabled_emulation_dn => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_ENABLED_EMULATION_DN', undef),
user_additional_attribute_mapping => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_ADDITIONAL_ATTRIBUTE_MAPPING', undef),
group_tree_dn => hiera_undef('CONFIG_KEYSTONE_LDAP_GROUP_SUBTREE', undef),
group_filter => hiera_undef('CONFIG_KEYSTONE_LDAP_GROUP_FILTER', undef),
group_objectclass => hiera_undef('CONFIG_KEYSTONE_LDAP_GROUP_OBJECTCLASS', undef),
group_id_attribute => hiera_undef('CONFIG_KEYSTONE_LDAP_GROUP_ID_ATTRIBUTE', undef),
group_name_attribute => hiera_undef('CONFIG_KEYSTONE_LDAP_GROUP_NAME_ATTRIBUTE', undef),
group_member_attribute => hiera_undef('CONFIG_KEYSTONE_LDAP_GROUP_MEMBER_ATTRIBUTE', undef),
group_desc_attribute => hiera_undef('CONFIG_KEYSTONE_LDAP_GROUP_DESC_ATTRIBUTE', undef),
group_attribute_ignore => hiera_undef('CONFIG_KEYSTONE_LDAP_GROUP_ATTRIBUTE_IGNORE', undef),
group_allow_create => hiera_undef('CONFIG_KEYSTONE_LDAP_GROUP_ALLOW_CREATE', undef),
group_allow_update => hiera_undef('CONFIG_KEYSTONE_LDAP_GROUP_ALLOW_UPDATE', undef),
group_allow_delete => hiera_undef('CONFIG_KEYSTONE_LDAP_GROUP_ALLOW_DELETE', undef),
group_additional_attribute_mapping => hiera_undef('CONFIG_KEYSTONE_LDAP_GROUP_ADDITIONAL_ATTRIBUTE_MAPPING', undef),
use_tls => hiera_undef('CONFIG_KEYSTONE_LDAP_USE_TLS', undef),
tls_cacertdir => hiera_undef('CONFIG_KEYSTONE_LDAP_TLS_CACERTDIR', undef),
tls_cacertfile => hiera_undef('CONFIG_KEYSTONE_LDAP_TLS_CACERTFILE', undef),
tls_req_cert => hiera_undef('CONFIG_KEYSTONE_LDAP_TLS_REQ_CERT', undef),
identity_driver => "keystone.identity.backends.ldap.Identity",
assignment_driver => $assignment_driver,
class { '::keystone::ldap':
url => hiera_undef('CONFIG_KEYSTONE_LDAP_URL', undef),
user => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_DN', undef),
password => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_PASSWORD', undef),
suffix => hiera_undef('CONFIG_KEYSTONE_LDAP_SUFFIX', undef),
query_scope => hiera_undef('CONFIG_KEYSTONE_LDAP_QUERY_SCOPE', undef),
page_size => hiera_undef('CONFIG_KEYSTONE_LDAP_PAGE_SIZE', undef),
user_tree_dn => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_SUBTREE', undef),
user_filter => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_FILTER', undef),
user_objectclass => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_OBJECTCLASS', undef),
user_id_attribute => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_ID_ATTRIBUTE', undef),
user_name_attribute => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_NAME_ATTRIBUTE', undef),
user_mail_attribute => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_MAIL_ATTRIBUTE', undef),
user_enabled_attribute => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_ENABLED_ATTRIBUTE', undef),
user_enabled_mask => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_ENABLED_MASK', undef),
user_enabled_default => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_ENABLED_DEFAULT', undef),
user_attribute_ignore => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_ATTRIBUTE_IGNORE', undef),
user_default_project_id_attribute => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_DEFAULT_PROJECT_ID_ATTRIBUTE', undef),
user_allow_create => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_ALLOW_CREATE', undef),
user_allow_update => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_ALLOW_UPDATE', undef),
user_allow_delete => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_ALLOW_DELETE', undef),
user_pass_attribute => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_PASS_ATTRIBUTE', undef),
user_enabled_emulation => $user_enabled_emulation,
user_enabled_emulation_dn => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_ENABLED_EMULATION_DN', undef),
user_additional_attribute_mapping => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_ADDITIONAL_ATTRIBUTE_MAPPING', undef),
group_tree_dn => hiera_undef('CONFIG_KEYSTONE_LDAP_GROUP_SUBTREE', undef),
group_filter => hiera_undef('CONFIG_KEYSTONE_LDAP_GROUP_FILTER', undef),
group_objectclass => hiera_undef('CONFIG_KEYSTONE_LDAP_GROUP_OBJECTCLASS', undef),
group_id_attribute => hiera_undef('CONFIG_KEYSTONE_LDAP_GROUP_ID_ATTRIBUTE', undef),
group_name_attribute => hiera_undef('CONFIG_KEYSTONE_LDAP_GROUP_NAME_ATTRIBUTE', undef),
group_member_attribute => hiera_undef('CONFIG_KEYSTONE_LDAP_GROUP_MEMBER_ATTRIBUTE', undef),
group_desc_attribute => hiera_undef('CONFIG_KEYSTONE_LDAP_GROUP_DESC_ATTRIBUTE', undef),
group_attribute_ignore => hiera_undef('CONFIG_KEYSTONE_LDAP_GROUP_ATTRIBUTE_IGNORE', undef),
group_allow_create => hiera_undef('CONFIG_KEYSTONE_LDAP_GROUP_ALLOW_CREATE', undef),
group_allow_update => hiera_undef('CONFIG_KEYSTONE_LDAP_GROUP_ALLOW_UPDATE', undef),
group_allow_delete => hiera_undef('CONFIG_KEYSTONE_LDAP_GROUP_ALLOW_DELETE', undef),
group_additional_attribute_mapping => hiera_undef('CONFIG_KEYSTONE_LDAP_GROUP_ADDITIONAL_ATTRIBUTE_MAPPING', undef),
use_tls => hiera_undef('CONFIG_KEYSTONE_LDAP_USE_TLS', undef),
tls_cacertdir => hiera_undef('CONFIG_KEYSTONE_LDAP_TLS_CACERTDIR', undef),
tls_cacertfile => hiera_undef('CONFIG_KEYSTONE_LDAP_TLS_CACERTFILE', undef),
tls_req_cert => hiera_undef('CONFIG_KEYSTONE_LDAP_TLS_REQ_CERT', undef),
identity_driver => 'keystone.identity.backends.ldap.Identity',
assignment_driver => $assignment_driver,
}
}

2
packstack/puppet/templates/keystone_ceilometer.pp
View File

@@ -1,5 +1,5 @@
class { 'ceilometer::keystone::auth':
class { '::ceilometer::keystone::auth':
region => hiera('CONFIG_KEYSTONE_REGION'),
password => hiera('CONFIG_CEILOMETER_KS_PW'),
public_address => hiera('CONFIG_CONTROLLER_HOST'),

2
packstack/puppet/templates/keystone_cinder.pp
View File

@@ -1,5 +1,5 @@
class { 'cinder::keystone::auth':
class { '::cinder::keystone::auth':
region => hiera('CONFIG_KEYSTONE_REGION'),
password => hiera('CONFIG_CINDER_KS_PW'),
public_address => hiera('CONFIG_STORAGE_HOST'),

2
packstack/puppet/templates/keystone_glance.pp
View File

@@ -1,5 +1,5 @@
class { 'glance::keystone::auth':
class { '::glance::keystone::auth':
region => hiera('CONFIG_KEYSTONE_REGION'),
password => hiera('CONFIG_GLANCE_KS_PW'),
public_address => hiera('CONFIG_STORAGE_HOST'),

4
packstack/puppet/templates/keystone_heat.pp
View File

@@ -1,5 +1,5 @@
# heat::keystone::auth
class { 'heat::keystone::auth':
class { '::heat::keystone::auth':
region => hiera('CONFIG_KEYSTONE_REGION'),
password => hiera('CONFIG_HEAT_KS_PW'),
public_address => hiera('CONFIG_CONTROLLER_HOST'),
@@ -12,7 +12,7 @@ $is_heat_cfn_install = hiera('CONFIG_HEAT_CFN_INSTALL')
if $is_heat_cfn_install == 'y' {
# heat::keystone::cfn
class { "heat::keystone::auth_cfn":
class { '::heat::keystone::auth_cfn':
password => hiera('CONFIG_HEAT_KS_PW'),
public_address => hiera('CONFIG_CONTROLLER_HOST'),
admin_address => hiera('CONFIG_CONTROLLER_HOST'),

2
packstack/puppet/templates/keystone_ironic.pp
View File

@@ -1,5 +1,5 @@
class {'ironic::keystone::auth':
class { '::ironic::keystone::auth':
region => hiera('CONFIG_KEYSTONE_REGION'),
password => hiera('CONFIG_IRONIC_KS_PW'),
public_address => hiera('CONFIG_CONTROLLER_HOST'),

2
packstack/puppet/templates/keystone_manila.pp
View File

@@ -1,5 +1,5 @@
class { 'manila::keystone::auth':
class { '::manila::keystone::auth':
password => hiera('CONFIG_MANILA_KS_PW'),
public_address => hiera('CONFIG_CONTROLLER_HOST'),
admin_address => hiera('CONFIG_CONTROLLER_HOST'),

2
packstack/puppet/templates/keystone_neutron.pp
View File

@@ -1,5 +1,5 @@
class { 'neutron::keystone::auth':
class { '::neutron::keystone::auth':
region => hiera('CONFIG_KEYSTONE_REGION'),
password => hiera('CONFIG_NEUTRON_KS_PW'),
public_address => hiera('CONFIG_CONTROLLER_HOST'),

2
packstack/puppet/templates/keystone_nova.pp
View File

@@ -1,5 +1,5 @@
class { 'nova::keystone::auth':
class { '::nova::keystone::auth':
region => hiera('CONFIG_KEYSTONE_REGION'),
password => hiera('CONFIG_NOVA_KS_PW'),
public_address => hiera('CONFIG_CONTROLLER_HOST'),

2
packstack/puppet/templates/keystone_sahara.pp
View File

@@ -1,4 +1,4 @@
class { 'sahara::keystone::auth':
class { '::sahara::keystone::auth':
password => hiera('CONFIG_SAHARA_KS_PW'),
public_address => hiera('CONFIG_SAHARA_HOST'),
admin_address => hiera('CONFIG_SAHARA_HOST'),

2
packstack/puppet/templates/keystone_swift.pp
View File

@@ -1,4 +1,4 @@
class { 'swift::keystone::auth':
class { '::swift::keystone::auth':
public_address => hiera('CONFIG_CONTROLLER_HOST'),
region => hiera('CONFIG_KEYSTONE_REGION'),
password => hiera('CONFIG_SWIFT_KS_PW'),

2
packstack/puppet/templates/keystone_trove.pp
View File

@@ -1,5 +1,5 @@
class { 'trove::keystone::auth':
class { '::trove::keystone::auth':
region => hiera('CONFIG_KEYSTONE_REGION'),
password => hiera('CONFIG_TROVE_KS_PW'),
public_address => hiera('CONFIG_CONTROLLER_HOST'),

10
packstack/puppet/templates/manila.pp
View File

@@ -6,24 +6,24 @@ package { 'python-keystone':
notify => Class['manila::api'],
}
class { 'manila::api':
class { '::manila::api':
keystone_password => hiera('CONFIG_MANILA_KS_PW'),
keystone_tenant => 'services',
keystone_user => 'manila',
keystone_auth_host => hiera('CONFIG_CONTROLLER_HOST'),
}
class { 'manila::network::neutron':
class { '::manila::network::neutron':
neutron_admin_password => hiera('CONFIG_NEUTRON_KS_PW'),
neutron_admin_tenant_name => 'services',
}
class { 'manila::scheduler':
class { '::manila::scheduler':
}
class { 'manila::share':
class { '::manila::share':
}
class { 'manila::backends':
class { '::manila::backends':
enabled_share_backends => hiera('CONFIG_MANILA_BACKEND'),
}

4
packstack/puppet/templates/manila_generic.pp
View File

@@ -12,12 +12,12 @@ manila::service_instance{ 'generic':
service_instance_password => hiera('CONFIG_MANILA_SERVICE_INSTANCE_PASSWORD'),
}
class { 'manila::compute::nova':
class { '::manila::compute::nova':
nova_admin_password => hiera('CONFIG_NOVA_KS_PW'),
nova_admin_tenant_name => 'services',
}
class { 'manila::volume::cinder':
class { '::manila::volume::cinder':
cinder_admin_password => hiera('CONFIG_CINDER_KS_PW'),
cinder_admin_tenant_name => 'services',
}

2
packstack/puppet/templates/manila_qpid.pp
View File

@@ -2,7 +2,7 @@
$db_pw = hiera('CONFIG_MANILA_DB_PW')
$mariadb_host = hiera('CONFIG_MARIADB_HOST')
class {'manila':
class { '::manila':
rpc_backend => 'manila.openstack.common.rpc.impl_qpid',
qpid_hostname => hiera('CONFIG_AMQP_HOST'),
qpid_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),

2
packstack/puppet/templates/manila_rabbitmq.pp
View File

@@ -2,7 +2,7 @@
$db_pw = hiera('CONFIG_MANILA_DB_PW')
$mariadb_host = hiera('CONFIG_MARIADB_HOST')
class { 'manila':
class { '::manila':
rabbit_host => hiera('CONFIG_AMQP_HOST'),
rabbit_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),
rabbit_use_ssl => hiera('CONFIG_AMQP_ENABLE_SSL'),

2
packstack/puppet/templates/mariadb_cinder_install.pp
View File

@@ -1,4 +1,4 @@
class { 'cinder::db::mysql':
class { '::cinder::db::mysql':
password => hiera('CONFIG_CINDER_DB_PW'),
host => '%%',
allowed_hosts => '%%',

2
packstack/puppet/templates/mariadb_glance_install.pp
View File

@@ -1,4 +1,4 @@
class { 'glance::db::mysql':
class { '::glance::db::mysql':
password => hiera('CONFIG_GLANCE_DB_PW'),
host => '%%',
allowed_hosts => '%%',

2
packstack/puppet/templates/mariadb_heat_install.pp
View File

@@ -1,4 +1,4 @@
class { 'heat::db::mysql':
class { '::heat::db::mysql':
password => hiera('CONFIG_HEAT_DB_PW'),
host => '%%',
allowed_hosts => '%%',

6
packstack/puppet/templates/mariadb_install.pp
View File

@@ -4,7 +4,7 @@ package { 'mariadb-server':
ensure => absent,
}
class { 'mysql::server':
class { '::mysql::server':
package_name => 'mariadb-galera-server',
restart => true,
root_password => hiera('CONFIG_MARIADB_PW'),
@@ -14,8 +14,8 @@ class { 'mysql::server':
default_storage_engine => 'InnoDB',
max_connections => '1024',
open_files_limit => '-1',
}
}
},
},
}
# deleting database users for security

2
packstack/puppet/templates/mariadb_ironic_install.pp
View File

@@ -1,4 +1,4 @@
class { 'ironic::db::mysql':
class { '::ironic::db::mysql':
password => hiera('CONFIG_IRONIC_DB_PW'),
host => '%%',
allowed_hosts => '%%',

2
packstack/puppet/templates/mariadb_keystone_install.pp
View File

@@ -1,4 +1,4 @@
class { 'keystone::db::mysql':
class { '::keystone::db::mysql':
user => 'keystone_admin',
password => hiera('CONFIG_KEYSTONE_DB_PW'),
allowed_hosts => '%%',

2
packstack/puppet/templates/mariadb_manila_install.pp
View File

@@ -1,4 +1,4 @@
class { 'manila::db::mysql':
class { '::manila::db::mysql':
password => hiera('CONFIG_MANILA_DB_PW'),
allowed_hosts => '%%',
charset => 'utf8',

2
packstack/puppet/templates/mariadb_neutron_install.pp
View File

@@ -1,4 +1,4 @@
class { 'neutron::db::mysql':
class { '::neutron::db::mysql':
password => hiera('CONFIG_NEUTRON_DB_PW'),
host => '%%',
allowed_hosts => '%%',

2
packstack/puppet/templates/mariadb_noinstall.pp
View File

@@ -1,2 +1,2 @@
class { 'remote::db': }
class { '::remote::db': }

2
packstack/puppet/templates/mariadb_nova_install.pp
View File

@@ -1,4 +1,4 @@
class { 'nova::db::mysql':
class { '::nova::db::mysql':
password => hiera('CONFIG_NOVA_DB_PW'),
host => '%%',
allowed_hosts => '%%',

2
packstack/puppet/templates/mariadb_sahara_install.pp
View File

@@ -1,4 +1,4 @@
class { 'sahara::db::mysql':
class { '::sahara::db::mysql':
password => hiera('CONFIG_SAHARA_DB_PW'),
host => '%%',
allowed_hosts => '%%',

2
packstack/puppet/templates/mariadb_trove_install.pp
View File

@@ -1,4 +1,4 @@
class { 'trove::db::mysql':
class { '::trove::db::mysql':
password => hiera('CONFIG_TROVE_DB_PW'),
host => '%%',
allowed_hosts => '%%',

38
packstack/puppet/templates/mariadb_trove_noinstall.pp
View File

@@ -1,29 +1,29 @@
remote_database {'trove':
ensure => 'present',
charset => 'utf8',
db_host => hiera('CONFIG_MARIADB_HOST'),
db_user => hiera('CONFIG_MARIADB_USER'),
db_password => hiera('CONFIG_MARIADB_PW'),
provider => 'mysql',
remote_database { 'trove':
ensure => 'present',
charset => 'utf8',
db_host => hiera('CONFIG_MARIADB_HOST'),
db_user => hiera('CONFIG_MARIADB_USER'),
db_password => hiera('CONFIG_MARIADB_PW'),
provider => 'mysql',
}
$trove_cfg_trove_db_pw = hiera('CONFIG_TROVE_DB_PW')
remote_database_user { 'trove@%%':
password_hash => mysql_password($trove_cfg_trove_db_pw),
db_host => hiera('CONFIG_MARIADB_HOST'),
db_user => hiera('CONFIG_MARIADB_USER'),
db_password => hiera('CONFIG_MARIADB_PW'),
provider => 'mysql',
require => Remote_database['trove'],
password_hash => mysql_password($trove_cfg_trove_db_pw),
db_host => hiera('CONFIG_MARIADB_HOST'),
db_user => hiera('CONFIG_MARIADB_USER'),
db_password => hiera('CONFIG_MARIADB_PW'),
provider => 'mysql',
require => Remote_database['trove'],
}
remote_database_grant { 'trove@%%/trove':
privileges => "all",
db_host => hiera('CONFIG_MARIADB_HOST'),
db_user => hiera('CONFIG_MARIADB_USER'),
db_password => hiera('CONFIG_MARIADB_PW'),
provider => 'mysql',
require => Remote_database_user['trove@%%'],
privileges => 'all',
db_host => hiera('CONFIG_MARIADB_HOST'),
db_user => hiera('CONFIG_MARIADB_USER'),
db_password => hiera('CONFIG_MARIADB_PW'),
provider => 'mysql',
require => Remote_database_user['trove@%%'],
}

2
packstack/puppet/templates/mongodb.pp
View File

@@ -1,6 +1,6 @@
$mongodb_host = hiera('CONFIG_MONGODB_HOST')
class { 'mongodb::server':
class { '::mongodb::server':
smallfiles => true,
bind_ip => [$mongodb_host],
}

4
packstack/puppet/templates/nagios_nrpe.pp
View File

@@ -4,7 +4,7 @@ package{ 'nrpe':
}
file{ '/etc/nagios/nrpe.cfg':
ensure => 'present',
ensure => file,
mode => '0644',
owner => 'nagios',
group => 'nagios',
@@ -35,7 +35,7 @@ class nagios_configs () {
}
}
class{'nagios_configs':
class{ '::nagios_configs':
notify => Service['nrpe'],
}

32
packstack/puppet/templates/nagios_server.pp
View File

@@ -1,4 +1,4 @@
include packstack::apache_common
include ::packstack::apache_common
package { ['nagios', 'nagios-plugins-nrpe']:
ensure => present,
@@ -10,12 +10,12 @@ exec { 'nagios-plugins-ping':
path => '/usr/bin',
command => 'yum install -y -d 0 -e 0 monitoring-plugins-ping',
onlyif => 'yum install -y -d 0 -e 0 nagios-plugins-ping &> /dev/null && exit 1 || exit 0',
before => Class['nagios_configs']
before => Class['nagios_configs'],
}
class nagios_configs(){
file { ['/etc/nagios/nagios_command.cfg', '/etc/nagios/nagios_host.cfg']:
ensure => 'present',
ensure => file,
mode => '0644',
owner => 'nagios',
group => 'nagios',
@@ -24,7 +24,7 @@ class nagios_configs(){
# Remove the entry for localhost, it contains services we're not
# monitoring
file { ['/etc/nagios/objects/localhost.cfg']:
ensure => 'present',
ensure => file,
content => '',
}
@@ -57,10 +57,10 @@ class nagios_configs(){
$nagios_cfg_ctrl_host = hiera('CONFIG_CONTROLLER_HOST')
file { '/etc/nagios/keystonerc_admin':
ensure => 'present',
owner => 'nagios',
mode => '0600',
content => "export OS_USERNAME=admin
ensure => file,
owner => 'nagios',
mode => '0600',
content => "export OS_USERNAME=admin
export OS_TENANT_NAME=admin
export OS_PASSWORD=${nagios_cfg_ks_adm_pw}
export OS_AUTH_URL=http://${nagios_cfg_ctrl_host}:35357/v2.0/ ",
@@ -69,17 +69,17 @@ export OS_AUTH_URL=http://${nagios_cfg_ctrl_host}:35357/v2.0/ ",
%(CONFIG_NAGIOS_MANIFEST_CONFIG)s
}
class { 'nagios_configs':
notify => [Service['nagios'], Service['httpd']],
class { '::nagios_configs':
notify => [ Service['nagios'], Service['httpd']],
}
include concat::setup
include ::concat::setup
class { 'apache':
class { '::apache':
purge_configs => false,
}
class { 'apache::mod::php': }
class { '::apache::mod::php': }
service { ['nagios']:
ensure => running,
@@ -88,9 +88,9 @@ service { ['nagios']:
}
firewall { '001 nagios incoming':
proto => 'tcp',
dport => ['80'],
action => 'accept',
proto => 'tcp',
dport => ['80'],
action => 'accept',
}
# ensure that we won't stop listening on 443 if horizon has ssl enabled

2
packstack/puppet/templates/neutron_api.pp
View File

@@ -1,4 +1,4 @@
class { 'neutron::server':
class { '::neutron::server':
database_connection => $neutron_sql_connection,
auth_password => $neutron_user_password,
auth_host => hiera('CONFIG_CONTROLLER_HOST'),

2
packstack/puppet/templates/neutron_bridge_module.pp
View File

@@ -1,2 +1,2 @@
class { 'packstack::neutron::bridge': }
class { '::packstack::neutron::bridge': }

2
packstack/puppet/templates/neutron_dhcp.pp
View File

@@ -1,4 +1,4 @@
class { 'neutron::agents::dhcp':
class { '::neutron::agents::dhcp':
interface_driver => hiera('CONFIG_NEUTRON_DHCP_INTERFACE_DRIVER'),
debug => hiera('CONFIG_DEBUG_MODE'),
}

2
packstack/puppet/templates/neutron_dhcp_mtu.pp
View File

@@ -1,4 +1,4 @@
class { 'neutron::agents::dhcp':
class { '::neutron::agents::dhcp':
interface_driver => hiera('CONFIG_NEUTRON_DHCP_INTERFACE_DRIVER'),
debug => hiera('CONFIG_DEBUG_MODE'),
dnsmasq_config_file => '/etc/neutron/dnsmasq-neutron.conf',

2
packstack/puppet/templates/neutron_fwaas.pp
View File

@@ -1,4 +1,4 @@
class { 'neutron::services::fwaas':
class { '::neutron::services::fwaas':
enabled => true,
}

2
packstack/puppet/templates/neutron_l3.pp
View File

@@ -1,4 +1,4 @@
class { 'neutron::agents::l3':
class { '::neutron::agents::l3':
interface_driver => hiera('CONFIG_NEUTRON_L3_INTERFACE_DRIVER'),
external_network_bridge => hiera('CONFIG_NEUTRON_L3_EXT_BRIDGE'),
debug => hiera('CONFIG_DEBUG_MODE'),

2
packstack/puppet/templates/neutron_lb_agent.pp
View File

@@ -1,3 +1,3 @@
class {'neutron::agents::linuxbridge':
class { '::neutron::agents::linuxbridge':
physical_interface_mappings => hiera('CONFIG_NEUTRON_LB_INTERFACE_MAPPINGS'),
}

2
packstack/puppet/templates/neutron_lbaas.pp
View File

@@ -1,4 +1,4 @@
class { 'neutron::agents::lbaas':
class { '::neutron::agents::lbaas':
interface_driver => hiera('CONFIG_NEUTRON_LBAAS_INTERFACE_DRIVER'),
device_driver => 'neutron.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver',
user_group => 'haproxy',

2
packstack/puppet/templates/neutron_metadata.pp
View File

@@ -1,6 +1,6 @@
$neutron_metadata_cfg_ctrl_host = hiera('CONFIG_CONTROLLER_HOST')
class { 'neutron::agents::metadata':
class { '::neutron::agents::metadata':
auth_password => hiera('CONFIG_NEUTRON_KS_PW'),
auth_url => "http://${neutron_metadata_cfg_ctrl_host}:35357/v2.0",
auth_region => hiera('CONFIG_KEYSTONE_REGION'),

2
packstack/puppet/templates/neutron_metering_agent.pp
View File

@@ -1,4 +1,4 @@
class { 'neutron::agents::metering':
class { '::neutron::agents::metering':
interface_driver => hiera('CONFIG_NEUTRON_METERING_IFCE_DRIVER'),
debug => hiera('CONFIG_DEBUG_MODE'),
}

2
packstack/puppet/templates/neutron_ml2_plugin.pp
View File

@@ -5,7 +5,7 @@ if hiera('CONFIG_NEUTRON_ML2_VXLAN_GROUP') == '' {
$vxlan_group_value = hiera('CONFIG_NEUTRON_ML2_VXLAN_GROUP')
}
class { 'neutron::plugins::ml2':
class { '::neutron::plugins::ml2':
type_drivers => hiera_array('CONFIG_NEUTRON_ML2_TYPE_DRIVERS'),
tenant_network_types => hiera_array('CONFIG_NEUTRON_ML2_TENANT_NETWORK_TYPES'),
mechanism_drivers => hiera_array('CONFIG_NEUTRON_ML2_MECHANISM_DRIVERS'),

2
packstack/puppet/templates/neutron_notifications.pp
View File

@@ -1,7 +1,7 @@
$neutron_notif_cfg_ctrl_host = hiera('CONFIG_CONTROLLER_HOST')
# Configure nova notifications system
class { 'neutron::server::notifications':
class { '::neutron::server::notifications':
nova_admin_username => 'nova',
nova_admin_password => hiera('CONFIG_NOVA_KS_PW'),
nova_admin_tenant_name => 'services',

2
packstack/puppet/templates/neutron_ovs_agent.pp
View File

@@ -7,7 +7,7 @@ if $ovs_agent_vxlan_cfg_neut_ovs_tun_if != '' {
$localip = $cfg_neutron_ovs_host
}
class { 'neutron::agents::ml2::ovs':
class { '::neutron::agents::ml2::ovs':
bridge_uplinks => hiera_array('CONFIG_NEUTRON_OVS_BRIDGE_IFACES'),
bridge_mappings => hiera_array('CONFIG_NEUTRON_OVS_BRIDGE_MAPPINGS'),
enable_tunneling => hiera('CONFIG_NEUTRON_OVS_TUNNELING'),

2
packstack/puppet/templates/neutron_qpid.pp
View File

@@ -1,5 +1,5 @@
class { 'neutron':
class { '::neutron':
rpc_backend => 'neutron.openstack.common.rpc.impl_qpid',
qpid_hostname => hiera('CONFIG_AMQP_HOST'),
qpid_username => hiera('CONFIG_AMQP_AUTH_USER'),

2
packstack/puppet/templates/neutron_rabbitmq.pp
View File

@@ -1,5 +1,5 @@
class { 'neutron':
class { '::neutron':
rabbit_host => hiera('CONFIG_AMQP_HOST'),
rabbit_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),
rabbit_use_ssl => hiera('CONFIG_AMQP_ENABLE_SSL'),

2
packstack/puppet/templates/nova_api.pp
View File

@@ -1,6 +1,6 @@
require 'keystone::python'
class { 'nova::api':
class { '::nova::api':
enabled => true,
auth_host => hiera('CONFIG_CONTROLLER_HOST'),
admin_password => hiera('CONFIG_NOVA_KS_PW'),

4
packstack/puppet/templates/nova_ceilometer.pp
View File

@@ -1,9 +1,9 @@
$nova_ceil_cfg_ctrl_host = hiera('CONFIG_CONTROLLER_HOST')
class { 'ceilometer::agent::auth':
class { '::ceilometer::agent::auth':
auth_url => "http://${nova_ceil_cfg_ctrl_host}:35357/v2.0",
auth_password => hiera('CONFIG_CEILOMETER_KS_PW'),
}
class { 'ceilometer::agent::compute': }
class { '::ceilometer::agent::compute': }

2
packstack/puppet/templates/nova_ceilometer_qpid.pp
View File

@@ -1,5 +1,5 @@
class { 'ceilometer':
class { '::ceilometer':
metering_secret => hiera('CONFIG_CEILOMETER_SECRET'),
qpid_hostname => hiera('CONFIG_AMQP_HOST'),
qpid_username => hiera('CONFIG_AMQP_AUTH_USER'),

2
packstack/puppet/templates/nova_ceilometer_rabbitmq.pp
View File

@@ -1,5 +1,5 @@
class { 'ceilometer':
class { '::ceilometer':
metering_secret => hiera('CONFIG_CEILOMETER_SECRET'),
rabbit_host => hiera('CONFIG_AMQP_HOST'),
rabbit_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),

2
packstack/puppet/templates/nova_cert.pp
View File

@@ -1,4 +1,4 @@
class { 'nova::cert':
class { '::nova::cert':
enabled => true,
}

2
packstack/puppet/templates/nova_common_qpid.pp
View File

@@ -9,7 +9,7 @@ $public_key = {
$nova_common_qpid_cfg_storage_host = hiera('CONFIG_STORAGE_HOST')
class { 'nova':
class { '::nova':
glance_api_servers => "${nova_common_qpid_cfg_storage_host}:9292",
qpid_hostname => hiera('CONFIG_AMQP_HOST'),
qpid_username => hiera('CONFIG_AMQP_AUTH_USER'),

2
packstack/puppet/templates/nova_common_rabbitmq.pp
View File

@@ -9,7 +9,7 @@ $public_key = {
$nova_common_rabbitmq_cfg_storage_host = hiera('CONFIG_STORAGE_HOST')
class { 'nova':
class { '::nova':
glance_api_servers => "${nova_common_rabbitmq_cfg_storage_host}:9292",
rabbit_host => hiera('CONFIG_AMQP_HOST'),
rabbit_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),

4
packstack/puppet/templates/nova_compute.pp
View File

@@ -1,6 +1,6 @@
package{ 'python-cinderclient':
before => Class['nova']
before => Class['nova'],
}
# Install the private key to be used for live migration. This needs to be
@@ -46,7 +46,7 @@ if ($::fqdn == '' or $::fqdn =~ /localhost/) {
$vncproxy_server = $::fqdn
}
class { 'nova::compute':
class { '::nova::compute':
enabled => true,
vncproxy_host => hiera('CONFIG_CONTROLLER_HOST'),
vncproxy_protocol => $vncproxy_protocol,

2
packstack/puppet/templates/nova_compute_ironic.pp
View File

@@ -1,6 +1,6 @@
$ironic_config_controller_host = hiera('CONFIG_CONTROLLER_HOST')
class {'nova::compute::ironic':
class { '::nova::compute::ironic':
admin_user => 'ironic',
admin_passwd => hiera('CONFIG_IRONIC_KS_PW'),
admin_url => "http://${ironic_config_controller_host}:35357/v2.0",

4
packstack/puppet/templates/nova_compute_libvirt.pp
View File

@@ -3,7 +3,7 @@ Firewall <| |> -> Class['nova::compute::libvirt']
# Ensure Firewall changes happen before libvirt service start
# preventing a clash with rules being set by libvirt
if $::is_virtual == 'true' {
if $::is_virtual == true {
$libvirt_virt_type = 'qemu'
$libvirt_cpu_mode = 'none'
} else {
@@ -18,7 +18,7 @@ exec { 'qemu-kvm':
before => Class['nova::compute::libvirt'],
}
class { 'nova::compute::libvirt':
class { '::nova::compute::libvirt':
libvirt_virt_type => $libvirt_virt_type,
libvirt_cpu_mode => $libvirt_cpu_mode,
vncserver_listen => '0.0.0.0',

2
packstack/puppet/templates/nova_compute_vmware.pp
View File

@@ -1,4 +1,4 @@
class { 'nova::compute::vmware':
class { '::nova::compute::vmware':
host_ip => hiera('CONFIG_VCENTER_HOST'),
host_username => hiera('CONFIG_VCENTER_USER'),
host_password => hiera('CONFIG_VCENTER_PASSWORD'),

2
packstack/puppet/templates/nova_conductor.pp
View File

@@ -1,4 +1,4 @@
class { 'nova::conductor':
class { '::nova::conductor':
enabled => true,
}

2
packstack/puppet/templates/nova_gluster.pp
View File

@@ -1 +1 @@
package { 'glusterfs-fuse': ensure => present }
package { 'glusterfs-fuse': ensure => present }

4
packstack/puppet/templates/nova_network.pp
View File

@@ -17,7 +17,7 @@ $manager = hiera('CONFIG_NOVA_NETWORK_MANAGER')
$nova_net_manager_list = [
'nova.network.manager.VlanManager',
'nova.network.manager.FlatDHCPManager'
'nova.network.manager.FlatDHCPManager',
]
$overrides = {}
@@ -35,7 +35,7 @@ if $manager == 'nova.network.manager.VlanManager' {
$net_num = 1
}
class { 'nova::network':
class { '::nova::network':
enabled => true,
network_manager => $manager,
num_networks => $net_num ,

4
packstack/puppet/templates/nova_neutron.pp
View File

@@ -1,7 +1,7 @@
$nova_neutron_cfg_ctrl_host = hiera('CONFIG_CONTROLLER_HOST')
class { 'nova::network::neutron':
class { '::nova::network::neutron':
neutron_admin_password => hiera('CONFIG_NEUTRON_KS_PW'),
neutron_auth_strategy => 'keystone',
neutron_url => "http://${nova_neutron_cfg_ctrl_host}:9696",
@@ -10,6 +10,6 @@ class { 'nova::network::neutron':
neutron_region_name => hiera('CONFIG_KEYSTONE_REGION'),
}
class { 'nova::compute::neutron':
class { '::nova::compute::neutron':
libvirt_vif_driver => hiera('CONFIG_NOVA_LIBVIRT_VIF_DRIVER'),
}

2
packstack/puppet/templates/nova_nfs.pp
View File

@@ -1 +1 @@
package { 'nfs-utils': ensure => present }
package { 'nfs-utils': ensure => present }

2
packstack/puppet/templates/nova_sched.pp
View File

@@ -8,6 +8,6 @@ nova_config{
value => hiera('CONFIG_NOVA_SCHED_RAM_ALLOC_RATIO');
}
class { 'nova::scheduler':
class { '::nova::scheduler':
enabled => true,
}

4
packstack/puppet/templates/nova_vncproxy.pp
View File

@@ -18,13 +18,13 @@ if $vncproxy_protocol == undef {
}
}
class { 'nova::vncproxy':
class { '::nova::vncproxy':
enabled => true,
host => hiera('CONFIG_CONTROLLER_HOST'),
vncproxy_protocol => $vncproxy_protocol,
}
class { 'nova::consoleauth':
class { '::nova::consoleauth':
enabled => true,
}

6
packstack/puppet/templates/openstack_client.pp
View File

@@ -26,14 +26,14 @@ export PS1='[\\u@\\h \\W(keystone_admin)]\\$ '
"
file { "${::home_dir}/keystonerc_admin":
ensure => 'present',
ensure => file,
mode => '0600',
content => $rcadmin_content,
}
if hiera('CONFIG_PROVISION_DEMO') == 'y' {
file { "${::home_dir}/keystonerc_demo":
ensure => 'present',
ensure => file,
mode => '0600',
content => "export OS_USERNAME=demo
export OS_TENANT_NAME=demo
@@ -47,7 +47,7 @@ export PS1='[\\u@\\h \\W(keystone_demo)]\\$ '
if hiera('NO_ROOT_USER_ALLINONE') == true {
$ost_cl_home_dir = hiera('HOME_DIR')
file { "${ost_cl_home_dir}/keystonerc_admin":
ensure => present,
ensure => file,
owner => hiera('NO_ROOT_USER'),
group => hiera('NO_ROOT_GROUP'),
mode => '0600',

4
packstack/puppet/templates/postscript.pp
View File

@@ -1,4 +1,4 @@
exec { 'update-selinux-policy':
path => "/usr/bin/",
command => "yum update -y selinux-policy-targeted"
path => '/usr/bin/',
command => 'yum update -y selinux-policy-targeted',
}

2
packstack/puppet/templates/prescript.pp
View File

@@ -1,4 +1,4 @@
include firewall
include ::firewall
if $::ipaddress == hiera('CONFIG_CONTROLLER_HOST') {
include ::apache

4
packstack/puppet/templates/provision_tempest.pp
View File

@@ -163,7 +163,7 @@ if $provision_tempest_user != '' {
if $configure_tempest {
$tempest_requires = concat([Keystone_user[$username]], $neutron_deps)
class { 'tempest':
class { '::tempest':
tempest_repo_uri => $tempest_repo_uri,
tempest_clone_path => $tempest_clone_path,
tempest_clone_owner => $tempest_clone_owner,
@@ -220,7 +220,7 @@ if $provision_tempest_user != '' {
}
} else {
## Standalone Tempest installation
class { 'tempest':
class { '::tempest':
tempest_repo_uri => hiera('CONFIG_PROVISION_TEMPEST_REPO_URI'),
tempest_clone_path => '/var/lib/tempest',
tempest_clone_owner => 'root',

2
packstack/puppet/templates/redis.pp
View File

@@ -1,7 +1,7 @@
$redis_port = hiera('CONFIG_REDIS_PORT')
$redis_master_host = hiera('CONFIG_REDIS_MASTER_HOST')
class { 'redis':
class { '::redis':
bind => $redis_master_host,
port => $redis_port,
appendonly => true,

4
packstack/puppet/templates/redis_sentinel.pp
View File

@@ -4,8 +4,8 @@ $redis_master_name = hiera('CONFIG_REDIS_MASTER_NAME')
$redis_sentinel_quorum = hiera('CONFIG_REDIS_SENTINEL_QUORUM')
$redis_sentinel_port = hiera('CONFIG_REDIS_SENTINEL_PORT')
class { 'redis::sentinel':
master_name => "${redis_master_name}",
class { '::redis::sentinel':
master_name => $redis_master_name,
redis_host => $redis_master_host,
redis_port => $redis_master_port,
quorum => $redis_sentinel_quorum,

2
packstack/puppet/templates/redis_slave.pp
View File

@@ -2,7 +2,7 @@ $redis_host = hiera('CONFIG_REDIS_HOST')
$redis_port = hiera('CONFIG_REDIS_PORT')
$redis_master_host = hiera('CONFIG_REDIS_MASTER_HOST')
class { 'redis':
class { '::redis':
bind => '0.0.0.0',
port => $redis_port,
appendonly => true,

2
packstack/puppet/templates/sahara.pp
View File

@@ -4,7 +4,7 @@ $sahara_cfg_sahara_mariadb_host = hiera('CONFIG_MARIADB_HOST')
$sahara_cfg_config_neutron_install = hiera('CONFIG_NEUTRON_INSTALL')
$sahara_cfg_controller_host = hiera('CONFIG_CONTROLLER_HOST')
class { 'sahara':
class { '::sahara':
database_connection =>
"mysql://sahara:${sahara_cfg_sahara_db_pw}@${sahara_cfg_sahara_mariadb_host}/sahara",
verbose => true,

2
packstack/puppet/templates/sahara_qpid.pp
View File

@@ -1,4 +1,4 @@
class { 'sahara::notify::qpid':
class { '::sahara::notify::qpid':
qpid_hostname => hiera('CONFIG_AMQP_HOST'),
qpid_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),
qpid_protocol => hiera('CONFIG_AMQP_PROTOCOL'),

Some files were not shown because too many files have changed in this diff Show More