Remove OpenDaylight support

... because OpenDaylight tempmates and environemtns were alredy removed in tripleo-heat-teampltes[1]. [1] 9c3638b8a13ea08a1bab95c9cd6ab335b729b6b3 Change-Id: I0204b6985de71441e0f63f21cfda24d55fd340e5
openstack-archive · Apr 14, 2020 · 474d204 · 474d204
1 parent 4072d40
commit 474d204
Show file tree

Hide file tree

Showing 20 changed files with 12 additions and 854 deletions.
diff --git a/Puppetfile_extras b/Puppetfile_extras
@@ -52,10 +52,6 @@ mod 'systemd',
   :git => 'https://github.com/camptocamp/puppet-systemd',
   :ref => '20a465b0d8751bc08913b556d0a5b7fdac139271'
 
-mod 'opendaylight',
-  :git => 'https://git.opendaylight.org/gerrit/integration/packaging/puppet-opendaylight',
-  :ref => 'master'
-
 # NOTE(aschultz): rsyslog broke backwards compatibility with
 # https://github.com/voxpupuli/puppet-rsyslog/pull/136
 mod 'rsyslog',

diff --git a/lib/puppet/functions/add_brackets.rb b/lib/puppet/functions/add_brackets.rb
diff --git a/lib/puppet/functions/synchronize_odl_ovs_flows.rb b/lib/puppet/functions/synchronize_odl_ovs_flows.rb
diff --git a/manifests/certmonger/neutron.pp b/manifests/certmonger/neutron.pp
@@ -14,7 +14,7 @@
 #
 # == Class: tripleo::certmonger::neutron
 #
-# Request a certificate for the opendaylight service and do the necessary setup.
+# Request a certificate for the Neutron service and do the necessary setup.
 #
 # === Parameters
 #

diff --git a/manifests/certmonger/opendaylight.pp b/manifests/certmonger/opendaylight.pp
diff --git a/manifests/certmonger/redis.pp b/manifests/certmonger/redis.pp
@@ -14,7 +14,7 @@
 #
 # == Class: tripleo::certmonger::redis
 #
-# Request a certificate for RabbitMQ and do the necessary setup.
+# Request a certificate for Redis and do the necessary setup.
 #
 # === Parameters
 #

diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
@@ -343,10 +343,6 @@
 #  (optional) Enable or not Ceph Dashboard binding
 #  Defaults to hiera('ceph_mgr_enabled', false)
 #
-# [*opendaylight*]
-#  (optional) Enable or not OpenDaylight binding
-#  Defaults to hiera('opendaylight_api_enabled', false)
-#
 # [*ovn_dbs*]
 #  (optional) Enable or not OVN northd binding
 #  Defaults to hiera('ovn_dbs_enabled', false)
@@ -489,10 +485,6 @@
 #  (optional) Specify the network octavia is running on.
 #  Defaults to hiera('octavia_api_network', undef)
 #
-# [*opendaylight_network*]
-#  (optional) Specify the network opendaylight is running on.
-#  Defaults to hiera('opendaylight_api_network', undef)
-#
 # [*panko_network*]
 #  (optional) Specify the network panko is running on.
 #  Defaults to hiera('panko_api_network', undef)
@@ -553,7 +545,6 @@
 #    'nova_novnc_ssl_port' (Defaults to 13080)
 #    'octavia_api_port' (Defaults to 9876)
 #    'octavia_api_ssl_port' (Defaults to 13876)
-#    'opendaylight_api_port' (Defaults to 8081)
 #    'panko_api_port' (Defaults to 8977)
 #    'panko_api_ssl_port' (Defaults to 13977)
 #    'placement_port' (Defaults to 8778)
@@ -653,7 +644,6 @@
   $redis_password              = undef,
   $zaqar_api                   = hiera('zaqar_api_enabled', false),
   $ceph_rgw                    = hiera('ceph_rgw_enabled', false),
-  $opendaylight                = hiera('opendaylight_api_enabled', false),
   $ovn_dbs                     = hiera('ovn_dbs_enabled', false),
   $ovn_dbs_manage_lb           = false,
   $zaqar_ws                    = hiera('zaqar_api_enabled', false),
@@ -687,7 +677,6 @@
   $nova_osapi_network          = hiera('nova_api_network', undef),
   $placement_network           = hiera('placement_network', undef),
   $octavia_network             = hiera('octavia_api_network', undef),
-  $opendaylight_network        = hiera('opendaylight_api_network', undef),
   $panko_network               = hiera('panko_api_network', undef),
   $ovn_dbs_network             = hiera('ovn_dbs_network', undef),
   $ec2_api_network             = hiera('ec2_api_network', undef),
@@ -739,8 +728,6 @@
     nova_novnc_ssl_port => 13080,
     octavia_api_port => 9876,
     octavia_api_ssl_port => 13876,
-    opendaylight_api_port => 8081,
-    opendaylight_ws_port => 8185,
     panko_api_port => 8977,
     panko_api_ssl_port => 13977,
     placement_port => 8778,
@@ -1519,38 +1506,6 @@
     }
   }
 
