Skip to content

Commit

Permalink
Closes-Bug: #1523641 - SM-QUENCH : Deleting commented code in puppet …
Browse files Browse the repository at this point in the history 
…manifests

Lot of puppet manifests have commented out code that it still in the file
Removing them to make the code more readable

Change-Id: I2ff2cf65ef157cc54c6c6068ee4f5a08516879a8
  • Loading branch information
nitishkrishna committed Dec 8, 2015
1 parent e295c81 commit 0858a61
Show file tree
Hide file tree
Showing 13 changed files with 0 additions and 86 deletions.
12 changes: 0 additions & 12 deletions contrail/environment/modules/contrail/manifests/common.pp
View file
Expand Up @@ -55,18 +55,6 @@

create_resources(group, $contrail_group_details)
create_resources(user, $contrail_users_details)
#Group <| |> -> User<| |>
#$contrail_users_details = {
#'nova' => { user_uid => '499', user_group_name => 'nova', group_gid => '499', user_home_dir => '/var/lib/nova' },
#'libvirt-qemu' => { user_uid => '498', user_group_name => 'kvm' , group_gid => '498', user_home_dir => '/var/lib/libvirt'},
#'libvirt-dnsmasq' => { user_uid => '497', user_group_name => 'libvirtd' , group_gid => '497', user_home_dir => '/var/lib/libvirt/dnsmasq'},
#}
#create_resources(contrail::lib::setup_uid, $contrail_users_details,
#{
#contrail_logoutput => $contrail_logoutput
#}
#)
#->
contrail::lib::contrail_upgrade{ 'contrail_upgrade':
contrail_upgrade => $contrail_upgrade,
contrail_logoutput => $contrail_logoutput
Expand Down
5 changes: 0 additions & 5 deletions contrail/environment/modules/contrail/manifests/contrail_openstack.pp
View file
Expand Up @@ -126,16 +126,11 @@
logoutput => $contrail_logoutput
}
$nova_params = {
#'DEFAULT/novncproxy_port' => { value => $novncproxy_port },
'DEFAULT/novncproxy_base_url' => { value => "http://${vnc_base_url_ip}:${novncproxy_port}/vnc_auto.html"},
#'DEFAULT/novncproxy_host' => { value => $vnc_proxy_host },
#'DEFAULT/service_neutron_metadata_proxy' => { value => 'True' },
'DEFAULT/ec2_private_dns_show_ip' => { value => 'False' },
}
create_resources(nova_config,$nova_params, {} )

#glance_api_config { 'DEFAULT/registry_host': value => '0.0.0.0' }

# Disable mpm_event apache module
exec { "exec_disable_mpm_event":
command => "a2dismod mpm_event && service apache2 restart && echo exec_disable_mpm_event>> /etc/contrail/contrail_openstack_exec.out",
Expand Down
17 changes: 0 additions & 17 deletions contrail/environment/modules/contrail/manifests/lib/contrail_setup_repo.pp
View file
Expand Up @@ -20,22 +20,5 @@
priority => '999',
codename => 'contrail'
}

#$pattern1 = "deb http:\/\/$contrail_repo_ip:9003\/contrail\/repo\/$contrail_repo_name contrail main"
#$pattern2 = "deb http://$contrail_repo_ip:9003/contrail/repo/$contrail_repo_name contrail main"
#$repo_cfg_file = "/etc/apt/sources.list"
#file { "/etc/apt/preferences.d/contrail_repo_preferences":
#ensure => present,
#mode => 0755,
#owner => root,
#group => root,
#source => "puppet:///modules/$module_name/contrail_repo_preferences"
#} ->
#exec { "update-sources-list-$contrail_repo_name" :
#command => "sed -i \"/$pattern1/d\" $repo_cfg_file && echo \"$pattern2\"|cat - $repo_cfg_file > /tmp/out && mv /tmp/out $repo_cfg_file && apt-get update",
#unless => "head -1 $repo_cfg_file | grep -qx \"$pattern2\"",
#provider => shell,
#logoutput => $contrail_logoutput
#}
}
}
19 changes: 0 additions & 19 deletions contrail/environment/modules/contrail/manifests/lib/upgrade_kernel.pp
View file
Expand Up @@ -13,31 +13,12 @@
package { 'apparmor' : ensure => '2.7.102-0ubuntu3.10', notify => Reboot["after"], }
}

/*
if ($contrail_kernel_version != "" ) {
$contrail_dist_kernel_version = $contrail_kernel_version
} else {
if ($lsbdistrelease == "14.04") {
$contrail_dist_kernel_version = "3.13.0-40"
} else {
$contrail_dist_kernel_version = "3.13.0-34"
package { 'apparmor' : ensure => '2.7.102-0ubuntu3.10', notify => Reboot["after"], }
}
}
*/
$headers = "linux-headers-${contrail_kernel_version_to_upgrade}"
$headers_generic = "linux-headers-${contrail_kernel_version_to_upgrade}-generic"
$image = "linux-image-${contrail_kernel_version_to_upgrade}-generic"
$image_extra = "linux-image-extra-${contrail_kernel_version_to_upgrade}-generic"

