diff options
| author |   Emilien Macchi <emilien@redhat.com> | 2016-06-14 11:50:33 -0400 |
|---|---|---|
| committer | Emilien Macchi <emilien@redhat.com> | 2016-06-20 13:49:24 -0400 |
| commit | ca11c3d1c1e3837410cef8365239e338a6f5879c (patch) | |
| tree | a293e0abd5f658349a6d946af6f54a80b259709b /puppet/manifests | |
| parent | 7b22f2d8305931b8f556f8a6a2d049a9b9ac90a9 (diff) | |
Remove ::nova::network::neutron, now in puppet-tripleo
It moved to nova/api profile.
Change-Id: I6adbc0ea4db1d7d75910b41c8a43637efb6410a4
Depends-On: I6b5857d3d4740c0bf3f748719f30a05f1c62cb59
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 1 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 6084c954..ae2495aa 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -151,7 +151,6 @@ if hiera('step') >= 4 { memcached_servers => $memcached_servers } include ::nova::config - include ::nova::network::neutron if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' { diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 13271116..77189bd9 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -349,7 +349,6 @@ MYSQL_HOST=localhost\n", } include ::nova::config - include ::nova::network::neutron if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' { |