From 0858a616843f392355d461e46c63b98f4e95dc12 Mon Sep 17 00:00:00 2001 From: nitishkrishna Date: Mon, 7 Dec 2015 17:13:33 -0800 Subject: [PATCH] Closes-Bug: #1523641 - SM-QUENCH : Deleting commented code in puppet 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 --- .../modules/contrail/manifests/common.pp | 12 ------------ .../contrail/manifests/contrail_openstack.pp | 5 ----- .../manifests/lib/contrail_setup_repo.pp | 17 ----------------- .../contrail/manifests/lib/upgrade_kernel.pp | 19 ------------------- .../manifests/profile/neutron/server.pp | 1 - .../manifests/profile/nova/compute.pp | 1 - .../manifests/profile/openstack/mysql.pp | 7 ------- .../openstack/manifests/common/cinder.pp | 1 - .../openstack/manifests/common/glance.pp | 2 -- .../openstack/manifests/common/keystone.pp | 4 ---- .../openstack/manifests/common/nova.pp | 11 ----------- .../openstack/manifests/profile/memcache.pp | 1 - .../openstack/manifests/profile/provision.pp | 5 ----- 13 files changed, 86 deletions(-) diff --git a/contrail/environment/modules/contrail/manifests/common.pp b/contrail/environment/modules/contrail/manifests/common.pp index 5ea1b45e..8f4d5f89 100644 --- a/contrail/environment/modules/contrail/manifests/common.pp +++ b/contrail/environment/modules/contrail/manifests/common.pp @@ -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 diff --git a/contrail/environment/modules/contrail/manifests/contrail_openstack.pp b/contrail/environment/modules/contrail/manifests/contrail_openstack.pp index 7ec9012e..7ecb324b 100644 --- a/contrail/environment/modules/contrail/manifests/contrail_openstack.pp +++ b/contrail/environment/modules/contrail/manifests/contrail_openstack.pp @@ -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", diff --git a/contrail/environment/modules/contrail/manifests/lib/contrail_setup_repo.pp b/contrail/environment/modules/contrail/manifests/lib/contrail_setup_repo.pp index a58c8b98..b624381d 100644 --- a/contrail/environment/modules/contrail/manifests/lib/contrail_setup_repo.pp +++ b/contrail/environment/modules/contrail/manifests/lib/contrail_setup_repo.pp @@ -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 - #} } } diff --git a/contrail/environment/modules/contrail/manifests/lib/upgrade_kernel.pp b/contrail/environment/modules/contrail/manifests/lib/upgrade_kernel.pp index fb5bab9a..3292778c 100644 --- a/contrail/environment/modules/contrail/manifests/lib/upgrade_kernel.pp +++ b/contrail/environment/modules/contrail/manifests/lib/upgrade_kernel.pp @@ -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":; } -> diff --git a/contrail/environment/modules/contrail/manifests/profile/neutron/server.pp b/contrail/environment/modules/contrail/manifests/profile/neutron/server.pp index cfb87aad..8b923c38 100644 --- a/contrail/environment/modules/contrail/manifests/profile/neutron/server.pp +++ b/contrail/environment/modules/contrail/manifests/profile/neutron/server.pp @@ -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': } diff --git a/contrail/environment/modules/contrail/manifests/profile/nova/compute.pp b/contrail/environment/modules/contrail/manifests/profile/nova/compute.pp index fe426de1..1527a1a2 100644 --- a/contrail/environment/modules/contrail/manifests/profile/nova/compute.pp +++ b/contrail/environment/modules/contrail/manifests/profile/nova/compute.pp @@ -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}":; } diff --git a/contrail/environment/modules/contrail/manifests/profile/openstack/mysql.pp b/contrail/environment/modules/contrail/manifests/profile/openstack/mysql.pp index 4df284c4..ad8a9de9 100644 --- a/contrail/environment/modules/contrail/manifests/profile/openstack/mysql.pp +++ b/contrail/environment/modules/contrail/manifests/profile/openstack/mysql.pp @@ -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': } } diff --git a/contrail/environment/modules/openstack/manifests/common/cinder.pp b/contrail/environment/modules/openstack/manifests/common/cinder.pp index 065d739a..c4dc427a 100644 --- a/contrail/environment/modules/openstack/manifests/common/cinder.pp +++ b/contrail/environment/modules/openstack/manifests/common/cinder.pp @@ -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"; diff --git a/contrail/environment/modules/openstack/manifests/common/glance.pp b/contrail/environment/modules/openstack/manifests/common/glance.pp index 1eec88d3..aa3ee1be 100644 --- a/contrail/environment/modules/openstack/manifests/common/glance.pp +++ b/contrail/environment/modules/openstack/manifests/common/glance.pp @@ -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"; @@ -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"; diff --git a/contrail/environment/modules/openstack/manifests/common/keystone.pp b/contrail/environment/modules/openstack/manifests/common/keystone.pp index 445fd068..f5d77e47 100644 --- a/contrail/environment/modules/openstack/manifests/common/keystone.pp +++ b/contrail/environment/modules/openstack/manifests/common/keystone.pp @@ -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"; @@ -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 { diff --git a/contrail/environment/modules/openstack/manifests/common/nova.pp b/contrail/environment/modules/openstack/manifests/common/nova.pp index 6dae1a84..2d29f00d 100644 --- a/contrail/environment/modules/openstack/manifests/common/nova.pp +++ b/contrail/environment/modules/openstack/manifests/common/nova.pp @@ -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" diff --git a/contrail/environment/modules/openstack/manifests/profile/memcache.pp b/contrail/environment/modules/openstack/manifests/profile/memcache.pp index 179b2141..d6ca2831 100644 --- a/contrail/environment/modules/openstack/manifests/profile/memcache.pp +++ b/contrail/environment/modules/openstack/manifests/profile/memcache.pp @@ -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', } diff --git a/contrail/environment/modules/openstack/manifests/profile/provision.pp b/contrail/environment/modules/openstack/manifests/profile/provision.pp index 0dd1e056..a7cdb621 100644 --- a/contrail/environment/modules/openstack/manifests/profile/provision.pp +++ b/contrail/environment/modules/openstack/manifests/profile/provision.pp @@ -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) }