diff --git a/devstack/enabled-drivers.txt b/devstack/enabled-drivers.txt index d2700c2..a86824e 100644 --- a/devstack/enabled-drivers.txt +++ b/devstack/enabled-drivers.txt @@ -9,6 +9,5 @@ fake_libvirt_fake fake_amt_fake pxe_amt_iscsi pxe_amt_agent -pxe_ssh_ansible pxe_libvirt_ansible pxe_ipmitool_ansible diff --git a/ironic_staging_drivers/ansible/__init__.py b/ironic_staging_drivers/ansible/__init__.py index fc2f722..2455ab9 100644 --- a/ironic_staging_drivers/ansible/__init__.py +++ b/ironic_staging_drivers/ansible/__init__.py @@ -14,25 +14,11 @@ from ironic.drivers import base from ironic.drivers.modules import fake from ironic.drivers.modules import ipmitool from ironic.drivers.modules import pxe -from ironic.drivers.modules import ssh from ironic_staging_drivers.ansible import deploy as ansible_deploy from ironic_staging_drivers.libvirt import power as libvirt_power -class AnsibleAndSSHDriver(base.BaseDriver): - """Ansible + SSH driver. - - NOTE: This driver is meant only for testing environments. - """ - - def __init__(self): - self.power = ssh.SSHPower() - self.boot = pxe.PXEBoot() - self.deploy = ansible_deploy.AnsibleDeploy() - self.management = ssh.SSHManagement() - - class AnsibleAndIPMIToolDriver(base.BaseDriver): """Ansible + Ipmitool driver.""" diff --git a/releasenotes/notes/no-ssh-drivers-887d3b5f57bf5452.yaml b/releasenotes/notes/no-ssh-drivers-887d3b5f57bf5452.yaml new file mode 100644 index 0000000..7738a77 --- /dev/null +++ b/releasenotes/notes/no-ssh-drivers-887d3b5f57bf5452.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + ``pxe_ssh_ansible`` driver is removed as SSH-based power and management + driver interfaces in ironic are unsupported since Newton release, + and are to be removed in the Pike release diff --git a/setup.cfg b/setup.cfg index d62ed7e..cc2e14a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -40,7 +40,6 @@ ironic.drivers = pxe_iboot_agent = ironic_staging_drivers.iboot:PXEIBootAgentDriver fake_ansible = ironic_staging_drivers.ansible:FakeAnsibleDriver pxe_ipmitool_ansible = ironic_staging_drivers.ansible:AnsibleAndIPMIToolDriver - pxe_ssh_ansible = ironic_staging_drivers.ansible:AnsibleAndSSHDriver pxe_libvirt_ansible = ironic_staging_drivers.ansible:AnsibleAndLibvirtDriver [build_sphinx]