-  if $opendaylight {
-    ::tripleo::haproxy::endpoint { 'opendaylight':
-      internal_ip     => unique([hiera('opendaylight_api_vip', $controller_virtual_ip), $controller_virtual_ip]),
-      service_port    => $ports[opendaylight_api_port],
-      ip_addresses    => hiera('opendaylight_api_node_ips', $controller_hosts_real),
-      server_names    => hiera('opendaylight_api_node_names', $controller_hosts_names_real),
-      mode            => 'http',
-      member_options  => union($haproxy_member_options, $internal_tls_member_options),
-      service_network => $opendaylight_network,
-      listen_options  => merge($default_listen_options,
-        { 'option' => [ 'httpchk GET /diagstatus', 'httplog' ] }),
-    }
-
-    ::tripleo::haproxy::endpoint { 'opendaylight_ws':
-      internal_ip     => unique([hiera('opendaylight_api_vip', $controller_virtual_ip), $controller_virtual_ip]),
-      service_port    => $ports[opendaylight_ws_port],
-      ip_addresses    => hiera('opendaylight_api_node_ips', $controller_hosts_real),
-      server_names    => hiera('opendaylight_api_node_names', $controller_hosts_names_real),
-      mode            => 'http',
-      service_network => $opendaylight_network,
-      listen_options  => {
-        # NOTE(jaosorior): Websockets have more overhead in establishing
-        # connections than regular HTTP connections. Also, since it begins
-        # as an HTTP connection and then "upgrades" to a TCP connection, some
-        # timeouts get overridden by others at certain times of the connection.
-        # The following values were taken from the following site:
-        # http://blog.haproxy.com/2012/11/07/websockets-load-balancing-with-haproxy/
-        'timeout' => ['connect 5s', 'client 25s', 'server 25s', 'tunnel 3600s'],
-      },
-    }
-  }
-
   if $octavia {
     ::tripleo::haproxy::endpoint { 'octavia':
       public_virtual_ip => $public_virtual_ip,

diff --git a/manifests/host/liquidio/compute.pp b/manifests/host/liquidio/compute.pp
@@ -9,8 +9,8 @@
 #   Defaults to hiera('step')
 #
 # [*controller_node_ip*]
-#   (Optional)  controller node ip, contains either odl,
-#   ovn or openstack controller ip.
+#   (Optional)  controller node ip, contains either ovn or openstack controller
+#   ip.
 #
 # [*tenant_subnet*]
 #   (required) Tenant network's ip of the compute node
@@ -37,10 +37,6 @@
 #   (optional) used by Liquidio service only when bonding
 #   is disabled, input format is <extrenal-network-name>:interface
 #
-# [*opendaylight_api_vip*]
-#   (optional) used by Liquidio service to communicate with ODL Controller
-#   Defaults to hiera('opendaylight_api_vip')
-#
 # [*ovn_dbs_vip*]
 #   (optional) used by Liquidio service to communicate with OVN Controller
 #   Defaults to hiera('ovn_dbs_vip')
@@ -61,7 +57,6 @@
   $provider_mappings,
   $tenant_subnet         = hiera('tenant_subnet'),
   $step                  = Integer(hiera('step')),
-  $opendaylight_api_vip  = hiera('opendaylight_api_vip', undef),
   $ovn_dbs_vip           = hiera('ovn_dbs_vip', undef),
   $controller_virtual_ip = hiera('controller_virtual_ip', undef),
   $pci_passthrough       = hiera('nova::compute::pci::passthrough', undef),
@@ -70,7 +65,6 @@
     if $step >= 5 {
         case $configure_mode {
 
-          'ml2-odl': { $controller_node_ip = $opendaylight_api_vip }
           'ml2-ovn': { $controller_node_ip = $ovn_dbs_vip }
           default  : { $controller_node_ip = $controller_virtual_ip }
 

diff --git a/manifests/profile/base/certmonger_user.pp b/manifests/profile/base/certmonger_user.pp
@@ -122,16 +122,6 @@ # == class: tripleo::profile::base::certmonger_user
 #   it will create.
 #   Defaults to hiera('tripleo::profile::base::etcd::certificate_specs', {}).
 #
-# [*odl_certificate_specs*]
-#   (Optional) The specifications to give to certmonger for the certificate(s)
-#   it will create.
-#   Defaults to hiera('tripleo::profile::base::odl::certificate_specs', {}).
-#
-# [*ovs_certificate_specs*]
-#   (Optional) The specifications to give to certmonger for the certificate(s)
-#   it will create.
-#   Defaults to hiera('tripleo::profile::base::ovs::certificate_specs', {}).
-#
 # [*neutron_certificate_specs*]
 #   (Optional) The specifications to give to certmonger for the certificate(s)
 #   it will create.
@@ -200,8 +190,6 @@ # == class: tripleo::profile::base::certmonger_user
   $rabbitmq_certificate_specs         = hiera('tripleo::profile::base::rabbitmq::certificate_specs', {}),
   $redis_certificate_specs            = hiera('redis_certificate_specs', {}),
   $etcd_certificate_specs             = hiera('tripleo::profile::base::etcd::certificate_specs', {}),
-  $odl_certificate_specs              = hiera('tripleo::profile::base::neutron::opendaylight::certificate_specs', {}),
-  $ovs_certificate_specs              = hiera('tripleo::profile::base::neutron::plugins::ovs::opendaylight::certificate_specs', {}),
   $neutron_certificate_specs          = hiera('tripleo::profile::base::neutron::certificate_specs', {}),
   $novnc_proxy_certificates_specs     = hiera('novnc_proxy_certificates_specs',{}),
   $ceph_grafana_certificate_specs     = hiera('ceph_grafana_certificate_specs', {}),
@@ -286,12 +274,6 @@ # == class: tripleo::profile::base::certmonger_user
     unless empty($etcd_certificate_specs) {
       ensure_resource('class', 'tripleo::certmonger::etcd', $etcd_certificate_specs)
     }
-    unless empty($odl_certificate_specs) {
-      ensure_resource('class', 'tripleo::certmonger::opendaylight', $odl_certificate_specs)
-    }
-    unless empty($ovs_certificate_specs) {
-      ensure_resource('class', 'tripleo::certmonger::openvswitch', $ovs_certificate_specs)
-    }
     unless empty($neutron_certificate_specs) {
       ensure_resource('class', 'tripleo::certmonger::neutron', $neutron_certificate_specs)
     }