diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-07 18:45:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-07 18:45:18 +0000 |
| commit | cad6c62feec19323f995617b68d0ac50aec373b8 (patch) | |
| tree | 1baeddb806b4bba255e8958e9e9a607bb77254ff /manifests/profile/base/ironic | |
| parent | 02a50caf4e456a229a3aadf4b0ca2faaf46beedf (diff) | |
| parent | ac5445fb7f5499fd5b3d317c56f606c7286132a9 (diff) | |
Merge "Stop including ironic::drivers::ssh in the ironic-conductor profile"
Diffstat (limited to 'manifests/profile/base/ironic')
| -rw-r--r-- | manifests/profile/base/ironic/conductor.pp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/manifests/profile/base/ironic/conductor.pp b/manifests/profile/base/ironic/conductor.pp index cb0524b..941c0bd 100644 --- a/manifests/profile/base/ironic/conductor.pp +++ b/manifests/profile/base/ironic/conductor.pp @@ -44,7 +44,10 @@ class tripleo::profile::base::ironic::conductor ( include ::ironic::drivers::drac include ::ironic::drivers::ilo include ::ironic::drivers::ipmi - include ::ironic::drivers::ssh + # TODO: deprecated code cleanup, remove in Queens + ironic_config { + 'ssh/libvirt_uri': ensure => absent; + } # Configure access to other services include ::ironic::drivers::inspector |