diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-06-21 13:22:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-06-21 13:22:35 +0000 |
| commit | a7e30686903d0fa9430435c527b9fd4de1d0bb19 (patch) | |
| tree | c4d29c1b9cf6afdc7d56203b1201904dbaa77956 /puppet | |
| parent | a5399e2310e666ba5489aeccd56e810108e79d96 (diff) | |
| parent | ca11c3d1c1e3837410cef8365239e338a6f5879c (diff) | |
Merge "Remove ::nova::network::neutron, now in puppet-tripleo"
Diffstat (limited to 'puppet')
| -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 b8603020..29c8d1b1 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 93715bac..ff065695 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -353,7 +353,6 @@ MYSQL_HOST=localhost\n", } include ::nova::config - include ::nova::network::neutron if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' { |