Merge "Fixup neutron constraints in older overclouds before updating"

[apex-tripleo-heat-templates.git] / puppet / manifests / overcloud_compute.pp

diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index a0ef701..5818234 100644 (file)
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -13,7 +13,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-include tripleo::packages
+include ::tripleo::packages
+include ::tripleo::firewall
 
 create_resources(sysctl::value, hiera('sysctl_settings'), {})
 
@@ -24,14 +25,14 @@ if count(hiera('ntp::servers')) > 0 {
 file { ['/etc/libvirt/qemu/networks/autostart/default.xml',
         '/etc/libvirt/qemu/networks/default.xml']:
   ensure => absent,
-  before => Service['libvirt']
+  before => Service['libvirt'],
 }
 # in case libvirt has been already running before the Puppet run, make
 # sure the default network is destroyed
 exec { 'libvirt-default-net-destroy':
   command => '/usr/bin/virsh net-destroy default',
-  onlyif => '/usr/bin/virsh net-info default | /bin/grep -i "^active:\s*yes"',
-  before => Service['libvirt'],
+  onlyif  => '/usr/bin/virsh net-info default | /bin/grep -i "^active:\s*yes"',
+  before  => Service['libvirt'],
 }
 
 include ::nova
@@ -43,21 +44,23 @@ nova_config {
   'DEFAULT/linuxnet_interface_driver': value => 'nova.network.linux_net.LinuxOVSInterfaceDriver';
 }
 
-$nova_enable_rbd_backend = hiera('nova::compute::rbd::ephemeral_storage', false)
-if $nova_enable_rbd_backend {
+$rbd_ephemeral_storage = hiera('nova::compute::rbd::ephemeral_storage', false)
+$rbd_persistent_storage = hiera('rbd_persistent_storage', false)
+if $rbd_ephemeral_storage or $rbd_persistent_storage {
   include ::ceph::profile::client
 
   $client_keys = hiera('ceph::profile::params::client_keys')
+  $client_user = join(['client.', hiera('ceph_client_user_name')])
   class { '::nova::compute::rbd':
-    libvirt_rbd_secret_key => $client_keys['client.openstack']['secret'],
+    libvirt_rbd_secret_key => $client_keys[$client_user]['secret'],
   }
 }
 
 if hiera('cinder_enable_nfs_backend', false) {
-  if ($::selinux != "false") {
+  if str2bool($::selinux) {
     selboolean { 'virt_use_nfs':
-        value => on,
-        persistent => true,
+      value      => on,
+      persistent => true,
     } -> Package['nfs-utils']
   }
 
@@ -68,20 +71,20 @@ include ::nova::compute::libvirt
 include ::nova::network::neutron
 include ::neutron
 
-class { 'neutron::plugins::ml2':
+class { '::neutron::plugins::ml2':
   flat_networks        => split(hiera('neutron_flat_networks'), ','),
   tenant_network_types => [hiera('neutron_tenant_network_type')],
 }
 
-class { 'neutron::agents::ml2::ovs':
+class { '::neutron::agents::ml2::ovs':
   bridge_mappings => split(hiera('neutron_bridge_mappings'), ','),
   tunnel_types    => split(hiera('neutron_tunnel_types'), ','),
 }
 
 if 'cisco_n1kv' in hiera('neutron_mechanism_drivers') {
-  class { 'neutron::agents::n1kv_vem':
-    n1kv_source          => hiera('n1kv_vem_source', undef),
-    n1kv_version         => hiera('n1kv_vem_version', undef),
+  class { '::neutron::agents::n1kv_vem':
+    n1kv_source  => hiera('n1kv_vem_source', undef),
+    n1kv_version => hiera('n1kv_vem_version', undef),
   }
 }
 
@@ -96,7 +99,7 @@ snmp::snmpv3_user { $snmpd_user:
   authtype => 'MD5',
   authpass => hiera('snmpd_readonly_user_password'),
 }
-class { 'snmp':
+class { '::snmp':
   agentaddress => ['udp:161','udp6:[::1]:161'],
   snmpd_config => [ join(['rouser ', hiera('snmpd_readonly_user_name')]), 'proc  cron', 'includeAllDisks  10%', 'master agentx', 'trapsink localhost public', 'iquerySecName internalUser', 'rouser internalUser', 'defaultMonitors yes', 'linkUpDownNotifications yes' ],
 }