Browse Source

Replace absolute class names

Since Puppet 4 all class names are handled as absolute class names
and we don't neet to explicitly use $::{name}.

Change-Id: Icf925c479a9fc05fe71d8315306cb390fd7a57d9
changes/79/789379/3
Takashi Kajinami 1 week ago
parent
commit
381feb7e09
93 changed files with 341 additions and 341 deletions
  1. +2
    -2
      packstack/puppet/modules/packstack/manifests/amqp/enable_rabbitmq.pp
  2. +8
    -8
      packstack/puppet/modules/packstack/manifests/aodh.pp
  3. +2
    -2
      packstack/puppet/modules/packstack/manifests/aodh/rabbitmq.pp
  4. +2
    -2
      packstack/puppet/modules/packstack/manifests/apache.pp
  5. +4
    -4
      packstack/puppet/modules/packstack/manifests/ceilometer.pp
  6. +2
    -2
      packstack/puppet/modules/packstack/manifests/ceilometer/rabbitmq.pp
  7. +7
    -7
      packstack/puppet/modules/packstack/manifests/cinder.pp
  8. +1
    -1
      packstack/puppet/modules/packstack/manifests/cinder/backend/lvm.pp
  9. +2
    -2
      packstack/puppet/modules/packstack/manifests/cinder/backup.pp
  10. +2
    -2
      packstack/puppet/modules/packstack/manifests/cinder/rabbitmq.pp
  11. +3
    -3
      packstack/puppet/modules/packstack/manifests/glance.pp
  12. +1
    -1
      packstack/puppet/modules/packstack/manifests/glance/backend/file.pp
  13. +1
    -1
      packstack/puppet/modules/packstack/manifests/glance/backend/swift.pp
  14. +1
    -1
      packstack/puppet/modules/packstack/manifests/glance/ceilometer.pp
  15. +10
    -10
      packstack/puppet/modules/packstack/manifests/gnocchi.pp
  16. +3
    -3
      packstack/puppet/modules/packstack/manifests/heat.pp
  17. +2
    -2
      packstack/puppet/modules/packstack/manifests/heat/cfn.pp
  18. +3
    -3
      packstack/puppet/modules/packstack/manifests/heat/rabbitmq.pp
  19. +2
    -2
      packstack/puppet/modules/packstack/manifests/horizon.pp
  20. +4
    -4
      packstack/puppet/modules/packstack/manifests/ironic.pp
  21. +2
    -2
      packstack/puppet/modules/packstack/manifests/ironic/rabbitmq.pp
  22. +7
    -7
      packstack/puppet/modules/packstack/manifests/keystone.pp
  23. +1
    -1
      packstack/puppet/modules/packstack/manifests/keystone/aodh.pp
  24. +1
    -1
      packstack/puppet/modules/packstack/manifests/keystone/ceilometer.pp
  25. +1
    -1
      packstack/puppet/modules/packstack/manifests/keystone/cinder.pp
  26. +1
    -1
      packstack/puppet/modules/packstack/manifests/keystone/glance.pp
  27. +1
    -1
      packstack/puppet/modules/packstack/manifests/keystone/gnocchi.pp
  28. +1
    -1
      packstack/puppet/modules/packstack/manifests/keystone/heat.pp
  29. +1
    -1
      packstack/puppet/modules/packstack/manifests/keystone/ironic.pp
  30. +2
    -2
      packstack/puppet/modules/packstack/manifests/keystone/magnum.pp
  31. +1
    -1
      packstack/puppet/modules/packstack/manifests/keystone/manila.pp
  32. +1
    -1
      packstack/puppet/modules/packstack/manifests/keystone/neutron.pp
  33. +1
    -1
      packstack/puppet/modules/packstack/manifests/keystone/nova.pp
  34. +1
    -1
      packstack/puppet/modules/packstack/manifests/keystone/panko.pp
  35. +2
    -2
      packstack/puppet/modules/packstack/manifests/keystone/placement.pp
  36. +1
    -1
      packstack/puppet/modules/packstack/manifests/keystone/sahara.pp
  37. +1
    -1
      packstack/puppet/modules/packstack/manifests/keystone/swift.pp
  38. +1
    -1
      packstack/puppet/modules/packstack/manifests/keystone/trove.pp
  39. +8
    -8
      packstack/puppet/modules/packstack/manifests/magnum.pp
  40. +1
    -1
      packstack/puppet/modules/packstack/manifests/magnum/rabbitmq.pp
  41. +5
    -5
      packstack/puppet/modules/packstack/manifests/manila.pp
  42. +2
    -2
      packstack/puppet/modules/packstack/manifests/manila/backend/generic.pp
  43. +1
    -1
      packstack/puppet/modules/packstack/manifests/manila/network.pp
  44. +2
    -2
      packstack/puppet/modules/packstack/manifests/manila/rabbitmq.pp
  45. +2
    -2
      packstack/puppet/modules/packstack/manifests/mariadb.pp
  46. +16
    -16
      packstack/puppet/modules/packstack/manifests/mariadb/services.pp
  47. +1
    -1
      packstack/puppet/modules/packstack/manifests/memcached.pp
  48. +3
    -3
      packstack/puppet/modules/packstack/manifests/neutron/api.pp
  49. +1
    -1
      packstack/puppet/modules/packstack/manifests/neutron/dhcp.pp
  50. +1
    -1
      packstack/puppet/modules/packstack/manifests/neutron/l3.pp
  51. +2
    -2
      packstack/puppet/modules/packstack/manifests/neutron/lb_agent.pp
  52. +1
    -1
      packstack/puppet/modules/packstack/manifests/neutron/metadata.pp
  53. +1
    -1
      packstack/puppet/modules/packstack/manifests/neutron/metering.pp
  54. +2
    -2
      packstack/puppet/modules/packstack/manifests/neutron/ml2.pp
  55. +1
    -1
      packstack/puppet/modules/packstack/manifests/neutron/notifications.pp
  56. +1
    -1
      packstack/puppet/modules/packstack/manifests/neutron/ovn_agent.pp
  57. +1
    -1
      packstack/puppet/modules/packstack/manifests/neutron/ovn_metadata.pp
  58. +1
    -1
      packstack/puppet/modules/packstack/manifests/neutron/ovn_northd.pp
  59. +1
    -1
      packstack/puppet/modules/packstack/manifests/neutron/ovs_agent.pp
  60. +2
    -2
      packstack/puppet/modules/packstack/manifests/neutron/rabbitmq.pp
  61. +1
    -1
      packstack/puppet/modules/packstack/manifests/neutron/vpnaas.pp
  62. +2
    -2
      packstack/puppet/modules/packstack/manifests/nova.pp
  63. +11
    -11
      packstack/puppet/modules/packstack/manifests/nova/api.pp
  64. +2
    -2
      packstack/puppet/modules/packstack/manifests/nova/ceilometer.pp
  65. +2
    -2
      packstack/puppet/modules/packstack/manifests/nova/ceilometer/rabbitmq.pp
  66. +3
    -3
      packstack/puppet/modules/packstack/manifests/nova/compute.pp
  67. +2
    -2
      packstack/puppet/modules/packstack/manifests/nova/compute/ironic.pp
  68. +2
    -2
      packstack/puppet/modules/packstack/manifests/nova/compute/libvirt.pp
  69. +1
    -1
      packstack/puppet/modules/packstack/manifests/nova/compute/vmware.pp
  70. +1
    -1
      packstack/puppet/modules/packstack/manifests/nova/conductor.pp
  71. +1
    -1
      packstack/puppet/modules/packstack/manifests/nova/neutron.pp
  72. +2
    -2
      packstack/puppet/modules/packstack/manifests/nova/sched.pp
  73. +1
    -1
      packstack/puppet/modules/packstack/manifests/nova/sched/ironic.pp
  74. +1
    -1
      packstack/puppet/modules/packstack/manifests/nova/vncproxy.pp
  75. +6
    -6
      packstack/puppet/modules/packstack/manifests/panko.pp
  76. +6
    -6
      packstack/puppet/modules/packstack/manifests/placement.pp
  77. +1
    -1
      packstack/puppet/modules/packstack/manifests/provision/bridge.pp
  78. +1
    -1
      packstack/puppet/modules/packstack/manifests/provision/tempest.pp
  79. +1
    -1
      packstack/puppet/modules/packstack/manifests/redis.pp
  80. +2
    -2
      packstack/puppet/modules/packstack/manifests/sahara.pp
  81. +1
    -1
      packstack/puppet/modules/packstack/manifests/sahara/ceilometer.pp
  82. +3
    -3
      packstack/puppet/modules/packstack/manifests/sahara/rabbitmq.pp
  83. +1
    -1
      packstack/puppet/modules/packstack/manifests/swift.pp
  84. +1
    -1
      packstack/puppet/modules/packstack/manifests/swift/ceilometer.pp
  85. +7
    -7
      packstack/puppet/modules/packstack/manifests/swift/proxy.pp
  86. +2
    -2
      packstack/puppet/modules/packstack/manifests/swift/ringbuilder.pp
  87. +1
    -1
      packstack/puppet/modules/packstack/manifests/swift/storage.pp
  88. +5
    -5
      packstack/puppet/modules/packstack/manifests/trove.pp
  89. +1
    -1
      packstack/puppet/modules/packstack/manifests/trove/rabbitmq.pp
  90. +21
    -21
      packstack/puppet/templates/compute.pp
  91. +86
    -86
      packstack/puppet/templates/controller.pp
  92. +2
    -2
      packstack/puppet/templates/controller_post.pp
  93. +16
    -16
      packstack/puppet/templates/network.pp

