Merge "Remove support for the deprecated pxe_ssh driver"

elements/puppet-stack-config/puppet-stack-config.pp

@@ -501,7 +501,6 @@ include ::ironic::drivers::ilo
 include ::ironic::drivers::inspector
 include ::ironic::drivers::ipmi
 include ::ironic::drivers::pxe
-include ::ironic::drivers::ssh
 include ::ironic::glance
 include ::ironic::inspector
 include ::ironic::neutron

instack_undercloud/tests/test_undercloud.py

@@ -402,7 +402,7 @@ class TestGenerateEnvironment(BaseTestCase):
         # Instead make sure that it looks like a valid list by parsing it.
         drivers = json.loads(env['ENABLED_DRIVERS'])
         self.assertEqual(sorted(drivers), ['pxe_drac', 'pxe_ilo',
-                                           'pxe_ipmitool', 'pxe_ssh'])
+                                           'pxe_ipmitool'])
         self.assertEqual(env['INSPECTION_NODE_NOT_FOUND_HOOK'], '')
 
     def test_enabled_discovery(self):
@@ -416,7 +416,7 @@ class TestGenerateEnvironment(BaseTestCase):
         drivers = json.loads(env['ENABLED_DRIVERS'])
         # Discovery requires enabling the default driver
         self.assertEqual(sorted(drivers), ['foobar', 'pxe_drac', 'pxe_ilo',
-                                           'pxe_ipmitool', 'pxe_ssh'])
+                                           'pxe_ipmitool'])
         self.assertEqual(env['INSPECTION_NODE_NOT_FOUND_HOOK'], 'enroll')
 
     def test_generate_endpoints(self):

instack_undercloud/undercloud.py

@@ -349,7 +349,7 @@ _opts = [
                 help=('Whether to clean overcloud nodes (wipe the hard drive) '
                       'between deployments and after the introspection.')),
     cfg.ListOpt('enabled_drivers',
-                default=['pxe_ipmitool', 'pxe_drac', 'pxe_ilo', 'pxe_ssh'],
+                default=['pxe_ipmitool', 'pxe_drac', 'pxe_ilo'],
                 help=('List of enabled bare metal drivers.')),
 ]
 

releasenotes/notes/ironic-ssh-removal-72982955d848dfb3.yaml

@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Out-of-box support for Ironic ``*_ssh`` drivers was removed. These drivers
+    were deprecated in the Newton release.

undercloud.conf.sample

@@ -197,7 +197,7 @@
 #clean_nodes = false
 
 # List of enabled bare metal drivers. (list value)
-#enabled_drivers = pxe_ipmitool,pxe_drac,pxe_ilo,pxe_ssh
+#enabled_drivers = pxe_ipmitool,pxe_drac,pxe_ilo
 
 
 [auth]