Merge "SM-QUENCH: removed old unused code/files"

contrail/environment/modules/contrail/manifests/control/config.pp

@@ -11,24 +11,16 @@
     # Main class code begins here
     case $::operatingsystem {
         Ubuntu: {
-            #file { ['/etc/init/supervisor-control.override',
-                    #'/etc/init/supervisor-dns.override'] :
-                #ensure  => absent,
-            #}
-            #->
             # Below is temporary to work-around in Ubuntu as Service resource fails
             # as upstart is not correctly linked to /etc/init.d/service-name
             file { ['/etc/init.d/supervisor-control',
                    '/etc/init.d/supervisor-dns']:
                 ensure => link,
                 target => '/lib/init/upstart-job',
             }
-            #->
-            #File['/etc/contrail/contrail-dns.conf']
-        }
-        default: {
         }
     }
+
     if $use_certs == true {
       if $puppet_server == "" {
         $certs_store = '/etc/contrail/ssl'

contrail/environment/modules/contrail/manifests/haproxy/config.pp

@@ -11,37 +11,18 @@
     $contrail_logoutput = $::contrail::params::contrail_logoutput,
     $tor_ha_proxy_config = $::contrail::params::tor_ha_config
 ) {
-    notify {"Haproxy - tor_ha_config => ${tor_ha_proxy_config}":;}
-    # Debug - Print all variables
-    notify { "Haproxy - config_ip_list = ${config_ip_list}":; }
-    notify { "Haproxy - config_name_list = ${config_name_list}":;}
-    notify { "Haproxy - openstack_ip_list = ${openstack_ip_list}":; }
-    notify { "Haproxy - openstack_name_list = ${openstack_name_list}":;}
-    notify { "Haproxy - collector_ip_list = ${collector_ip_list}":; }
-    notify { "Haproxy - collector_name_list = ${collector_name_list}":;}
-    notify { "Haproxy - internal_vip = ${internal_vip}":; }
-    notify { "Haproxy - contrail_internal_vip = ${contrail_internal_vip}":;}
-    notify { "Haproxy - host_ip = ${host_ip}":;}
-    $manage_amqp = 'no'
 
-    if ($internal_vip == undef or $internal_vip == '') {
-        $ha_internal_vip = 'none'
-    } else {
-        $ha_internal_vip = $internal_vip
-    }
-    if ($contrail_internal_vip == undef or $contrail_internal_vip == '') {
-        $ha_contrail_internal_vip = 'none'
-    } else {
-        $ha_contrail_internal_vip = $contrail_internal_vip
-    }
+    $ha_internal_vip = pick($internal_vip, 'none')
+    $ha_contrail_internal_vip = pick($contrail_internal_vip, 'none')
+
+    $openstack_ip_list_shell   = join($openstack_ip_list, ",")
+    $openstack_name_list_shell = join($openstack_name_list, ",")
 
-    $openstack_ip_list_shell = inline_template('<%= @openstack_ip_list.map{ |name2| "#{name2}" }.join(",") %>')
-    $config_ip_list_shell = inline_template('<%= @config_ip_list.map{ |name2| "#{name2}" }.join(",") %>')
-    $collector_ip_list_shell = inline_template('<%= @collector_ip_list.map{ |name2| "#{name2}" }.join(",") %>')
+    $config_ip_list_shell   = join($config_ip_list, ",")
+    $config_name_list_shell = join($config_name_list, ",")
 
-    $openstack_name_list_shell = inline_template('<%= @openstack_name_list.map{ |name2| "#{name2}" }.join(",") %>')
-    $config_name_list_shell = inline_template('<%= @config_name_list.map{ |name2| "#{name2}" }.join(",") %>')
-    $collector_name_list_shell = inline_template('<%= @collector_name_list.map{ |name2| "#{name2}" }.join(",") %>')
+    $collector_ip_list_shell   = join($collector_ip_list, ",")
+    $collector_name_list_shell = join($collector_name_list, ",")
 
     $contrail_exec_haproxy_gen = "python /opt/contrail/bin/generate_haproxy.py  && echo generate_ha_config >> /etc/contrail/contrail_openstack_exec.out"
 

contrail/environment/modules/contrail/manifests/webui/config.pp

@@ -1,12 +1,6 @@
 class contrail::webui::config(
-    $config_ip = $::contrail::params::config_ip_list[0],
-    $collector_ip = $::contrail::params::collector_ip_list[0],
-    $openstack_ip = $::contrail::params::openstack_ip_list[0],
     $database_ip_list =  $::contrail::params::database_ip_list,
     $is_storage_master = $::contrail::params::storage_enabled,
-    $keystone_ip = $::contrail::params::keystone_ip,
-    $internal_vip = $::contrail::params::internal_vip,
-    $contrail_internal_vip = $::contrail::params::contrail_internal_vip,
     $redis_password = $::contrail::params::redis_password,
     $contrail_logoutput = $::contrail::params::contrail_logoutput,
     $config_ip_to_use = $::contrail::params::config_ip_to_use,
@@ -15,36 +9,6 @@
     $openstack_ip_to_use = $::contrail::params::openstack_ip_to_use
 ) {
 
-    case $::operatingsystem {
-        Ubuntu: {
-            #file {'/etc/init/supervisor-webui.override':
-                #ensure  => absent,
-            #} ->
-            # Below is temporary to work-around in Ubuntu as Service resource fails
-            # as upstart is not correctly linked to /etc/init.d/service-name
-            #file { '/etc/init.d/supervisor-webui':
-                #ensure => link,
-                #target => '/lib/init/upstart-job',
-            #}
-        }
-        default: {
-        }
-    }
-    # Print all the variables
-    notify { "webui - config_ip = ${config_ip}":;}
-    notify { "webui - config_ip_to_use = ${config_ip_to_use}":;}
-    notify { "webui - collector_ip = ${collector_ip}":;}
-    notify { "webui - collector_ip_to_use = ${collector_ip_to_use}":;}
-    notify { "webui - openstack_ip = ${openstack_ip}":;}
-    notify { "webui - openstack_ip_to_use = ${openstack_ip_to_use}":;}
-    notify { "webui - database_ip_list = ${database_ip_list}":;}
-    notify { "webui - is_storage_master = ${is_storage_master}":;}
-    notify { "webui - keystone_ip = ${keystone_ip}":;}
-    notify { "webui - keystone_ip_to_use = ${keystone_ip_to_use}":;}
-    notify { "webui - internal_vip = ${internal_vip}":;}
-    notify { "webui - contrail_internal_vip = ${contrail_internal_vip}":;}
-    notify { "webui - contrail_internal_vip_to_use = ${contrail_internal_vip_to_use}":;}
-
     if ($is_storage_master) {
         $ensure_storage = 'present'
     } else {

contrail/environment/modules/contrail/templates/generate_haproxy.erb

@@ -506,8 +506,6 @@ def tor_agent_ha_config(tor_details_str):
 
     i = 1
     cfg_str = ""
-    #print "\n\n"
-    #print master_ha_proxy
     for key in master_ha_proxy.keys():
         proxy_name = "contrail-tor-agent-" + str(i)
         i = i +  1
@@ -519,14 +517,10 @@ def generate_collector_ha_config(collector_ip_list, mgmt_host_ip):
     space = ' ' * 3
 
     for server_index, host_ip in enumerate(collector_ip_list):
-#        server_index = env.roledefs['collector'].index(host_string) + 1
-#        mgmt_host_ip = hstr_to_ip(host_string)
-#        host_ip = hstr_to_ip(get_control_host_string(host_string))
         contrail_analytics_api_server_lines +=\
             '%s server %s %s:9081 check inter 2000 rise 2 fall 3\n'\
              % (space, host_ip, host_ip)
 
-#    for host_string in env.roledefs['collector']:
     haproxy_config = collector_ha_template.safe_substitute({
 	'__contrail_analytics_api_backend_servers__' : contrail_analytics_api_server_lines,
 	'__contrail_hap_user__': 'haproxy',
@@ -553,8 +547,6 @@ listen  rabbitmq 0.0.0.0:5673
     timeout server 48h\n"""
     space = ' ' * 3
     for server_index, host_ip in enumerate(config_ip_list):
-#        server_index = env.roledefs['cfgm'].index(host_string) + 1
-#        host_ip = hstr_to_ip(get_control_host_string(host_string))
         q_server_lines = q_server_lines + \
         '    server %s %s:%s check inter 2000 rise 2 fall 3\n' \
                     %(host_ip, host_ip, str(q_listen_port))
@@ -604,9 +596,6 @@ def generate_openstack_ha_config(openstack_ip_list, mgmt_host_ip):
     space = ' ' * 3
 
     for server_index, host_ip in enumerate(openstack_ip_list):
-#        server_index = env.roledefs['openstack'].index(host_string) + 1
-#        mgmt_host_ip = hstr_to_ip(host_string)
-#        host_ip = hstr_to_ip(get_control_host_string(host_string))
         keystone_server_lines +=\
             '%s server %s %s:6000 check inter 2000 rise 2 fall 1\n'\
              % (space, host_ip, host_ip)