From 4361f449c8cbdbf77a976ea91a34e9159a8e0550 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 14 Jan 2014 13:43:00 -0500 Subject: [PATCH] Renamse privatecloud to cloud Signed-off-by: Emilien Macchi --- .fixtures.yml | 2 +- manifests/automation.pp | 4 +-- manifests/cache.pp | 4 +-- manifests/compute.pp | 4 +-- manifests/compute/controller.pp | 4 +-- manifests/compute/hypervisor.pp | 4 +-- manifests/dashboard.pp | 4 +-- manifests/database/nosql.pp | 4 +-- manifests/database/sql.pp | 4 +-- manifests/identity.pp | 4 +-- manifests/image.pp | 4 +-- manifests/init.pp | 4 +-- manifests/loadbalancer.pp | 30 +++++++++---------- manifests/loadbalancer/listen_http.pp | 4 +-- manifests/messaging.pp | 4 +-- manifests/network.pp | 4 +-- manifests/network/compute.pp | 4 +-- manifests/network/controller.pp | 4 +-- manifests/network/dhcp.pp | 4 +-- manifests/network/l3.pp | 4 +-- manifests/network/lbaas.pp | 4 +-- manifests/network/metadata.pp | 4 +-- manifests/network/vpn.pp | 4 +-- manifests/object.pp | 6 ++-- manifests/object/controller.pp | 4 +-- manifests/object/ringbuilder.pp | 4 +-- manifests/object/storage.pp | 4 +-- manifests/object/tweaking.pp | 2 +- manifests/orchestration.pp | 2 +- manifests/orchestration/api.pp | 4 +-- manifests/orchestration/engine.pp | 4 +-- manifests/spof.pp | 16 +++++----- manifests/storage/rbd.pp | 2 +- manifests/storage/rbd/monitor.pp | 4 +-- manifests/storage/rbd/osd.pp | 4 +-- manifests/storage/rbd/pools.pp | 4 +-- manifests/telemetry.pp | 2 +- manifests/telemetry/centralagent.pp | 4 +-- manifests/telemetry/server.pp | 4 +-- manifests/volume.pp | 2 +- manifests/volume/controller.pp | 4 +-- manifests/volume/storage.pp | 4 +-- spec/classes/privatecloud_cache_spec.rb | 4 +-- .../privatecloud_compute_controller_spec.rb | 6 ++-- .../privatecloud_compute_hypervisor_spec.rb | 6 ++-- spec/classes/privatecloud_dashboard_spec.rb | 4 +-- .../privatecloud_database_nosql_spec.rb | 4 +-- .../classes/privatecloud_database_sql_spec.rb | 4 +-- spec/classes/privatecloud_identity_spec.rb | 4 +-- spec/classes/privatecloud_image_spec.rb | 4 +-- spec/classes/privatecloud_init_spec.rb | 4 +-- .../classes/privatecloud_loadbalancer_spec.rb | 4 +-- spec/classes/privatecloud_messaging_spec.rb | 4 +-- .../privatecloud_network_compute_spec.rb | 6 ++-- .../privatecloud_network_controller_spec.rb | 6 ++-- .../classes/privatecloud_network_dhcp_spec.rb | 6 ++-- spec/classes/privatecloud_network_l3_spec.rb | 6 ++-- .../privatecloud_network_lbaas_spec.rb | 6 ++-- .../privatecloud_network_metadata_spec.rb | 6 ++-- spec/classes/privatecloud_network_vpn_spec.rb | 6 ++-- .../privatecloud_orchestration_api_spec.rb | 6 ++-- .../privatecloud_orchestration_engine_spec.rb | 6 ++-- ...rivatecloud_telemetry_centralagent_spec.rb | 6 ++-- .../privatecloud_telemetry_server_spec.rb | 6 ++-- .../privatecloud_volume_controller_spec.rb | 6 ++-- .../privatecloud_volume_storage_spec.rb | 6 ++-- templates/database/mysql.conf.erb | 2 +- 67 files changed, 162 insertions(+), 162 deletions(-) diff --git a/.fixtures.yml b/.fixtures.yml index ebc6be12..249215fd 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -32,4 +32,4 @@ fixtures: 'stdlib': 'git://github.com/puppetlabs/puppetlabs-stdlib.git' 'xinetd': 'git://github.com/puppetlabs/puppetlabs-xinetd.git' symlinks: - 'privatecloud': '#{source_dir}' + 'cloud': '#{source_dir}' diff --git a/manifests/automation.pp b/manifests/automation.pp index 1bfe5948..30bba976 100644 --- a/manifests/automation.pp +++ b/manifests/automation.pp @@ -13,13 +13,13 @@ # License for the specific language governing permissions and limitations # under the License. # -# == Class: privatecloud::automation +# == Class: cloud::automation # # Installs the Automation Server (puppet master) # # -class privatecloud::automation{ +class cloud::automation{ # Ensure git is installed class { 'git': } diff --git a/manifests/cache.pp b/manifests/cache.pp index 41f35472..f81ecbca 100644 --- a/manifests/cache.pp +++ b/manifests/cache.pp @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. # -# == Class: privatecloud::cache +# == Class: cloud::cache # # Install a cache server (used by OpenStack services) # @@ -24,7 +24,7 @@ # Default to $::ipaddress_eth0 # -class privatecloud::cache ( +class cloud::cache ( $listen_ip = $::ipaddress_eth0, ){ diff --git a/manifests/compute.pp b/manifests/compute.pp index cc37e071..f248cc4e 100644 --- a/manifests/compute.pp +++ b/manifests/compute.pp @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. # -# == Class: privatecloud::compute +# == Class: cloud::compute # # Common class for compute nodes # @@ -56,7 +56,7 @@ # Default value in params # -class privatecloud::compute( +class cloud::compute( $nova_db_host = $os_params::nova_db_host, $nova_db_user = $os_params::nova_db_user, $nova_db_password = $os_params::nova_db_password, diff --git a/manifests/compute/controller.pp b/manifests/compute/controller.pp index 9c7da758..62c9e9fd 100644 --- a/manifests/compute/controller.pp +++ b/manifests/compute/controller.pp @@ -16,7 +16,7 @@ # Compute controller node # -class privatecloud::compute::controller( +class cloud::compute::controller( $ks_keystone_internal_host = $os_params::ks_keystone_internal_host, $ks_nova_password = $os_params::ks_nova_password, $neutron_metadata_proxy_shared_secret = $os_params::neutron_metadata_proxy_shared_secret, @@ -27,7 +27,7 @@ class privatecloud::compute::controller( $ks_metadata_public_port = $os_params::ks_metadata_public_port ){ - include 'privatecloud::compute' + include 'cloud::compute' class { [ 'nova::scheduler', diff --git a/manifests/compute/hypervisor.pp b/manifests/compute/hypervisor.pp index cdb251d6..af9a1610 100644 --- a/manifests/compute/hypervisor.pp +++ b/manifests/compute/hypervisor.pp @@ -16,7 +16,7 @@ # Hypervisor Compute node # -class privatecloud::compute::hypervisor( +class cloud::compute::hypervisor( $api_eth = $os_params::api_eth, $libvirt_type = $os_params::libvirt_type, $ks_nova_internal_proto = $os_params::ks_nova_internal_proto, @@ -27,7 +27,7 @@ class privatecloud::compute::hypervisor( $has_ceph = false ) { - include 'privatecloud::compute' + include 'cloud::compute' exec { 'insert_module_nbd': command => '/bin/echo "nbd" > /etc/modules', diff --git a/manifests/dashboard.pp b/manifests/dashboard.pp index cb5ab60f..1fb0795b 100644 --- a/manifests/dashboard.pp +++ b/manifests/dashboard.pp @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. # -# == Class: privatecloud::dashboard +# == Class: cloud::dashboard # # Installs the OpenStack Dashboard (Horizon) # @@ -42,7 +42,7 @@ # Defaults false # -class privatecloud::dashboard( +class cloud::dashboard( $ks_keystone_internal_host = $os_params::ks_keystone_internal_host, $secret_key = $os_params::secret_key, $horizon_port = $os_params::horizon_port, diff --git a/manifests/database/nosql.pp b/manifests/database/nosql.pp index 1b3a8622..c9d1017e 100644 --- a/manifests/database/nosql.pp +++ b/manifests/database/nosql.pp @@ -13,11 +13,11 @@ # License for the specific language governing permissions and limitations # under the License. # -# == Class: privatecloud::database::nosql +# == Class: cloud::database::nosql # # Install a nosql server (MongoDB) # -class privatecloud::database::nosql( +class cloud::database::nosql( $bind_ip = undef, ) { diff --git a/manifests/database/sql.pp b/manifests/database/sql.pp index 1b3fcdfd..72df059b 100644 --- a/manifests/database/sql.pp +++ b/manifests/database/sql.pp @@ -16,7 +16,7 @@ # MySQL Galera Node # -class privatecloud::database::sql ( +class cloud::database::sql ( $api_eth = $os_params::api_eth, $service_provider = sysv, $galera_nextserver = $os_params::galera_nextserver, @@ -197,7 +197,7 @@ basedir = /usr mysql::server::config{'basic_config': notify_service => false, notify => Exec['clean-mysql-binlog'], - settings => template('privatecloud/database/mysql.conf.erb') + settings => template('cloud/database/mysql.conf.erb') } exec{'clean-mysql-binlog': diff --git a/manifests/identity.pp b/manifests/identity.pp index 2f887091..3490dd11 100644 --- a/manifests/identity.pp +++ b/manifests/identity.pp @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. # -# == Class: privatecloud::identity +# == Class: cloud::identity # # Install Identity Server (Keystone) # @@ -316,7 +316,7 @@ # Default value in params # -class privatecloud::identity ( +class cloud::identity ( $identity_roles_addons = $os_params::identity_roles_addons, $keystone_db_host = $os_params::keystone_db_host, $keystone_db_user = $os_params::keystone_db_user, diff --git a/manifests/image.pp b/manifests/image.pp index 846e3550..128adf26 100644 --- a/manifests/image.pp +++ b/manifests/image.pp @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. # -# == Class: privatecloud::image +# == Class: cloud::image # # Install Image Server (Glance) # @@ -56,7 +56,7 @@ # Default value in params # -class privatecloud::image( +class cloud::image( $glance_db_host = $os_params::glance_db_host, $glance_db_user = $os_params::glance_db_user, $glance_db_password = $os_params::glance_db_password, diff --git a/manifests/init.pp b/manifests/init.pp index cd68728f..09860bb6 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -13,12 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. # -# Class: privatecloud +# Class: cloud # # Installs the private cloud system requirements # -class privatecloud { +class cloud { # motd file diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp index 1ade6c38..537b93f7 100644 --- a/manifests/loadbalancer.pp +++ b/manifests/loadbalancer.pp @@ -16,7 +16,7 @@ # HAproxy nodes # -class privatecloud::loadbalancer( +class cloud::loadbalancer( $ceilometer_api = true, $cinder_api = true, $glance_api = true, @@ -162,7 +162,7 @@ monitor fail if horizon_dead } if $keystone_api { - privatecloud::loadbalancer::listen_http { + cloud::loadbalancer::listen_http { 'keystone_api_cluster': ports => $ks_keystone_public_port, listen_ip => $openstack_vip; @@ -172,7 +172,7 @@ monitor fail if horizon_dead } } if $swift_api { - privatecloud::loadbalancer::listen_http{ + cloud::loadbalancer::listen_http{ 'swift_api_cluster': ports => $ks_swift_public_port, httpchk => 'httpchk /healthcheck', @@ -180,28 +180,28 @@ monitor fail if horizon_dead } } if $nova_api { - privatecloud::loadbalancer::listen_http{ + cloud::loadbalancer::listen_http{ 'nova_api_cluster': ports => $ks_nova_public_port, listen_ip => $openstack_vip; } } if $ec2_api { - privatecloud::loadbalancer::listen_http{ + cloud::loadbalancer::listen_http{ 'ec2_api_cluster': ports => $ks_ec2_public_port, listen_ip => $openstack_vip; } } if $metadata_api { - privatecloud::loadbalancer::listen_http{ + cloud::loadbalancer::listen_http{ 'metadata_api_cluster': ports => $ks_metadata_public_port, listen_ip => $openstack_vip; } } if $spice { - privatecloud::loadbalancer::listen_http{ + cloud::loadbalancer::listen_http{ 'spice_cluster': ports => $spice_port, listen_ip => $openstack_vip, @@ -209,56 +209,56 @@ monitor fail if horizon_dead } } if $glance_api { - privatecloud::loadbalancer::listen_http{ + cloud::loadbalancer::listen_http{ 'glance_api_cluster': ports => $ks_glance_public_port, listen_ip => $openstack_vip; } } if $neutron_api { - privatecloud::loadbalancer::listen_http{ + cloud::loadbalancer::listen_http{ 'neutron_api_cluster': ports => $ks_neutron_public_port, listen_ip => $openstack_vip; } } if $cinder_api { - privatecloud::loadbalancer::listen_http{ + cloud::loadbalancer::listen_http{ 'cinder_api_cluster': ports => $ks_cinder_public_port, listen_ip => $openstack_vip; } } if $ceilometer_api { - privatecloud::loadbalancer::listen_http{ + cloud::loadbalancer::listen_http{ 'ceilometer_api_cluster': ports => $ks_ceilometer_public_port, listen_ip => $openstack_vip; } } if $heat_api { - privatecloud::loadbalancer::listen_http{ + cloud::loadbalancer::listen_http{ 'heat_api_cluster': ports => $ks_heat_public_port, listen_ip => $openstack_vip; } } if $heat_cfn_api { - privatecloud::loadbalancer::listen_http{ + cloud::loadbalancer::listen_http{ 'heat_api_cfn_cluster': ports => $ks_heat_cfn_public_port, listen_ip => $openstack_vip; } } if $heat_cloudwatch_api { - privatecloud::loadbalancer::listen_http{ + cloud::loadbalancer::listen_http{ 'heat_api_cloudwatch_cluster': ports => $ks_heat_cloudwatch_public_port, listen_ip => $openstack_vip; } } if $horizon { - privatecloud::loadbalancer::listen_http{ + cloud::loadbalancer::listen_http{ 'horizon_cluster': ports => $horizon_port, listen_ip => $openstack_vip; diff --git a/manifests/loadbalancer/listen_http.pp b/manifests/loadbalancer/listen_http.pp index d2030ce0..9d281d58 100644 --- a/manifests/loadbalancer/listen_http.pp +++ b/manifests/loadbalancer/listen_http.pp @@ -15,9 +15,9 @@ # # Define:: # -# privatecloud::loadbalancer::listen_http +# cloud::loadbalancer::listen_http # -define privatecloud::loadbalancer::listen_http( +define cloud::loadbalancer::listen_http( $ports = 'unset', $httpchk = 'httpchk', $listen_ip = '0.0.0.0') { diff --git a/manifests/messaging.pp b/manifests/messaging.pp index 6313563b..c9e5b846 100644 --- a/manifests/messaging.pp +++ b/manifests/messaging.pp @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. # -# == Class: privatecloud::messaging +# == Class: cloud::messaging # # Install Messsaging Server (RabbitMQ) # @@ -28,7 +28,7 @@ # Default value in params # -class privatecloud::messaging( +class cloud::messaging( $rabbit_hosts = $os_params::rabbit_hosts, $rabbit_names = $os_params::rabbit_names, $rabbit_password = $os_params::rabbit_password diff --git a/manifests/network.pp b/manifests/network.pp index 67bb7720..7547011b 100644 --- a/manifests/network.pp +++ b/manifests/network.pp @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. # -# == Class: privatecloud::network +# == Class: cloud::network # # Common class for network nodes # @@ -40,7 +40,7 @@ # Default value in params # -class privatecloud::network( +class cloud::network( $verbose = $os_params::verbose, $debug = $os_params::debug, $rabbit_hosts = $os_params::rabbit_hosts, diff --git a/manifests/network/compute.pp b/manifests/network/compute.pp index d83210f7..1bee3881 100644 --- a/manifests/network/compute.pp +++ b/manifests/network/compute.pp @@ -16,13 +16,13 @@ # Network Compute node (Agent) # -class privatecloud::network::compute( +class cloud::network::compute( $neutron_endpoint = $os_params::ks_neutron_admin_host, $neutron_protocol = $os_params::ks_neutron_public_proto, $neutron_password = $os_params::ks_neutron_password, ) { - include 'privatecloud::network' + include 'cloud::network' class { 'nova::network::neutron': neutron_admin_password => $neutron_password, diff --git a/manifests/network/controller.pp b/manifests/network/controller.pp index b3dc951f..88dfb77e 100644 --- a/manifests/network/controller.pp +++ b/manifests/network/controller.pp @@ -16,7 +16,7 @@ # Network Controller node (API + Scheduler) # -class privatecloud::network::controller( +class cloud::network::controller( $neutron_db_host = $os_params::neutron_db_host, $neutron_db_user = $os_params::neutron_db_user, $neutron_db_password = $os_params::neutron_db_password, @@ -29,7 +29,7 @@ class privatecloud::network::controller( $public_cidr = $os_params::public_cidr ) { - include 'privatecloud::network' + include 'cloud::network' $encoded_user = uriescape($neutron_db_user) $encoded_password = uriescape($neutron_db_password) diff --git a/manifests/network/dhcp.pp b/manifests/network/dhcp.pp index fc973153..365b156d 100644 --- a/manifests/network/dhcp.pp +++ b/manifests/network/dhcp.pp @@ -16,11 +16,11 @@ # Network DHCP node # -class privatecloud::network::dhcp( +class cloud::network::dhcp( $debug = $os_params::debug ) { - include 'privatecloud::network' + include 'cloud::network' class { 'neutron::agents::dhcp': debug => $debug diff --git a/manifests/network/l3.pp b/manifests/network/l3.pp index 68014166..0799b392 100644 --- a/manifests/network/l3.pp +++ b/manifests/network/l3.pp @@ -16,12 +16,12 @@ # Network L3 node # -class privatecloud::network::l3( +class cloud::network::l3( $external_int = $os_params::external_int, $debug = $os_params::debug, ) { - include 'privatecloud::network' + include 'cloud::network' class { 'neutron::agents::l3': debug => $debug, diff --git a/manifests/network/lbaas.pp b/manifests/network/lbaas.pp index 805b8460..d118de3d 100644 --- a/manifests/network/lbaas.pp +++ b/manifests/network/lbaas.pp @@ -16,11 +16,11 @@ # Network LBaaS node # -class privatecloud::network::lbaas( +class cloud::network::lbaas( $debug = $os_params::debug ) { - include 'privatecloud::network' + include 'cloud::network' class { 'neutron::agents::lbaas': debug => $debug, diff --git a/manifests/network/metadata.pp b/manifests/network/metadata.pp index dc20c46c..7e29c7bc 100644 --- a/manifests/network/metadata.pp +++ b/manifests/network/metadata.pp @@ -17,7 +17,7 @@ # Could be managed by spof_node manifest # -class privatecloud::network::metadata( +class cloud::network::metadata( $enabled = true, $debug = $os_params::debug, $ks_neutron_password = $os_params::ks_neutron_password, @@ -28,7 +28,7 @@ class privatecloud::network::metadata( $ks_keystone_admin_host = $os_params::ks_keystone_admin_host ) { - include 'privatecloud::network' + include 'cloud::network' class { 'neutron::agents::metadata': enabled => $enabled, diff --git a/manifests/network/vpn.pp b/manifests/network/vpn.pp index 4956ac24..d2cf7eb9 100644 --- a/manifests/network/vpn.pp +++ b/manifests/network/vpn.pp @@ -16,9 +16,9 @@ # Network VPNaaS node # -class privatecloud::network::vpn{ +class cloud::network::vpn{ - include 'privatecloud::network' + include 'cloud::network' class { 'neutron::agents::vpnaas': } diff --git a/manifests/object.pp b/manifests/object.pp index 0a39d9db..dd542c80 100644 --- a/manifests/object.pp +++ b/manifests/object.pp @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. # -# == Class: privatecloud::object +# == Class: cloud::object # # Common class for object storage nodes # @@ -24,7 +24,7 @@ # Default value in params # -class privatecloud::object( +class cloud::object( $swift_hash_suffix = $os_params::swift_hash_suffix ) { @@ -34,6 +34,6 @@ class privatecloud::object( swift_hash_suffix => $swift_hash_suffix, } - class {'privatecloud::object::tweaking': } + class {'cloud::object::tweaking': } } diff --git a/manifests/object/controller.pp b/manifests/object/controller.pp index 41134482..e0b4806e 100644 --- a/manifests/object/controller.pp +++ b/manifests/object/controller.pp @@ -16,7 +16,7 @@ # Swift Proxy node # -class privatecloud::object::controller( +class cloud::object::controller( $ks_keystone_admin_host = $os_params::ks_keystone_admin_host, $ks_keystone_admin_port = $os_params::ks_keystone_admin_port, $ks_keystone_internal_host = $os_params::ks_keystone_internal_host, @@ -30,7 +30,7 @@ class privatecloud::object::controller( $api_eth = $os_params::api_eth, ) { - include 'privatecloud::object' + include 'cloud::object' class { 'swift::proxy': proxy_local_net_ip => $api_eth, diff --git a/manifests/object/ringbuilder.pp b/manifests/object/ringbuilder.pp index 99aec6d1..da0f2fa5 100644 --- a/manifests/object/ringbuilder.pp +++ b/manifests/object/ringbuilder.pp @@ -16,7 +16,7 @@ # Swift ring builder node # -class privatecloud::object::ringbuilder( +class cloud::object::ringbuilder( $rsyncd_ipaddress = ipaddress_eth0, $replicas = $os_params::replicas, $swift_rsync_max_connections = $os_params::swift_rsync_max_connections, @@ -26,7 +26,7 @@ class privatecloud::object::ringbuilder( Ring_container_device <<| |>> Ring_account_device <<| |>> - Class['swift'] -> Class['privatecloud::object::ringbuilder'] + Class['swift'] -> Class['cloud::object::ringbuilder'] swift::ringbuilder::create{ ['account', 'container']: part_power => 9, diff --git a/manifests/object/storage.pp b/manifests/object/storage.pp index da11a336..7954c1f7 100644 --- a/manifests/object/storage.pp +++ b/manifests/object/storage.pp @@ -27,7 +27,7 @@ define set_io_scheduler(){ } # swift storage -class privatecloud::object::storage ( +class cloud::object::storage ( $storage_eth = $os_params::storage_eth, $swift_zone = undef, $object_port = '6000', @@ -36,7 +36,7 @@ class privatecloud::object::storage ( $onloopdevices = false, ) { - include 'privatecloud::object' + include 'cloud::object' class { 'swift::storage': storage_local_net_ip => $storage_eth, diff --git a/manifests/object/tweaking.pp b/manifests/object/tweaking.pp index bea93acf..878c3acf 100644 --- a/manifests/object/tweaking.pp +++ b/manifests/object/tweaking.pp @@ -16,7 +16,7 @@ # Swift tweaking # -class privatecloud::object::tweaking { +class cloud::object::tweaking { file {'/etc/sysctl.d/swift-tuning.conf': content => " # disable TIME_WAIT.. wait.. diff --git a/manifests/orchestration.pp b/manifests/orchestration.pp index 042a7332..44bf588c 100644 --- a/manifests/orchestration.pp +++ b/manifests/orchestration.pp @@ -16,7 +16,7 @@ # Orchestration common node # -class privatecloud::orchestration( +class cloud::orchestration( $ks_keystone_internal_host = $os_params::ks_keystone_internal_host, $ks_keystone_internal_port = $os_params::ks_keystone_internal_port, $ks_keystone_internal_proto = $os_params::ks_keystone_internal_proto, diff --git a/manifests/orchestration/api.pp b/manifests/orchestration/api.pp index 0b42ae3c..60732da4 100644 --- a/manifests/orchestration/api.pp +++ b/manifests/orchestration/api.pp @@ -16,14 +16,14 @@ # Orchestration APIs node # -class privatecloud::orchestration::api( +class cloud::orchestration::api( $ks_heat_internal_port = $os_params::ks_heat_internal_port, $ks_heat_cfn_internal_port = $os_params::ks_heat_cfn_internal_port, $ks_heat_cloudwatch_internal_port = $os_params::ks_heat_cloudwatch_internal_port, $api_eth = $os_params::api_eth, ) { - include 'privatecloud::orchestration' + include 'cloud::orchestration' class { 'heat::api': bind_host => $api_eth, diff --git a/manifests/orchestration/engine.pp b/manifests/orchestration/engine.pp index 637202a8..0502bf21 100644 --- a/manifests/orchestration/engine.pp +++ b/manifests/orchestration/engine.pp @@ -17,7 +17,7 @@ # Could be managed by spof node as Active / Passive. # -class privatecloud::orchestration::engine( +class cloud::orchestration::engine( $enabled = true, $ks_heat_public_host = $os_params::ks_heat_public_host, $ks_heat_public_proto = $os_params::ks_heat_public_proto, @@ -27,7 +27,7 @@ class privatecloud::orchestration::engine( $auth_encryption_key = $os_params::heat_auth_encryption_key ) { - include 'privatecloud::orchestration' + include 'cloud::orchestration' class { 'heat::engine': enabled => $enabled, diff --git a/manifests/spof.pp b/manifests/spof.pp index 3a16f06e..6b933dc9 100644 --- a/manifests/spof.pp +++ b/manifests/spof.pp @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. # -# == Class: privatecloud::spof +# == Class: cloud::spof # # Install all SPOF services in active / passive with Pacemaker / Corosync # @@ -28,7 +28,7 @@ # Default to '239.1.1.2'. # -class privatecloud::spof( +class cloud::spof( $cluster_ip = $os_params::cluster_ip, $multicast_address = '239.1.1.2' ) { @@ -54,7 +54,7 @@ class privatecloud::spof( Package['corosync'] -> file { '/usr/lib/ocf/resource.d/heartbeat/ceilometer-agent-central': - source => 'puppet:///modules/privatecloud/heartbeat/ceilometer-agent-central', + source => 'puppet:///modules/cloud/heartbeat/ceilometer-agent-central', mode => '0755', owner => 'root', group => 'root', @@ -78,7 +78,7 @@ class privatecloud::spof( Package['corosync'] -> file { '/usr/lib/ocf/resource.d/heartbeat/neutron-metadata-agent': - source => 'puppet:///modules/privatecloud/heartbeat/neutron-metadata-agent', + source => 'puppet:///modules/cloud/heartbeat/neutron-metadata-agent', mode => '0755', owner => 'root', group => 'root', @@ -102,7 +102,7 @@ class privatecloud::spof( Package['corosync'] -> file { '/usr/lib/ocf/resource.d/heartbeat/heat-engine': - source => 'puppet:///modules/privatecloud/heartbeat/heat-engine', + source => 'puppet:///modules/cloud/heartbeat/heat-engine', mode => '0755', owner => 'root', group => 'root', @@ -125,15 +125,15 @@ class privatecloud::spof( } # Run OpenStack SPOF service and disable them since they will be managed by Corosync. - class { 'privatecloud::network::metadata': + class { 'cloud::network::metadata': enabled => false, } - class { 'privatecloud::orchestration::engine': + class { 'cloud::orchestration::engine': enabled => false, } - class { 'privatecloud::telemetry::centralagent': + class { 'cloud::telemetry::centralagent': enabled => false, } diff --git a/manifests/storage/rbd.pp b/manifests/storage/rbd.pp index f00ff5b9..0bc9161c 100644 --- a/manifests/storage/rbd.pp +++ b/manifests/storage/rbd.pp @@ -14,7 +14,7 @@ # under the License. # -class privatecloud::storage::rbd ( +class cloud::storage::rbd ( $fsid = $os_params::ceph_fsid, $cluster_network = $os_params::ceph_cluster_network, $public_network = $os_params::ceph_public_network diff --git a/manifests/storage/rbd/monitor.pp b/manifests/storage/rbd/monitor.pp index 1bda49de..f77fd41b 100644 --- a/manifests/storage/rbd/monitor.pp +++ b/manifests/storage/rbd/monitor.pp @@ -14,13 +14,13 @@ # under the License. # -class privatecloud::storage::rbd::monitor ( +class cloud::storage::rbd::monitor ( $id = $::uniqueid, $mon_addr = $::ipaddress_eth0, $monitor_secret = $os_params::ceph_mon_secret ) { - include 'privatecloud::storage::rbd' + include 'cloud::storage::rbd' ceph::mon { $id: monitor_secret => $monitor_secret, diff --git a/manifests/storage/rbd/osd.pp b/manifests/storage/rbd/osd.pp index 174c106b..6a70e662 100644 --- a/manifests/storage/rbd/osd.pp +++ b/manifests/storage/rbd/osd.pp @@ -13,13 +13,13 @@ # License for the specific language governing permissions and limitations # under the License. # -class privatecloud::storage::rbd::osd ( +class cloud::storage::rbd::osd ( $public_address = $::ipaddress_eth0, $cluster_address = $::ipaddress_eth0, $devices = ['sdb','sdc'], ) { - include 'privatecloud::storage::rbd' + include 'cloud::storage::rbd' class { 'ceph::osd' : public_address => $public_address, diff --git a/manifests/storage/rbd/pools.pp b/manifests/storage/rbd/pools.pp index 616656ec..a1e83ac2 100644 --- a/manifests/storage/rbd/pools.pp +++ b/manifests/storage/rbd/pools.pp @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. # -class privatecloud::storage::rbd::pools( +class cloud::storage::rbd::pools( $setup_pools = false, $glance_pool = 'ceph_glance', $glance_user = 'glance', @@ -70,7 +70,7 @@ osd 'allow class-read object_prefix rbd_children, allow rwx pool=${glance_pool}, # } @@file { '/etc/ceph/secret.xml': - content => template('privatecloud/storage/ceph/secret-compute.xml.erb'), + content => template('cloud/storage/ceph/secret-compute.xml.erb'), tag => 'ceph_compute_secret_file', } diff --git a/manifests/telemetry.pp b/manifests/telemetry.pp index 42ea2638..f50e1cea 100644 --- a/manifests/telemetry.pp +++ b/manifests/telemetry.pp @@ -16,7 +16,7 @@ # Used by Controller, Storage, Network and Compute nodes # -class privatecloud::telemetry( +class cloud::telemetry( $ceilometer_secret = $os_params::ceilometer_secret, $rabbit_hosts = $os_params::rabbit_hosts, $rabbit_password = $os_params::rabbit_password, diff --git a/manifests/telemetry/centralagent.pp b/manifests/telemetry/centralagent.pp index 4633c2ac..c426a091 100644 --- a/manifests/telemetry/centralagent.pp +++ b/manifests/telemetry/centralagent.pp @@ -17,11 +17,11 @@ # Could be managed by spof node as Active / Passive. # -class privatecloud::telemetry::centralagent( +class cloud::telemetry::centralagent( $enabled = true, ){ - include 'privatecloud::telemetry' + include 'cloud::telemetry' class { 'ceilometer::agent::central': enabled => $enabled, diff --git a/manifests/telemetry/server.pp b/manifests/telemetry/server.pp index 417438e8..6b873385 100644 --- a/manifests/telemetry/server.pp +++ b/manifests/telemetry/server.pp @@ -16,7 +16,7 @@ # Telemetry server nodes # -class privatecloud::telemetry::server( +class cloud::telemetry::server( $ks_keystone_internal_host = $os_params::ks_keystone_internal_host, $ks_keystone_internal_proto = $os_params::ks_keystone_internal_proto, $ks_ceilometer_internal_port = $os_params::ks_ceilometer_internal_port, @@ -25,7 +25,7 @@ class privatecloud::telemetry::server( $api_eth = $os_params::api_eth, ){ - include 'privatecloud::telemetry' + include 'cloud::telemetry' # Install MongoDB database class { 'ceilometer::db': diff --git a/manifests/volume.pp b/manifests/volume.pp index 81c6f770..22a3d5be 100644 --- a/manifests/volume.pp +++ b/manifests/volume.pp @@ -16,7 +16,7 @@ # Volume Common # -class privatecloud::volume( +class cloud::volume( $cinder_db_host = $os_params::cinder_db_host, $cinder_db_user = $os_params::cinder_db_user, $cinder_db_password = $os_params::cinder_db_password, diff --git a/manifests/volume/controller.pp b/manifests/volume/controller.pp index 0cdb7038..3e78eba3 100644 --- a/manifests/volume/controller.pp +++ b/manifests/volume/controller.pp @@ -16,7 +16,7 @@ # Volume controller # -class privatecloud::volume::controller( +class cloud::volume::controller( $ks_cinder_internal_port = $os_params::ks_cinder_internal_port, $ks_cinder_password = $os_params::ks_cinder_password, $ks_keystone_internal_host = $os_params::ks_keystone_internal_host, @@ -26,7 +26,7 @@ class privatecloud::volume::controller( $backup_ceph_user = 'cinder' ) { - include 'privatecloud::volume' + include 'cloud::volume' class { 'cinder::scheduler': } diff --git a/manifests/volume/storage.pp b/manifests/volume/storage.pp index 13f955bb..9ecf6c46 100644 --- a/manifests/volume/storage.pp +++ b/manifests/volume/storage.pp @@ -16,14 +16,14 @@ # Volume storage # -class privatecloud::volume::storage( +class cloud::volume::storage( $glance_api_version = $os_params::glance_api_version, $cinder_rbd_pool = 'ceph_cinder', $cinder_rbd_user = 'cinder', $cinder_rbd_secret_uuid = $os_params::cinder_rbd_secret_uuid, ) { - include 'privatecloud::volume' + include 'cloud::volume' class { 'cinder::volume::rbd': rbd_pool => $cinder_rbd_pool, diff --git a/spec/classes/privatecloud_cache_spec.rb b/spec/classes/privatecloud_cache_spec.rb index a7db311f..54daab28 100644 --- a/spec/classes/privatecloud_cache_spec.rb +++ b/spec/classes/privatecloud_cache_spec.rb @@ -13,12 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. # -# Unit tests for privatecloud::cache +# Unit tests for cloud::cache # require 'spec_helper' -describe 'privatecloud::cache' do +describe 'cloud::cache' do shared_examples_for 'cache server' do diff --git a/spec/classes/privatecloud_compute_controller_spec.rb b/spec/classes/privatecloud_compute_controller_spec.rb index 5d4a5fed..3afc3560 100644 --- a/spec/classes/privatecloud_compute_controller_spec.rb +++ b/spec/classes/privatecloud_compute_controller_spec.rb @@ -13,17 +13,17 @@ # License for the specific language governing permissions and limitations # under the License. # -# Unit tests for privatecloud::compute::controller class +# Unit tests for cloud::compute::controller class # require 'spec_helper' -describe 'privatecloud::compute::controller' do +describe 'cloud::compute::controller' do shared_examples_for 'openstack compute controller' do let :pre_condition do - "class { 'privatecloud::compute': + "class { 'cloud::compute': nova_db_host => '10.0.0.1', nova_db_user => 'nova', nova_db_password => 'secrete', diff --git a/spec/classes/privatecloud_compute_hypervisor_spec.rb b/spec/classes/privatecloud_compute_hypervisor_spec.rb index 38a59788..92cd8e2c 100644 --- a/spec/classes/privatecloud_compute_hypervisor_spec.rb +++ b/spec/classes/privatecloud_compute_hypervisor_spec.rb @@ -13,17 +13,17 @@ # License for the specific language governing permissions and limitations # under the License. # -# Unit tests for privatecloud::compute::hypervisor class +# Unit tests for cloud::compute::hypervisor class # require 'spec_helper' -describe 'privatecloud::compute::hypervisor' do +describe 'cloud::compute::hypervisor' do shared_examples_for 'openstack compute hypervisor' do let :pre_condition do - "class { 'privatecloud::compute': + "class { 'cloud::compute': nova_db_host => '10.0.0.1', nova_db_user => 'nova', nova_db_password => 'secrete', diff --git a/spec/classes/privatecloud_dashboard_spec.rb b/spec/classes/privatecloud_dashboard_spec.rb index 806cf52b..ef90b8f6 100644 --- a/spec/classes/privatecloud_dashboard_spec.rb +++ b/spec/classes/privatecloud_dashboard_spec.rb @@ -13,12 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. # -# Unit tests for privatecloud::dashboard class +# Unit tests for cloud::dashboard class # require 'spec_helper' -describe 'privatecloud::dashboard' do +describe 'cloud::dashboard' do shared_examples_for 'openstack dashboard' do diff --git a/spec/classes/privatecloud_database_nosql_spec.rb b/spec/classes/privatecloud_database_nosql_spec.rb index 1ed6052a..b29432cc 100644 --- a/spec/classes/privatecloud_database_nosql_spec.rb +++ b/spec/classes/privatecloud_database_nosql_spec.rb @@ -13,12 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. # -# Unit tests for privatecloud::database:nosql class +# Unit tests for cloud::database:nosql class # require 'spec_helper' -describe 'privatecloud::database::nosql' do +describe 'cloud::database::nosql' do shared_examples_for 'openstack database nosql' do diff --git a/spec/classes/privatecloud_database_sql_spec.rb b/spec/classes/privatecloud_database_sql_spec.rb index 3b8d38dc..3ca760d6 100644 --- a/spec/classes/privatecloud_database_sql_spec.rb +++ b/spec/classes/privatecloud_database_sql_spec.rb @@ -13,12 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. # -# Unit tests for privatecloud::database::sql class +# Unit tests for cloud::database::sql class # require 'spec_helper' -describe 'privatecloud::database::sql' do +describe 'cloud::database::sql' do shared_examples_for 'openstack database sql' do diff --git a/spec/classes/privatecloud_identity_spec.rb b/spec/classes/privatecloud_identity_spec.rb index 3cc5f101..ca4495c3 100644 --- a/spec/classes/privatecloud_identity_spec.rb +++ b/spec/classes/privatecloud_identity_spec.rb @@ -13,12 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. # -# Unit tests for privatecloud::identity class +# Unit tests for cloud::identity class # require 'spec_helper' -describe 'privatecloud::identity' do +describe 'cloud::identity' do shared_examples_for 'openstack identity' do diff --git a/spec/classes/privatecloud_image_spec.rb b/spec/classes/privatecloud_image_spec.rb index a3d5e084..61ca874d 100644 --- a/spec/classes/privatecloud_image_spec.rb +++ b/spec/classes/privatecloud_image_spec.rb @@ -13,12 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. # -# Unit tests for privatecloud::image class +# Unit tests for cloud::image class # require 'spec_helper' -describe 'privatecloud::image' do +describe 'cloud::image' do shared_examples_for 'openstack image' do diff --git a/spec/classes/privatecloud_init_spec.rb b/spec/classes/privatecloud_init_spec.rb index 9853ba25..5b3f359b 100644 --- a/spec/classes/privatecloud_init_spec.rb +++ b/spec/classes/privatecloud_init_spec.rb @@ -13,12 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. # -# Unit tests for privatecloud +# Unit tests for cloud # require 'spec_helper' -describe 'privatecloud' do +describe 'cloud' do shared_examples_for 'private cloud node' do diff --git a/spec/classes/privatecloud_loadbalancer_spec.rb b/spec/classes/privatecloud_loadbalancer_spec.rb index 6a2ea106..f8a17255 100644 --- a/spec/classes/privatecloud_loadbalancer_spec.rb +++ b/spec/classes/privatecloud_loadbalancer_spec.rb @@ -13,12 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. # -# Unit tests for privatecloud::loadbalancer class +# Unit tests for cloud::loadbalancer class # require 'spec_helper' -describe 'privatecloud::loadbalancer' do +describe 'cloud::loadbalancer' do shared_examples_for 'openstack loadbalancer' do diff --git a/spec/classes/privatecloud_messaging_spec.rb b/spec/classes/privatecloud_messaging_spec.rb index 231b2d2c..e6ddef9e 100644 --- a/spec/classes/privatecloud_messaging_spec.rb +++ b/spec/classes/privatecloud_messaging_spec.rb @@ -13,12 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. # -# Unit tests for privatecloud::messaging class +# Unit tests for cloud::messaging class # require 'spec_helper' -describe 'privatecloud::messaging' do +describe 'cloud::messaging' do shared_examples_for 'openstack messaging' do diff --git a/spec/classes/privatecloud_network_compute_spec.rb b/spec/classes/privatecloud_network_compute_spec.rb index 69ab54a1..fd3c594b 100644 --- a/spec/classes/privatecloud_network_compute_spec.rb +++ b/spec/classes/privatecloud_network_compute_spec.rb @@ -13,17 +13,17 @@ # License for the specific language governing permissions and limitations # under the License. # -# Unit tests for privatecloud::network::compute class +# Unit tests for cloud::network::compute class # require 'spec_helper' -describe 'privatecloud::network::compute' do +describe 'cloud::network::compute' do shared_examples_for 'openstack network compute' do let :pre_condition do - "class { 'privatecloud::network': + "class { 'cloud::network': rabbit_hosts => ['10.0.0.1'], rabbit_password => 'secrete', tunnel_eth => '10.0.1.1', diff --git a/spec/classes/privatecloud_network_controller_spec.rb b/spec/classes/privatecloud_network_controller_spec.rb index b7772d4e..1929ff8c 100644 --- a/spec/classes/privatecloud_network_controller_spec.rb +++ b/spec/classes/privatecloud_network_controller_spec.rb @@ -13,17 +13,17 @@ # License for the specific language governing permissions and limitations # under the License. # -# Unit tests for privatecloud::network::controller class +# Unit tests for cloud::network::controller class # require 'spec_helper' -describe 'privatecloud::network::controller' do +describe 'cloud::network::controller' do shared_examples_for 'openstack network controller' do let :pre_condition do - "class { 'privatecloud::network': + "class { 'cloud::network': rabbit_hosts => ['10.0.0.1'], rabbit_password => 'secrete', tunnel_eth => '10.0.1.1', diff --git a/spec/classes/privatecloud_network_dhcp_spec.rb b/spec/classes/privatecloud_network_dhcp_spec.rb index e7df8f7f..584c48c1 100644 --- a/spec/classes/privatecloud_network_dhcp_spec.rb +++ b/spec/classes/privatecloud_network_dhcp_spec.rb @@ -13,17 +13,17 @@ # License for the specific language governing permissions and limitations # under the License. # -# Unit tests for privatecloud::network::dhcp class +# Unit tests for cloud::network::dhcp class # require 'spec_helper' -describe 'privatecloud::network::dhcp' do +describe 'cloud::network::dhcp' do shared_examples_for 'openstack network dhcp' do let :pre_condition do - "class { 'privatecloud::network': + "class { 'cloud::network': rabbit_hosts => ['10.0.0.1'], rabbit_password => 'secrete', tunnel_eth => '10.0.1.1', diff --git a/spec/classes/privatecloud_network_l3_spec.rb b/spec/classes/privatecloud_network_l3_spec.rb index a8b90b19..60dd798a 100644 --- a/spec/classes/privatecloud_network_l3_spec.rb +++ b/spec/classes/privatecloud_network_l3_spec.rb @@ -13,17 +13,17 @@ # License for the specific language governing permissions and limitations # under the License. # -# Unit tests for privatecloud::network::l3 class +# Unit tests for cloud::network::l3 class # require 'spec_helper' -describe 'privatecloud::network::l3' do +describe 'cloud::network::l3' do shared_examples_for 'openstack network l3' do let :pre_condition do - "class { 'privatecloud::network': + "class { 'cloud::network': rabbit_hosts => ['10.0.0.1'], rabbit_password => 'secrete', tunnel_eth => '10.0.1.1', diff --git a/spec/classes/privatecloud_network_lbaas_spec.rb b/spec/classes/privatecloud_network_lbaas_spec.rb index 59a9f9c2..3193a8b5 100644 --- a/spec/classes/privatecloud_network_lbaas_spec.rb +++ b/spec/classes/privatecloud_network_lbaas_spec.rb @@ -13,17 +13,17 @@ # License for the specific language governing permissions and limitations # under the License. # -# Unit tests for privatecloud::network::lbaas class +# Unit tests for cloud::network::lbaas class # require 'spec_helper' -describe 'privatecloud::network::lbaas' do +describe 'cloud::network::lbaas' do shared_examples_for 'openstack network lbaas' do let :pre_condition do - "class { 'privatecloud::network': + "class { 'cloud::network': rabbit_hosts => ['10.0.0.1'], rabbit_password => 'secrete', tunnel_eth => '10.0.1.1', diff --git a/spec/classes/privatecloud_network_metadata_spec.rb b/spec/classes/privatecloud_network_metadata_spec.rb index b641fbe5..bd1fd38c 100644 --- a/spec/classes/privatecloud_network_metadata_spec.rb +++ b/spec/classes/privatecloud_network_metadata_spec.rb @@ -13,17 +13,17 @@ # License for the specific language governing permissions and limitations # under the License. # -# Unit tests for privatecloud::network::metadata class +# Unit tests for cloud::network::metadata class # require 'spec_helper' -describe 'privatecloud::network::metadata' do +describe 'cloud::network::metadata' do shared_examples_for 'openstack network metadata' do let :pre_condition do - "class { 'privatecloud::network': + "class { 'cloud::network': rabbit_hosts => ['10.0.0.1'], rabbit_password => 'secrete', tunnel_eth => '10.0.1.1', diff --git a/spec/classes/privatecloud_network_vpn_spec.rb b/spec/classes/privatecloud_network_vpn_spec.rb index 76f4bb10..f54f61e6 100644 --- a/spec/classes/privatecloud_network_vpn_spec.rb +++ b/spec/classes/privatecloud_network_vpn_spec.rb @@ -13,17 +13,17 @@ # License for the specific language governing permissions and limitations # under the License. # -# Unit tests for privatecloud::network::vpnaas class +# Unit tests for cloud::network::vpnaas class # require 'spec_helper' -describe 'privatecloud::network::vpn' do +describe 'cloud::network::vpn' do shared_examples_for 'openstack network vpnaas' do let :pre_condition do - "class { 'privatecloud::network': + "class { 'cloud::network': rabbit_hosts => ['10.0.0.1'], rabbit_password => 'secrete', tunnel_eth => '10.0.1.1', diff --git a/spec/classes/privatecloud_orchestration_api_spec.rb b/spec/classes/privatecloud_orchestration_api_spec.rb index a8ba041f..e4cc23fe 100644 --- a/spec/classes/privatecloud_orchestration_api_spec.rb +++ b/spec/classes/privatecloud_orchestration_api_spec.rb @@ -13,17 +13,17 @@ # License for the specific language governing permissions and limitations # under the License. # -# Unit tests for privatecloud::orchestration::api class +# Unit tests for cloud::orchestration::api class # require 'spec_helper' -describe 'privatecloud::orchestration::api' do +describe 'cloud::orchestration::api' do shared_examples_for 'openstack orchestration api' do let :pre_condition do - "class { 'privatecloud::orchestration': + "class { 'cloud::orchestration': rabbit_hosts => ['10.0.0.1'], rabbit_password => 'secrete', ks_keystone_internal_host => '10.0.0.1', diff --git a/spec/classes/privatecloud_orchestration_engine_spec.rb b/spec/classes/privatecloud_orchestration_engine_spec.rb index 3a23b83c..cf6494d6 100644 --- a/spec/classes/privatecloud_orchestration_engine_spec.rb +++ b/spec/classes/privatecloud_orchestration_engine_spec.rb @@ -13,17 +13,17 @@ # License for the specific language governing permissions and limitations # under the License. # -# Unit tests for privatecloud::orchestration::engine class +# Unit tests for cloud::orchestration::engine class # require 'spec_helper' -describe 'privatecloud::orchestration::engine' do +describe 'cloud::orchestration::engine' do shared_examples_for 'openstack orchestration engine' do let :pre_condition do - "class { 'privatecloud::orchestration': + "class { 'cloud::orchestration': rabbit_hosts => ['10.0.0.1'], rabbit_password => 'secrete', ks_keystone_internal_host => '10.0.0.1', diff --git a/spec/classes/privatecloud_telemetry_centralagent_spec.rb b/spec/classes/privatecloud_telemetry_centralagent_spec.rb index d67ea483..c5475f7c 100644 --- a/spec/classes/privatecloud_telemetry_centralagent_spec.rb +++ b/spec/classes/privatecloud_telemetry_centralagent_spec.rb @@ -13,17 +13,17 @@ # License for the specific language governing permissions and limitations # under the License. # -# Unit tests for privatecloud::telemetry::server class +# Unit tests for cloud::telemetry::server class # require 'spec_helper' -describe 'privatecloud::telemetry::centralagent' do +describe 'cloud::telemetry::centralagent' do shared_examples_for 'openstack telemetry central agent' do let :pre_condition do - "class { 'privatecloud::telemetry': + "class { 'cloud::telemetry': ceilometer_secret => 'secrete', rabbit_hosts => ['10.0.0.1'], rabbit_password => 'secrete', diff --git a/spec/classes/privatecloud_telemetry_server_spec.rb b/spec/classes/privatecloud_telemetry_server_spec.rb index 9d7093fd..25ead407 100644 --- a/spec/classes/privatecloud_telemetry_server_spec.rb +++ b/spec/classes/privatecloud_telemetry_server_spec.rb @@ -13,17 +13,17 @@ # License for the specific language governing permissions and limitations # under the License. # -# Unit tests for privatecloud::telemetry::server class +# Unit tests for cloud::telemetry::server class # require 'spec_helper' -describe 'privatecloud::telemetry::server' do +describe 'cloud::telemetry::server' do shared_examples_for 'openstack telemetry server' do let :pre_condition do - "class { 'privatecloud::telemetry': + "class { 'cloud::telemetry': ceilometer_secret => 'secrete', rabbit_hosts => ['10.0.0.1'], rabbit_password => 'secrete', diff --git a/spec/classes/privatecloud_volume_controller_spec.rb b/spec/classes/privatecloud_volume_controller_spec.rb index 7b94a0d4..741eadb1 100644 --- a/spec/classes/privatecloud_volume_controller_spec.rb +++ b/spec/classes/privatecloud_volume_controller_spec.rb @@ -13,17 +13,17 @@ # License for the specific language governing permissions and limitations # under the License. # -# Unit tests for privatecloud::volume::controller class +# Unit tests for cloud::volume::controller class # require 'spec_helper' -describe 'privatecloud::volume::controller' do +describe 'cloud::volume::controller' do shared_examples_for 'openstack volume controller' do let :pre_condition do - "class { 'privatecloud::volume': + "class { 'cloud::volume': cinder_db_host => '10.0.0.1', cinder_db_user => 'cinder', cinder_db_password => 'secrete', diff --git a/spec/classes/privatecloud_volume_storage_spec.rb b/spec/classes/privatecloud_volume_storage_spec.rb index 29ea60a4..f93813c5 100644 --- a/spec/classes/privatecloud_volume_storage_spec.rb +++ b/spec/classes/privatecloud_volume_storage_spec.rb @@ -13,17 +13,17 @@ # License for the specific language governing permissions and limitations # under the License. # -# Unit tests for privatecloud::volume::storage class +# Unit tests for cloud::volume::storage class # require 'spec_helper' -describe 'privatecloud::volume::storage' do +describe 'cloud::volume::storage' do shared_examples_for 'openstack volume storage' do let :pre_condition do - "class { 'privatecloud::volume': + "class { 'cloud::volume': cinder_db_host => '10.0.0.1', cinder_db_user => 'cinder', cinder_db_password => 'secrete', diff --git a/templates/database/mysql.conf.erb b/templates/database/mysql.conf.erb index 5b995af5..96c47ac0 100644 --- a/templates/database/mysql.conf.erb +++ b/templates/database/mysql.conf.erb @@ -1,5 +1,5 @@ # MANAGED BY PUPPET -# Module:: privatecloud::database::sql +# Module:: cloud::database::sql # [mysqld] max_connections = 1000