package { [$headers, $headers_generic, $image, $image_extra] : ensure => present }
#->
#package { $headers_generic : ensure => present, notify => Reboot["after"], }
#->
#package { $image : ensure => present, notify => Reboot["after"], }
#->
#package { $image_extra : ensure => present, notify => Reboot["after"], }
->
notify { "Before reboot":; }
->
Expand Down
1 change: 0 additions & 1 deletion contrail/environment/modules/contrail/manifests/profile/neutron/server.pp
View file
@@ -1,6 +1,5 @@
# The profile to set up the neutron server
class openstack::profile::contrail::neutron::server {
# require ::openstack::profile::contrail::config

openstack::resources::controller { 'neutron': }
openstack::resources::database { 'neutron': }
Expand Down
1 change: 0 additions & 1 deletion contrail/environment/modules/contrail/manifests/profile/nova/compute.pp
View file
@@ -1,6 +1,5 @@
# The puppet module to set up a Nova Compute node
class contrail::profile::nova::compute {
#include ::openstack::common::neutron

$controller_management_address = hiera(openstack::controller::address::management)
notify { "contrail::profile::nova::compute - controller_management_address = ${controller_management_address}":; }
Expand Down
7 changes: 0 additions & 7 deletions contrail/environment/modules/contrail/manifests/profile/openstack/mysql.pp
View file
Expand Up @@ -37,13 +37,6 @@
ruby_enable => true,
}

# This class requires Service['mysqld']
#include contrail::ha_config
# class {'::contrail::ha_config':
# require => Service['mysqld']
# }

Service['mysqld'] -> Anchor['database-service']

# class { 'mysql::server::account_security': }
}
1 change: 0 additions & 1 deletion contrail/environment/modules/openstack/manifests/common/cinder.pp
View file
Expand Up @@ -27,7 +27,6 @@
}

cinder_config {
# 'database/idle_timeout': value => "180";
'database/min_pool_size': value => "100";
'database/max_pool_size': value => "700";
'database/max_overflow': value => "1080";
Expand Down
2 changes: 0 additions & 2 deletions contrail/environment/modules/openstack/manifests/common/glance.pp
View file
Expand Up @@ -29,7 +29,6 @@
}

glance_api_config {
# 'database/idle_timeout': value => "180";
'database/min_pool_size': value => "100";
'database/max_pool_size': value => "700";
'database/max_overflow': value => "1080";
Expand All @@ -42,7 +41,6 @@
}

glance_registry_config {
# 'database/idle_timeout': value => "180";
'database/min_pool_size': value => "100";
'database/max_pool_size': value => "700";
'database/max_overflow': value => "1080";
Expand Down
4 changes: 0 additions & 4 deletions contrail/environment/modules/openstack/manifests/common/keystone.pp
View file
Expand Up @@ -24,7 +24,6 @@
rabbit_host => $contrail_rabbit_host,
}
keystone_config {
# 'database/idle_timeout': value => "180";
'database/min_pool_size': value => "100";
'database/max_pool_size': value => "700";
'database/max_overflow': value => "100";
Expand All @@ -34,9 +33,6 @@
'database/db_retry_interval': value => "1";
'database/connection_debug': value => "10";
'database/pool_timeout': value => "120";
# 'sql/connection': value => $database_connection_real, secret => true;
# 'database/idle_timeout': value => $database_idle_timeout_real;
# 'sql/idle_timeout': value => $database_idle_timeout_real;
}

} else {
Expand Down
11 changes: 0 additions & 11 deletions contrail/environment/modules/openstack/manifests/common/nova.pp
View file
Expand Up @@ -132,23 +132,12 @@
class { [
'nova::scheduler',
'nova::objectstore',
# 'nova::cert',
'nova::consoleauth',
'nova::conductor'
]:
enabled => $is_controller,
}

# nova-compute is managed by contrail,is_compute flag only disables the service,
# It still declares the nova-compute service,leading to 1435692.
/*
class { '::nova::compute':
enabled => $is_compute,
vnc_enabled => true,
vncserver_proxyclient_address => $management_address,
vncproxy_host => $::openstack::config::controller_address_api,
}
*/

class { '::nova::compute::neutron':
libvirt_vif_driver => "nova_contrail_vif.contrailvif.VRouterVIFDriver"
Expand Down
1 change: 0 additions & 1 deletion contrail/environment/modules/openstack/manifests/profile/memcache.pp
View file
@@ -1,7 +1,6 @@
# The profile to install a local instance of memcache
class openstack::profile::memcache {
class { 'memcached':
# listen_ip => $::openstack::config::controller_address_management, #'127.0.0.1',
tcp_port => '11211',
udp_port => '11211',
}
Expand Down
5 changes: 0 additions & 5 deletions contrail/environment/modules/openstack/manifests/profile/provision.pp
View file
Expand Up @@ -52,11 +52,6 @@
internal_address => $contrail_controller_address_management,
region => $::openstack::config::region,
}
# class { '::ceilometer::agent::auth':
# auth_url => "http://${controller_management_address}:5000/v2.0",
# auth_password => $::openstack::config::ceilometer_password,
# auth_region => $::openstack::config::region,
# }
create_resources('openstack::resources::tenant', $tenants)
create_resources('openstack::resources::user', $users)
}

0 comments on commit 0858a61

Please sign in to comment.