Merge "Remove manage_service and enabled from TripleO manifests"

diff --cc manifests/profile/base/keystone.pp
Simple merge

diff --cc manifests/profile/base/neutron/dhcp.pp
index 4d5bb28,534026e..180fd37
--- 1/manifests/profile/base/neutron/dhcp.pp
--- 2/manifests/profile/base/neutron/dhcp.pp
+++ b/manifests/profile/base/neutron/dhcp.pp
@@@ -43,19 -33,8 +33,16 @@@ class tripleo::profile::base::neutron::
  ) {
    if $step >= 4 {
      include ::tripleo::profile::base::neutron
-     class { '::neutron::agents::dhcp':
-       manage_service => $manage_service,
-       enabled        => $enabled
-     }
+     include ::neutron::agents::dhcp
  
 +    file { '/etc/neutron/dnsmasq-neutron.conf':
 +      content => $neutron_dnsmasq_options,
 +      owner   => 'neutron',
 +      group   => 'neutron',
 +      notify  => Service['neutron-dhcp-service'],
 +      require => Package['neutron'],
 +    }
 +
      Service<| title == 'neutron-server' |> -> Service <| title == 'neutron-dhcp' |>
    }
  }

diff --cc manifests/profile/pacemaker/keystone.pp
Simple merge