+ 2
- 2
packstack/puppet/modules/packstack/manifests/amqp/enable_rabbitmq.pp View File

@ -21,7 +21,7 @@ define packstack::amqp::enable_rabbitmq {
notify => Service['rabbitmq-server'],
}
class { '::rabbitmq':
class { 'rabbitmq':
port => undef,
ssl_port => 0 + hiera('CONFIG_AMQP_CLIENTS_PORT'),
ssl_only => true,
@ -42,7 +42,7 @@ define packstack::amqp::enable_rabbitmq {
tcp_backlog => 128,
}
} else {
class { '::rabbitmq':
class { 'rabbitmq':
port => 0 + hiera('CONFIG_AMQP_CLIENTS_PORT'),
ssl => false,
default_user => hiera('CONFIG_AMQP_AUTH_USER'),


+ 8
- 8
packstack/puppet/modules/packstack/manifests/aodh.pp View File

@ -12,31 +12,31 @@ class packstack::aodh ()
$coordination_url = ''
}
class { '::aodh::keystone::authtoken':
class { 'aodh::keystone::authtoken':
password => hiera('CONFIG_AODH_KS_PW'),
auth_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
}
class { '::aodh::api':
class { 'aodh::api':
enabled => true,
service_name => 'httpd',
sync_db => true,
}
class { '::aodh::wsgi::apache':
class { 'aodh::wsgi::apache':
workers => hiera('CONFIG_SERVICE_WORKERS'),
ssl => false
}
class { '::aodh::service_credentials':
class { 'aodh::service_credentials':
password => hiera('CONFIG_AODH_KS_PW'),
auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'),
region_name => hiera('CONFIG_KEYSTONE_REGION'),
}
class { '::aodh::evaluator':
class { 'aodh::evaluator':
coordination_url => $coordination_url,
}
class { '::aodh::notifier': }
class { '::aodh::listener': }
class { '::aodh::client': }
class { 'aodh::notifier': }
class { 'aodh::listener': }
class { 'aodh::client': }
}

+ 2
- 2
packstack/puppet/modules/packstack/manifests/aodh/rabbitmq.pp View File

@ -23,11 +23,11 @@ class packstack::aodh::rabbitmq ()
File[$files_to_set_owner] ~> Service<| tag == 'aodh-service' |>
}
class { '::aodh::logging':
class { 'aodh::logging':
debug => hiera('CONFIG_DEBUG_MODE'),
}
class { '::aodh':
class { 'aodh':
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
kombu_ssl_ca_certs => $kombu_ssl_ca_certs,


+ 2
- 2
packstack/puppet/modules/packstack/manifests/apache.pp View File

@ -2,7 +2,7 @@ class packstack::apache ()
{
# Use python3 for mod_wsg in fedora
if ($::operatingsystem == 'Fedora') or ($::osfamily == 'RedHat' and Integer.new($::operatingsystemmajrelease) > 7) {
class { '::apache':
class { 'apache':
mod_packages => merge($::apache::params::mod_packages, {
'wsgi' => 'python3-mod_wsgi',
}),
@ -11,7 +11,7 @@ class packstack::apache ()
})
}
}else{
class {'::apache':
class { 'apache':
}
}


+ 4
- 4
packstack/puppet/modules/packstack/manifests/ceilometer.pp View File

@ -26,7 +26,7 @@ class packstack::ceilometer ()
$coordination_url = ''
}
include ::ceilometer
include ceilometer
exec {'ceilometer-db-upgrade':
command => 'ceilometer-upgrade',
@ -38,18 +38,18 @@ class packstack::ceilometer ()
Keystone::Resource::Service_identity<||> -> Exec['ceilometer-db-upgrade']
~> Service['ceilometer-agent-notification']
class { '::ceilometer::agent::notification':
class { 'ceilometer::agent::notification':
manage_event_pipeline => true,
event_pipeline_publishers => ['gnocchi://', 'panko://'],
}
class { '::ceilometer::agent::service_credentials':
class { 'ceilometer::agent::service_credentials':
auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'),
password => hiera('CONFIG_CEILOMETER_KS_PW'),
region_name => hiera('CONFIG_KEYSTONE_REGION'),
}
class { '::ceilometer::agent::polling':
class { 'ceilometer::agent::polling':
manage_polling => true,
coordination_url => $coordination_url,
}


+ 2
- 2
packstack/puppet/modules/packstack/manifests/ceilometer/rabbitmq.pp View File

@ -19,11 +19,11 @@ class packstack::ceilometer::rabbitmq ()
File[$files_to_set_owner] ~> Service<| tag == 'ceilometer-service' |>
}
class { '::ceilometer::logging':
class { 'ceilometer::logging':
debug => hiera('CONFIG_DEBUG_MODE'),
}
class { '::ceilometer':
class { 'ceilometer':
telemetry_secret => hiera('CONFIG_CEILOMETER_SECRET'),
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",


+ 7
- 7
packstack/puppet/modules/packstack/manifests/cinder.pp View File

@ -24,23 +24,23 @@ class packstack::cinder ()
# TO-DO(mmagr): Add IPv6 support when hostnames are used
}
class { '::cinder::keystone::authtoken':
class { 'cinder::keystone::authtoken':
www_authenticate_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'),
auth_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
password => hiera('CONFIG_CINDER_KS_PW'),
}
class { '::cinder::api':
class { 'cinder::api':
bind_host => $bind_host,
service_workers => hiera('CONFIG_SERVICE_WORKERS'),
default_volume_type => $default_volume_type,
}
class { '::cinder::scheduler': }
class { 'cinder::scheduler': }
class { '::cinder::volume': }
class { 'cinder::volume': }
class { '::cinder::client': }
class { 'cinder::client': }
$cinder_keystone_admin_username = hiera('CONFIG_KEYSTONE_ADMIN_USERNAME')
$cinder_keystone_admin_password = hiera('CONFIG_KEYSTONE_ADMIN_PW')
@ -55,13 +55,13 @@ class packstack::cinder ()
os_auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
}
class { '::cinder::backends':
class { 'cinder::backends':
enabled_backends => hiera_array('CONFIG_CINDER_BACKEND'),
}
$db_purge = hiera('CONFIG_CINDER_DB_PURGE_ENABLE')
if $db_purge {
class { '::cinder::cron::db_purge':
class { 'cinder::cron::db_purge':
hour => '*/24',
destination => '/dev/null',
age => 1


+ 1
- 1
packstack/puppet/modules/packstack/manifests/cinder/backend/lvm.pp View File

@ -7,7 +7,7 @@ class packstack::cinder::backend::lvm ()
# Find an available loop device
$loop_dev = chomp(generate('/usr/sbin/losetup', '-f'))
class { '::cinder::setup_test_volume':
class { 'cinder::setup_test_volume':
size => hiera('CONFIG_CINDER_VOLUMES_SIZE'),
loopback_device => $loop_dev,
volume_path => '/var/lib/cinder',


+ 2
- 2
packstack/puppet/modules/packstack/manifests/cinder/backup.pp View File

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


+ 2
- 2
packstack/puppet/modules/packstack/manifests/cinder/rabbitmq.pp View File

@ -22,11 +22,11 @@ class packstack::cinder::rabbitmq ()
}
}
class { '::cinder::logging':
class { 'cinder::logging':
debug => hiera('CONFIG_DEBUG_MODE'),
}
class { '::cinder':
class { 'cinder':
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
database_connection => "mysql+pymysql://cinder:${cinder_rab_cfg_cinder_db_pw}@${cinder_rab_cfg_mariadb_host}/cinder",


+ 3
- 3
packstack/puppet/modules/packstack/manifests/glance.pp View File

@ -18,17 +18,17 @@ class packstack::glance ()
default => 'file',
}
class { '::glance::api::authtoken':
class { 'glance::api::authtoken':
www_authenticate_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
auth_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
password => hiera('CONFIG_GLANCE_KS_PW'),
}
class { '::glance::api::logging':
class { 'glance::api::logging':
debug => hiera('CONFIG_DEBUG_MODE'),
}
class { '::glance::api':
class { 'glance::api':
bind_host => $bind_host,
pipeline => 'keystone',
database_connection => "mysql+pymysql://glance:${glance_ks_pw}@${glance_mariadb_host}/glance",


+ 1
- 1
packstack/puppet/modules/packstack/manifests/glance/backend/file.pp View File

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

+ 1
- 1
packstack/puppet/modules/packstack/manifests/glance/backend/swift.pp View File

@ -7,7 +7,7 @@ class packstack::glance::backend::swift ()
default => '3',
}
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 => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),


+ 1
- 1
packstack/puppet/modules/packstack/manifests/glance/ceilometer.pp View File

@ -18,7 +18,7 @@ class packstack::glance::ceilometer ()
notify => Service['glance-api'],
}
}
class { '::glance::notify::rabbitmq':
class { 'glance::notify::rabbitmq':
rabbit_notification_exchange => 'glance',
rabbit_notification_topic => 'notifications',
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),


+ 10
- 10
packstack/puppet/modules/packstack/manifests/gnocchi.pp View File

@ -5,40 +5,40 @@ class packstack::gnocchi ()
$gnocchi_cfg_db_pw = hiera('CONFIG_GNOCCHI_DB_PW')
$gnocchi_cfg_mariadb_host = hiera('CONFIG_MARIADB_HOST_URL')
class { '::gnocchi::wsgi::apache':
class { 'gnocchi::wsgi::apache':
workers => hiera('CONFIG_SERVICE_WORKERS'),
ssl => false
}
class { '::gnocchi':
class { 'gnocchi':
}
class { '::gnocchi::keystone::authtoken':
class { 'gnocchi::keystone::authtoken':
www_authenticate_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
auth_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
auth_version => hiera('CONFIG_KEYSTONE_API_VERSION'),
password => hiera('CONFIG_GNOCCHI_KS_PW')
}
class { '::gnocchi::db':
class { 'gnocchi::db':
database_connection => "mysql+pymysql://gnocchi:${gnocchi_cfg_db_pw}@${gnocchi_cfg_mariadb_host}/gnocchi?charset=utf8",
}
class { '::gnocchi::api':
class { 'gnocchi::api':
service_name => 'httpd',
sync_db => true,
}
class { '::gnocchi::storage': }
class { '::gnocchi::storage::file': }
class { 'gnocchi::storage': }
class { 'gnocchi::storage::file': }
class {'::gnocchi::metricd': }
class { 'gnocchi::metricd': }
class {'::gnocchi::statsd':
class { 'gnocchi::statsd':
resource_id => '5e3fcbe2-7aab-475d-b42c-a440aa42e5ad',
archive_policy_name => 'high',
flush_delay => '10',
}
include ::gnocchi::client
include gnocchi::client
}

+ 3
- 3
packstack/puppet/modules/packstack/manifests/heat.pp View File

@ -2,21 +2,21 @@ class packstack::heat ()
{
create_resources(packstack::firewall, hiera('FIREWALL_HEAT_RULES', {}))
class { '::heat::api':
class { 'heat::api':
workers => hiera('CONFIG_SERVICE_WORKERS'),
}
$keystone_admin = hiera('CONFIG_KEYSTONE_ADMIN_USERNAME')
$heat_cfg_ctrl_host = hiera('CONFIG_KEYSTONE_HOST_URL')
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",
auth_encryption_key => hiera('CONFIG_HEAT_AUTH_ENC_KEY'),
num_engine_workers => hiera('CONFIG_SERVICE_WORKERS'),
}
class { '::heat::keystone::domain':
class { 'heat::keystone::domain':
domain_name => hiera('CONFIG_HEAT_DOMAIN'),
domain_admin => hiera('CONFIG_HEAT_DOMAIN_ADMIN'),
domain_password => hiera('CONFIG_HEAT_DOMAIN_PASSWORD'),


+ 2
- 2
packstack/puppet/modules/packstack/manifests/heat/cfn.pp View File

@ -2,13 +2,13 @@ class packstack::heat::cfn ()
{
create_resources(packstack::firewall, hiera('FIREWALL_HEAT_CFN_RULES', {}))
class { '::heat::api_cfn':
class { 'heat::api_cfn':
workers => hiera('CONFIG_SERVICE_WORKERS'),
}
$heat_cfn_cfg_ctrl_host = hiera('CONFIG_KEYSTONE_HOST_URL')
class { '::heat::keystone::auth_cfn':
class { 'heat::keystone::auth_cfn':
admin_url => "http://${heat_cfn_cfg_ctrl_host}:8000/v1",
public_url => "http://${heat_cfn_cfg_ctrl_host}:8000/v1",
internal_url => "http://${heat_cfn_cfg_ctrl_host}:8000/v1",


+ 3
- 3
packstack/puppet/modules/packstack/manifests/heat/rabbitmq.pp View File

@ -28,17 +28,17 @@ class packstack::heat::rabbitmq ()
$heat_notification_driver = $::os_service_default
}
class { '::heat::keystone::authtoken':
class { 'heat::keystone::authtoken':
password => hiera('CONFIG_HEAT_KS_PW'),
www_authenticate_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
auth_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
}
class { '::heat::logging':
class { 'heat::logging':
debug => hiera('CONFIG_DEBUG_MODE'),
}
class { '::heat':
class { 'heat':
keystone_ec2_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",


+ 2
- 2
packstack/puppet/modules/packstack/manifests/horizon.pp View File

@ -16,7 +16,7 @@ class packstack::horizon ()
'n' => false,
}
class {'::horizon':
class { 'horizon':
secret_key => hiera('CONFIG_HORIZON_SECRET_KEY'),
keystone_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
keystone_default_role => '_member_',
@ -60,7 +60,7 @@ class packstack::horizon ()
ensure_packages(['openstack-heat-ui'], {'ensure' => 'present'})
}
include '::packstack::memcached'
include packstack::memcached
$firewall_port = hiera('CONFIG_HORIZON_PORT')


+ 4
- 4
packstack/puppet/modules/packstack/manifests/ironic.pp View File

@ -6,14 +6,14 @@ class packstack::ironic ()
'glance/glance_host': value => hiera('CONFIG_STORAGE_HOST_URL');
}
class { '::ironic::api::authtoken':
class { 'ironic::api::authtoken':
www_authenticate_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
password => hiera('CONFIG_IRONIC_KS_PW'),
}
class { '::ironic::api': }
class { 'ironic::api': }
class { '::ironic::client': }
class { 'ironic::client': }
class { '::ironic::conductor': }
class { 'ironic::conductor': }
}

+ 2
- 2
packstack/puppet/modules/packstack/manifests/ironic/rabbitmq.pp View File

@ -22,11 +22,11 @@ class packstack::ironic::rabbitmq ()
File[$files_to_set_owner] ~> Service<| tag == 'ironic-service' |>
}
class { '::ironic::logging':
class { 'ironic::logging':
debug => true,
}
class { '::ironic':
class { 'ironic':
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
database_connection => "mysql+pymysql://ironic:${ironic_rabbitmq_cfg_ironic_db_pw}@${ironic_rabbitmq_cfg_mariadb_host}/ironic",


+ 7
- 7
packstack/puppet/modules/packstack/manifests/keystone.pp View File

@ -9,10 +9,10 @@ class packstack::keystone ()
$keystone_url = regsubst(regsubst(hiera('CONFIG_KEYSTONE_PUBLIC_URL'),'/v2.0',''),'/v3','')
$keystone_admin_url = hiera('CONFIG_KEYSTONE_ADMIN_URL')
class { '::keystone::client': }
class { 'keystone::client': }
if hiera('CONFIG_KEYSTONE_FERNET_TOKEN_ROTATE_ENABLE',false) {
class { '::keystone::cron::fernet_rotate':
class { 'keystone::cron::fernet_rotate':
require => Service['crond'],
}
service { 'crond':
@ -21,11 +21,11 @@ class packstack::keystone ()
}
}
class { '::keystone::logging':
class { 'keystone::logging':
debug => hiera('CONFIG_DEBUG_MODE'),
}
class { '::keystone':
class { 'keystone':
database_connection => "mysql+pymysql://keystone_admin:${keystone_cfg_ks_db_pw}@${keystone_cfg_mariadb_host}/keystone",
token_provider => $keystone_token_provider_str,
enable_fernet_setup => true,
@ -34,7 +34,7 @@ class packstack::keystone ()
default_domain => 'Default',
}
class { '::keystone::wsgi::apache':
class { 'keystone::wsgi::apache':
workers => hiera('CONFIG_SERVICE_WORKERS'),
ssl => $keystone_use_ssl
}
@ -46,7 +46,7 @@ class packstack::keystone ()
ensure => present,
}
class { '::keystone::bootstrap':
class { 'keystone::bootstrap':
password => hiera('CONFIG_KEYSTONE_ADMIN_PW'),
username => $username,
email => hiera('CONFIG_KEYSTONE_ADMIN_EMAIL'),
@ -69,7 +69,7 @@ class packstack::keystone ()
$user_enabled_emulation = false
}
class { '::keystone::ldap':
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),


+ 1
- 1
packstack/puppet/modules/packstack/manifests/keystone/aodh.pp View File

@ -2,7 +2,7 @@ class packstack::keystone::aodh ()
{
$keystone_host_url = hiera('CONFIG_KEYSTONE_HOST_URL')
class { '::aodh::keystone::auth':
class { 'aodh::keystone::auth':
region => hiera('CONFIG_KEYSTONE_REGION'),
password => hiera('CONFIG_AODH_KS_PW'),
public_url => "http://${keystone_host_url}:8042",


+ 1
- 1
packstack/puppet/modules/packstack/manifests/keystone/ceilometer.pp View File

@ -5,7 +5,7 @@ class packstack::keystone::ceilometer ()
$ceilometer_api_host = hiera('CONFIG_KEYSTONE_HOST_URL')
$ceilometer_url = "${ceilometer_protocol}://${ceilometer_api_host}:${ceilometer_port}"
class { '::ceilometer::keystone::auth':
class { 'ceilometer::keystone::auth':
region => hiera('CONFIG_KEYSTONE_REGION'),
password => hiera('CONFIG_CEILOMETER_KS_PW'),
public_url => $ceilometer_url,


+ 1
- 1
packstack/puppet/modules/packstack/manifests/keystone/cinder.pp View File

@ -5,7 +5,7 @@ class packstack::keystone::cinder ()
$cinder_port = '8776'
$cinder_url = "${cinder_protocol}://${cinder_host}:${cinder_port}"
class { '::cinder::keystone::auth':
class { 'cinder::keystone::auth':
region => hiera('CONFIG_KEYSTONE_REGION'),
password => hiera('CONFIG_CINDER_KS_PW'),
public_url_v2 => "${cinder_url}/v2/%(tenant_id)s",


+ 1
- 1
packstack/puppet/modules/packstack/manifests/keystone/glance.pp View File

@ -5,7 +5,7 @@ class packstack::keystone::glance ()
$glance_api_host = hiera('CONFIG_STORAGE_HOST_URL')
$glance_url = "${glance_protocol}://${glance_api_host}:${glance_port}"
class { '::glance::keystone::auth':
class { 'glance::keystone::auth':
region => hiera('CONFIG_KEYSTONE_REGION'),
password => hiera('CONFIG_GLANCE_KS_PW'),
public_url => $glance_url,


+ 1
- 1
packstack/puppet/modules/packstack/manifests/keystone/gnocchi.pp View File

@ -2,7 +2,7 @@ class packstack::keystone::gnocchi ()
{
$gnocchi_keystone_host_url = hiera('CONFIG_KEYSTONE_HOST_URL')
class { '::gnocchi::keystone::auth':
class { 'gnocchi::keystone::auth':
region => hiera('CONFIG_KEYSTONE_REGION'),
password => hiera('CONFIG_GNOCCHI_KS_PW'),
public_url => "http://${gnocchi_keystone_host_url}:8041",


+ 1
- 1
packstack/puppet/modules/packstack/manifests/keystone/heat.pp View File

@ -6,7 +6,7 @@ class packstack::keystone::heat ()
$heat_url = "${heat_protocol}://${heat_api_host}:${heat_port}/v1/%(tenant_id)s"
# heat::keystone::auth
class { '::heat::keystone::auth':
class { 'heat::keystone::auth':
region => hiera('CONFIG_KEYSTONE_REGION'),
password => hiera('CONFIG_HEAT_KS_PW'),
public_url => $heat_url,


+ 1
- 1
packstack/puppet/modules/packstack/manifests/keystone/ironic.pp View File

@ -5,7 +5,7 @@ class packstack::keystone::ironic ()
$ironic_port = '6385'
$ironic_url = "${ironic_protocol}://${ironic_host}:${ironic_port}"
class { '::ironic::keystone::auth':
class { 'ironic::keystone::auth':
region => hiera('CONFIG_KEYSTONE_REGION'),
password => hiera('CONFIG_IRONIC_KS_PW'),
public_url => $ironic_url,


+ 2
- 2
packstack/puppet/modules/packstack/manifests/keystone/magnum.pp View File

@ -5,7 +5,7 @@ class packstack::keystone::magnum ()
$magnum_port = '9511'
$magnum_url = "${magnum_protocol}://${magnum_host}:${magnum_port}/v1"
class { '::magnum::keystone::auth':
class { 'magnum::keystone::auth':
region => hiera('CONFIG_KEYSTONE_REGION'),
password => hiera('CONFIG_MAGNUM_KS_PW'),
public_url => $magnum_url,
@ -13,7 +13,7 @@ class packstack::keystone::magnum ()
internal_url => $magnum_url
}
class { '::magnum::keystone::domain':
class { 'magnum::keystone::domain':
domain_password => hiera('CONFIG_MAGNUM_KS_PW'),
}
}

+ 1
- 1
packstack/puppet/modules/packstack/manifests/keystone/manila.pp View File

@ -6,7 +6,7 @@ class packstack::keystone::manila ()
$manila_url = "${manila_protocol}://${manila_host}:${manila_port}/v1/%(tenant_id)s"
$manila_url_v2 = "${manila_protocol}://${manila_host}:${manila_port}/v2/%(tenant_id)s"
class { '::manila::keystone::auth':
class { 'manila::keystone::auth':
password => hiera('CONFIG_MANILA_KS_PW'),
public_url => $manila_url,
admin_url => $manila_url,


+ 1
- 1
packstack/puppet/modules/packstack/manifests/keystone/neutron.pp View File

@ -5,7 +5,7 @@ class packstack::keystone::neutron ()
$neutron_port = '9696'
$neutron_url = "${neutron_protocol}://${neutron_host}:${neutron_port}"
class { '::neutron::keystone::auth':
class { 'neutron::keystone::auth':
region => hiera('CONFIG_KEYSTONE_REGION'),
password => hiera('CONFIG_NEUTRON_KS_PW'),
public_url => $neutron_url,


+ 1
- 1
packstack/puppet/modules/packstack/manifests/keystone/nova.pp View File

@ -6,7 +6,7 @@ class packstack::keystone::nova ()
$nova_url = "${nova_protocol}://${nova_host}:${nova_port}/v2.1/%(tenant_id)s"
class { '::nova::keystone::auth':
class { 'nova::keystone::auth':
region => hiera('CONFIG_KEYSTONE_REGION'),
password => hiera('CONFIG_NOVA_KS_PW'),
public_url => $nova_url,


+ 1
- 1
packstack/puppet/modules/packstack/manifests/keystone/panko.pp View File

@ -2,7 +2,7 @@ class packstack::keystone::panko ()
{
$keystone_host_url = hiera('CONFIG_KEYSTONE_HOST_URL')
class { '::panko::keystone::auth':
class { 'panko::keystone::auth':
region => hiera('CONFIG_KEYSTONE_REGION'),
password => hiera('CONFIG_PANKO_KS_PW'),
public_url => "http://${keystone_host_url}:8977",


+ 2
- 2
packstack/puppet/modules/packstack/manifests/keystone/placement.pp View File

@ -5,7 +5,7 @@ class packstack::keystone::placement ()
$placement_port = '8778'
$placement_url = "${placement_protocol}://${placement_host}:${placement_port}/placement"
class { '::placement::keystone::authtoken':
class { 'placement::keystone::authtoken':
password => hiera('CONFIG_NOVA_KS_PW'),
user_domain_name => 'Default',
project_domain_name => 'Default',
@ -13,7 +13,7 @@ class packstack::keystone::placement ()
www_authenticate_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'),
}
class { '::placement::keystone::auth':
class { 'placement::keystone::auth':
public_url => $placement_url,
internal_url => $placement_url,
admin_url => $placement_url,


+ 1
- 1
packstack/puppet/modules/packstack/manifests/keystone/sahara.pp View File

@ -5,7 +5,7 @@ class packstack::keystone::sahara ()
$sahara_port = '8386'
$sahara_url = "${sahara_protocol}://${sahara_host}:${sahara_port}"
class { '::sahara::keystone::auth':
class { 'sahara::keystone::auth':
password => hiera('CONFIG_SAHARA_KS_PW'),
public_url => $sahara_url,
admin_url => $sahara_url,


+ 1
- 1
packstack/puppet/modules/packstack/manifests/keystone/swift.pp View File

@ -5,7 +5,7 @@ class packstack::keystone::swift ()
$swift_port = '8080'
$swift_url = "${swift_protocol}://${swift_host}:${swift_port}/v1/AUTH_%(tenant_id)s"
class { '::swift::keystone::auth':
class { 'swift::keystone::auth':
region => hiera('CONFIG_KEYSTONE_REGION'),
password => hiera('CONFIG_SWIFT_KS_PW'),
operator_roles => ['admin', 'SwiftOperator', 'ResellerAdmin'],


+ 1
- 1
packstack/puppet/modules/packstack/manifests/keystone/trove.pp View File

@ -5,7 +5,7 @@ class packstack::keystone::trove ()
$trove_port = '8779'
$trove_url = "${trove_protocol}://${trove_host}:${trove_port}/v1.0/%(tenant_id)s"
class { '::trove::keystone::auth':
class { 'trove::keystone::auth':
region => hiera('CONFIG_KEYSTONE_REGION'),
password => hiera('CONFIG_TROVE_KS_PW'),
public_url => $trove_url,


+ 8
- 8
packstack/puppet/modules/packstack/manifests/magnum.pp View File

@ -4,7 +4,7 @@ class packstack::magnum ()
$magnum_cfg_magnum_db_pw = hiera('CONFIG_MAGNUM_DB_PW')
$magnum_cfg_magnum_mariadb_host = hiera('CONFIG_MARIADB_HOST_URL')
class { '::magnum::db':
class { 'magnum::db':
database_connection => "mysql+pymysql://magnum:${magnum_cfg_magnum_db_pw}@${magnum_cfg_magnum_mariadb_host}/magnum",
}
@ -12,7 +12,7 @@ class packstack::magnum ()
$magnum_host = hiera('CONFIG_KEYSTONE_HOST_URL')
$magnum_port = '9511'
$magnum_url = "${magnum_protocol}://${magnum_host}:${magnum_port}/v1"
class { '::magnum::keystone::authtoken':
class { 'magnum::keystone::authtoken':
www_authenticate_uri => "${magnum_protocol}://${magnum_host}:5000/v3",
auth_url => "${magnum_protocol}://${magnum_host}:5000",
auth_version => 'v3',
@ -23,7 +23,7 @@ class packstack::magnum ()
project_name => 'services'
}
class { '::magnum::keystone::keystone_auth':
class { 'magnum::keystone::keystone_auth':
username => 'magnum',
password => hiera('CONFIG_MAGNUM_KS_PW'),
auth_url => "${magnum_protocol}://${magnum_host}:5000",
@ -32,22 +32,22 @@ class packstack::magnum ()
project_domain_name => 'Default',
}
class { '::magnum::api':
class { 'magnum::api':
enabled => true,
host => '0.0.0.0'
}
class { '::magnum::conductor':
class { 'magnum::conductor':
}
class { '::magnum::client':
class { 'magnum::client':
}
class { '::magnum::clients':
class { 'magnum::clients':
region_name => hiera('CONFIG_KEYSTONE_REGION')
}
class { '::magnum::certificates':
class { 'magnum::certificates':
cert_manager_type => 'local'
}
}

+ 1
- 1
packstack/puppet/modules/packstack/manifests/magnum/rabbitmq.pp View File

@ -19,7 +19,7 @@ class packstack::magnum::rabbitmq ()
File[$files_to_set_owner] ~> Service<| tag == 'magnum-service' |>
}
class { '::magnum':
class { 'magnum':
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
kombu_ssl_ca_certs => $kombu_ssl_ca_certs,


+ 5
- 5
packstack/puppet/modules/packstack/manifests/manila.pp View File

@ -12,22 +12,22 @@ class packstack::manila ()
# TO-DO(mmagr): Add IPv6 support when hostnames are used
}
class { '::manila::keystone::authtoken':
class { 'manila::keystone::authtoken':
password => hiera('CONFIG_MANILA_KS_PW'),
www_authenticate_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
}
class { '::manila::api':
class { 'manila::api':
bind_host => $bind_host,
}
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'),
}
}

+ 2
- 2
packstack/puppet/modules/packstack/manifests/manila/backend/generic.pp View File

@ -30,13 +30,13 @@ class packstack::manila::backend::generic ()
service_instance_flavor_id => 66,
}
class { '::manila::compute::nova':
class { 'manila::compute::nova':
auth_type => 'password',
auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'),
password => hiera('CONFIG_NOVA_KS_PW'),
}
class { '::manila::volume::cinder':
class { 'manila::volume::cinder':
auth_type => 'password',
auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'),
password => hiera('CONFIG_CINDER_KS_PW'),


+ 1
- 1
packstack/puppet/modules/packstack/manifests/manila/network.pp View File

@ -3,7 +3,7 @@ define packstack::manila::network ($backend_name = $name) {
$manila_network_type = hiera('CONFIG_MANILA_NETWORK_TYPE')
if ($manila_network_type == 'neutron'){
class { '::manila::network::neutron':
class { 'manila::network::neutron':
auth_type => 'password',
auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'),
password => hiera('CONFIG_NEUTRON_KS_PW'),


+ 2
- 2
packstack/puppet/modules/packstack/manifests/manila/rabbitmq.pp View File

@ -23,11 +23,11 @@ class packstack::manila::rabbitmq ()
$db_pw = hiera('CONFIG_MANILA_DB_PW')
$mariadb_host = hiera('CONFIG_MARIADB_HOST_URL')
class { '::manila::logging':
class { 'manila::logging':
debug => hiera('CONFIG_DEBUG_MODE'),
}
class { '::manila':
class { 'manila':
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
sql_connection => "mysql+pymysql://manila:${db_pw}@${mariadb_host}/manila",


+ 2
- 2
packstack/puppet/modules/packstack/manifests/mariadb.pp View File

@ -23,7 +23,7 @@ class packstack::mariadb ()
$mysql_root_password = hiera('CONFIG_MARIADB_PW')
class { '::mysql::server':
class { 'mysql::server':
package_name => $mariadb_package_name,
restart => true,
root_password => $mysql_root_password,
@ -64,6 +64,6 @@ class packstack::mariadb ()
}
}
} else {
class { '::remote::db': }
class { 'remote::db': }
}
}

+ 16
- 16
packstack/puppet/modules/packstack/manifests/mariadb/services.pp View File

@ -1,6 +1,6 @@
class packstack::mariadb::services ()
{
class { '::keystone::db::mysql':
class { 'keystone::db::mysql':
user => 'keystone_admin',
password => hiera('CONFIG_KEYSTONE_DB_PW'),
allowed_hosts => '%',
@ -8,7 +8,7 @@ class packstack::mariadb::services ()
}
if hiera('CONFIG_CINDER_INSTALL') == 'y' {
class { '::cinder::db::mysql':
class { 'cinder::db::mysql':
password => hiera('CONFIG_CINDER_DB_PW'),
host => '%',
allowed_hosts => '%',
@ -17,7 +17,7 @@ class packstack::mariadb::services ()
}
if hiera('CONFIG_GLANCE_INSTALL') == 'y' {
class { '::glance::db::mysql':
class { 'glance::db::mysql':
password => hiera('CONFIG_GLANCE_DB_PW'),
host => '%',
allowed_hosts => '%',
@ -26,7 +26,7 @@ class packstack::mariadb::services ()
}
if hiera('CONFIG_CEILOMETER_INSTALL') == 'y' {
class { '::gnocchi::db::mysql':
class { 'gnocchi::db::mysql':
password => hiera('CONFIG_GNOCCHI_DB_PW'),
host => '%',
allowed_hosts => '%',
@ -35,7 +35,7 @@ class packstack::mariadb::services ()
if hiera('CONFIG_AODH_INSTALL') == 'y' and
hiera('CONFIG_CEILOMETER_INSTALL') == 'y' {
class { '::aodh::db::mysql':
class { 'aodh::db::mysql':
password => hiera('CONFIG_AODH_DB_PW'),
host => '%',
allowed_hosts => '%',
@ -43,7 +43,7 @@ class packstack::mariadb::services ()
}
if hiera('CONFIG_HEAT_INSTALL') == 'y' {
class { '::heat::db::mysql':
class { 'heat::db::mysql':
password => hiera('CONFIG_HEAT_DB_PW'),
host => '%',
allowed_hosts => '%',
@ -52,7 +52,7 @@ class packstack::mariadb::services ()
}
if hiera('CONFIG_MAGNUM_INSTALL') == 'y' {
class { '::magnum::db::mysql':
class { 'magnum::db::mysql':
password => hiera('CONFIG_MAGNUM_DB_PW'),
host => '%',
allowed_hosts => '%',
@ -61,7 +61,7 @@ class packstack::mariadb::services ()
}
if hiera('CONFIG_IRONIC_INSTALL') == 'y' {
class { '::ironic::db::mysql':
class { 'ironic::db::mysql':
password => hiera('CONFIG_IRONIC_DB_PW'),
host => '%',
allowed_hosts => '%',
@ -70,7 +70,7 @@ class packstack::mariadb::services ()
}
if hiera('CONFIG_MANILA_INSTALL') == 'y' {
class { '::manila::db::mysql':
class { 'manila::db::mysql':
password => hiera('CONFIG_MANILA_DB_PW'),
allowed_hosts => '%',
charset => 'utf8',
@ -78,7 +78,7 @@ class packstack::mariadb::services ()
}
if hiera('CONFIG_NEUTRON_INSTALL') == 'y' {
class { '::neutron::db::mysql':
class { 'neutron::db::mysql':
password => hiera('CONFIG_NEUTRON_DB_PW'),
host => '%',
allowed_hosts => '%',
@ -88,19 +88,19 @@ class packstack::mariadb::services ()
}
if hiera('CONFIG_NOVA_INSTALL') == 'y' {
class { '::nova::db::mysql':
class { 'nova::db::mysql':
password => hiera('CONFIG_NOVA_DB_PW'),
host => '%',
allowed_hosts => '%',
charset => 'utf8',
}
class { '::nova::db::mysql_api':
class { 'nova::db::mysql_api':
password => hiera('CONFIG_NOVA_DB_PW'),
host => '%',
allowed_hosts => '%',
charset => 'utf8',
}
class { '::placement::db::mysql':
class { 'placement::db::mysql':
password => hiera('CONFIG_NOVA_DB_PW'),
host => '%',
allowed_hosts => '%',
@ -110,7 +110,7 @@ class packstack::mariadb::services ()
if hiera('CONFIG_PANKO_INSTALL') == 'y' and
hiera('CONFIG_CEILOMETER_INSTALL') == 'y' {
class { '::panko::db::mysql':
class { 'panko::db::mysql':
password => hiera('CONFIG_PANKO_DB_PW'),
host => '%',
allowed_hosts => '%',
@ -118,7 +118,7 @@ class packstack::mariadb::services ()
}
if hiera('CONFIG_SAHARA_INSTALL') == 'y' {
class { '::sahara::db::mysql':
class { 'sahara::db::mysql':
password => hiera('CONFIG_SAHARA_DB_PW'),
host => '%',
allowed_hosts => '%',
@ -127,7 +127,7 @@ class packstack::mariadb::services ()
}
if hiera('CONFIG_TROVE_INSTALL') == 'y' {
class { '::trove::db::mysql':
class { 'trove::db::mysql':
password => hiera('CONFIG_TROVE_DB_PW'),
host => '%',
allowed_hosts => '%',


+ 1
- 1
packstack/puppet/modules/packstack/manifests/memcached.pp View File

@ -6,7 +6,7 @@ class packstack::memcached ()
# TO-DO(mmagr): Add IPv6 support when hostnames are used
}
class { '::memcached':
class { 'memcached':
listen_ip => $memcached_bind_host,
max_memory => '10%',
}


+ 3
- 3
packstack/puppet/modules/packstack/manifests/neutron/api.pp View File

@ -10,7 +10,7 @@ class packstack::neutron::api ()
$neutron_user_password = hiera('CONFIG_NEUTRON_KS_PW')
$neutron_vpnaas_enabled = str2bool(hiera('CONFIG_NEUTRON_VPNAAS'))
class { '::neutron::keystone::authtoken':
class { 'neutron::keystone::authtoken':
username => 'neutron',
password => $neutron_user_password,
www_authenticate_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'),
@ -22,7 +22,7 @@ class packstack::neutron::api ()
database_connection => $neutron_sql_connection,
}
class { '::neutron::server':
class { 'neutron::server':
sync_db => true,
enabled => true,
api_workers => hiera('CONFIG_SERVICE_WORKERS'),
@ -37,7 +37,7 @@ class packstack::neutron::api ()
}
if $neutron_vpnaas_enabled {
class { '::neutron::services::vpnaas': }
class { 'neutron::services::vpnaas': }
}
Class['::neutron::server'] -> File['/etc/neutron/api-paste.ini']


+ 1
- 1
packstack/puppet/modules/packstack/manifests/neutron/dhcp.pp View File

@ -3,7 +3,7 @@ class packstack::neutron::dhcp ()
create_resources(packstack::firewall, hiera('FIREWALL_NEUTRON_DHCPIN_RULES', {}))
create_resources(packstack::firewall, hiera('FIREWALL_NEUTRON_DHCPOUT_RULES', {}))
class { '::neutron::agents::dhcp':
class { 'neutron::agents::dhcp':
interface_driver => hiera('CONFIG_NEUTRON_DHCP_INTERFACE_DRIVER'),
debug => hiera('CONFIG_DEBUG_MODE'),
}


+ 1
- 1
packstack/puppet/modules/packstack/manifests/neutron/l3.pp View File

@ -5,7 +5,7 @@ class packstack::neutron::l3 ()
default => true
}
class { '::neutron::agents::l3':
class { 'neutron::agents::l3':
interface_driver => hiera('CONFIG_NEUTRON_L3_INTERFACE_DRIVER'),
manage_service => $start_l3_agent,
enabled => $start_l3_agent,


+ 2
- 2
packstack/puppet/modules/packstack/manifests/neutron/lb_agent.pp View File

@ -16,14 +16,14 @@ class packstack::neutron::lb_agent ()
}
if ( 'vxlan' in hiera_array('CONFIG_NEUTRON_ML2_TYPE_DRIVERS') ){
class { '::neutron::agents::ml2::linuxbridge':
class { 'neutron::agents::ml2::linuxbridge':
physical_interface_mappings => force_interface($neutron_lb_interface_mappings, $use_subnets),
tunnel_types => ['vxlan'],
local_ip => $bind_host,
}
}
else {
class { '::neutron::agents::ml2::linuxbridge':
class { 'neutron::agents::ml2::linuxbridge':
physical_interface_mappings => force_interface($neutron_lb_interface_mappings, $use_subnets),
}
}


+ 1
- 1
packstack/puppet/modules/packstack/manifests/neutron/metadata.pp View File

@ -1,6 +1,6 @@
class packstack::neutron::metadata ()
{
class { '::neutron::agents::metadata':
class { 'neutron::agents::metadata':
shared_secret => hiera('CONFIG_NEUTRON_METADATA_PW'),
metadata_host => force_ip(hiera('CONFIG_KEYSTONE_HOST_URL')),
debug => hiera('CONFIG_DEBUG_MODE'),


+ 1
- 1
packstack/puppet/modules/packstack/manifests/neutron/metering.pp View File

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


+ 2
- 2
packstack/puppet/modules/packstack/manifests/neutron/ml2.pp View File

@ -6,7 +6,7 @@ class packstack::neutron::ml2 ()
$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'),
@ -21,7 +21,7 @@ class packstack::neutron::ml2 ()
}
if hiera('CONFIG_NEUTRON_L2_AGENT') == 'ovn' {
class {'::neutron::plugins::ml2::ovn':
class { 'neutron::plugins::ml2::ovn':
ovn_nb_connection => "tcp:${hiera('CONFIG_CONTROLLER_HOST')}:6641",
ovn_sb_connection => "tcp:${hiera('CONFIG_CONTROLLER_HOST')}:6642",
ovn_metadata_enabled => true,


+ 1
- 1
packstack/puppet/modules/packstack/manifests/neutron/notifications.pp View File

@ -3,7 +3,7 @@ class packstack::neutron::notifications ()
$neutron_notif_cfg_ctrl_host = hiera('CONFIG_KEYSTONE_HOST_URL')
# Configure nova notifications system
class { '::neutron::server::notifications':
class { 'neutron::server::notifications':
username => 'nova',
password => hiera('CONFIG_NOVA_KS_PW'),
project_name => 'services',


+ 1
- 1
packstack/puppet/modules/packstack/manifests/neutron/ovn_agent.pp View File

@ -45,7 +45,7 @@ class packstack::neutron::ovn_agent ()
$ovn_southd = "tcp:${hiera('CONFIG_CONTROLLER_HOST')}:6642"
class { '::ovn::controller':
class { 'ovn::controller':
ovn_remote => $ovn_southd,
ovn_bridge_mappings => $bridge_mappings,
bridge_interface_mappings => $bridge_uplinks,


+ 1
- 1
packstack/puppet/modules/packstack/manifests/neutron/ovn_metadata.pp View File

@ -2,7 +2,7 @@ class packstack::neutron::ovn_metadata ()
{
$ovn_southd = "tcp:${hiera('CONFIG_CONTROLLER_HOST')}:6642"
class { '::neutron::agents::ovn_metadata':
class { 'neutron::agents::ovn_metadata':
ovn_sb_connection => $ovn_southd,
shared_secret => hiera('CONFIG_NEUTRON_METADATA_PW'),
metadata_host => force_ip(hiera('CONFIG_KEYSTONE_HOST_URL')),


+ 1
- 1
packstack/puppet/modules/packstack/manifests/neutron/ovn_northd.pp View File

@ -1,4 +1,4 @@
class packstack::neutron::ovn_northd ()
{
include ::ovn::northd
include ovn::northd
}

+ 1
- 1
packstack/puppet/modules/packstack/manifests/neutron/ovs_agent.pp View File

@ -43,7 +43,7 @@ class packstack::neutron::ovs_agent ()
$bridge_mappings = []
}
class { '::neutron::agents::ml2::ovs':
class { 'neutron::agents::ml2::ovs':
bridge_uplinks => $bridge_uplinks,
bridge_mappings => $bridge_mappings,
tunnel_types => hiera_array('CONFIG_NEUTRON_OVS_TUNNEL_TYPES'),


+ 2
- 2
packstack/puppet/modules/packstack/manifests/neutron/rabbitmq.pp View File

@ -25,11 +25,11 @@ class packstack::neutron::rabbitmq ()
File[$files_to_set_owner] ~> Service<| tag == 'neutron-service' |>
}
class { '::neutron::logging':
class { 'neutron::logging':
debug => hiera('CONFIG_DEBUG_MODE'),
}
class { '::neutron':
class { 'neutron':
bind_host => $bind_host,
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",


+ 1
- 1
packstack/puppet/modules/packstack/manifests/neutron/vpnaas.pp View File

@ -1,6 +1,6 @@
class packstack::neutron::vpnaas ()
{
class { '::neutron::agents::vpnaas':
class { 'neutron::agents::vpnaas':
vpn_device_driver => 'neutron_vpnaas.services.vpn.device_drivers.libreswan_ipsec.LibreSwanDriver',
}
}

+ 2
- 2
packstack/puppet/modules/packstack/manifests/nova.pp View File

@ -56,11 +56,11 @@ class packstack::nova ()
$key = undef
}
class { '::nova::logging':
class { 'nova::logging':
debug => hiera('CONFIG_DEBUG_MODE'),
}
class { '::nova':
class { 'nova':
default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
nova_public_key => $public_key,


+ 11
- 11
packstack/puppet/modules/packstack/manifests/nova/api.pp View File

@ -11,7 +11,7 @@ class packstack::nova::api ()
$www_authenticate_uri = hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS')
$admin_password = hiera('CONFIG_NOVA_KS_PW')
class {'::nova::keystone::authtoken':
class { 'nova::keystone::authtoken':
password => $admin_password,
www_authenticate_uri => $www_authenticate_uri,
auth_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
@ -23,11 +23,11 @@ class packstack::nova::api ()
$pci_alias = hiera('CONFIG_NOVA_PCI_ALIAS')
}
class { '::nova::pci':
class { 'nova::pci':
aliases => $pci_alias,
}
class { '::nova::api':
class { 'nova::api':
api_bind_address => $bind_host,
enabled => true,
sync_db => false,
@ -38,31 +38,31 @@ class packstack::nova::api ()
service_name => 'httpd',
}
class { '::nova::metadata':
class { 'nova::metadata':
neutron_metadata_proxy_shared_secret => hiera('CONFIG_NEUTRON_METADATA_PW_UNQUOTED', undef),
}
class { '::nova::wsgi::apache_api':
class { 'nova::wsgi::apache_api':
bind_host => $bind_host,
ssl => false,
workers => hiera('CONFIG_SERVICE_WORKERS'),
}
class { '::nova::wsgi::apache_metadata':
class { 'nova::wsgi::apache_metadata':
bind_host => $bind_host,
ssl => false,
workers => hiera('CONFIG_SERVICE_WORKERS'),
}
class { '::nova::db::sync':
class { 'nova::db::sync':
db_sync_timeout => 600,
}
class { '::nova::db::sync_api':
class { 'nova::db::sync_api':
db_sync_timeout => 600,
}
class { '::nova::placement':
class { 'nova::placement':
auth_url => $www_authenticate_uri,
password => $admin_password,
region_name => hiera('CONFIG_KEYSTONE_REGION'),
@ -70,13 +70,13 @@ class packstack::nova::api ()
$db_purge = hiera('CONFIG_NOVA_DB_PURGE_ENABLE')
if $db_purge {
class { '::nova::cron::archive_deleted_rows':
class { 'nova::cron::archive_deleted_rows':
hour => '*/12',
destination => '/dev/null',
}
}
include ::nova::cell_v2::simple_setup
include nova::cell_v2::simple_setup
$manage_flavors = str2bool(hiera('CONFIG_NOVA_MANAGE_FLAVORS'))
if $manage_flavors {


+ 2
- 2
packstack/puppet/modules/packstack/manifests/nova/ceilometer.pp View File

@ -1,6 +1,6 @@
class packstack::nova::ceilometer ()
{
class { '::ceilometer::agent::auth':
class { 'ceilometer::agent::auth':
auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'),
auth_password => hiera('CONFIG_CEILOMETER_KS_PW'),
auth_region => hiera('CONFIG_KEYSTONE_REGION'),
@ -8,7 +8,7 @@ class packstack::nova::ceilometer ()
ensure_packages(['openstack-ceilometer-ipmi'], {'ensure' => 'present'})
class { '::ceilometer::agent::polling': }
class { 'ceilometer::agent::polling': }
Package['openstack-ceilometer-ipmi'] -> Service['ceilometer-polling']
}