Update rake version in puppet module Gemfile, fix linter

We needed to update the Rake version required by the Gemfile inside
the Packstack Puppet module directory. After that, a rake lint
execution showed many linter errors, so fixing them.

Change-Id: Ib58e62768f5b71e68b79002e01f0d779d1c6138b

packstack/puppet/modules/packstack/Gemfile

@@ -2,9 +2,9 @@ source 'https://rubygems.org'
 
 group :development, :test do
   gem 'puppetlabs_spec_helper', :require => false
-  gem 'puppet-lint', '~> 0.3.2'
+  gem 'puppet-lint', '>= 1.0.0'
-  gem 'rake', '10.1.1'
+  gem 'rake', '< 13.0.0'
-  gem 'rspec', '< 2.99'
+  gem 'rspec'
 end
 
 if puppetversion = ENV['PUPPET_GEM_VERSION']

packstack/puppet/modules/packstack/manifests/amqp.pp

@@ -1,63 +1,3 @@
-define packstack::amqp::enable_rabbitmq {
-  create_resources(packstack::firewall, hiera('FIREWALL_AMQP_RULES', {}))
-  $amqp_enable_ssl = hiera('CONFIG_AMQP_SSL_ENABLED')
-
-  if $amqp_enable_ssl {
-    $kombu_ssl_ca_certs = hiera('CONFIG_AMQP_SSL_CACERT_FILE', undef)
-    $kombu_ssl_keyfile = '/etc/pki/tls/private/ssl_amqp.key'
-    $kombu_ssl_certfile = '/etc/pki/tls/certs/ssl_amqp.crt'
-
-    $files_to_set_owner = [ $kombu_ssl_keyfile, $kombu_ssl_certfile ]
-    file { $files_to_set_owner:
-      owner   => 'rabbitmq',
-      group   => 'rabbitmq',
-      require => Package['rabbitmq-server'],
-      notify  => Service['rabbitmq-server'],
-    }
-
-    file { $kombu_ssl_ca_certs:
-      mode   => '0644',
-      require => Package['rabbitmq-server'],
-      notify  => Service['rabbitmq-server'],
-    }
-
-    class { '::rabbitmq':
-      port                     => undef,
-      ssl_port                 => 0 + hiera('CONFIG_AMQP_CLIENTS_PORT'),
-      ssl_only                 => true,
-      ssl                      => true,
-      ssl_cacert               => $kombu_ssl_ca_certs,
-      ssl_cert                 => $kombu_ssl_certfile,
-      ssl_key                  => $kombu_ssl_keyfile,
-      default_user             => hiera('CONFIG_AMQP_AUTH_USER'),
-      default_pass             => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
-      package_provider         => 'yum',
-      repos_ensure             => false,
-      admin_enable             => false,
-      loopback_users           => [],
-      # FIXME: it's ugly to not to require client certs
-      ssl_fail_if_no_peer_cert => true,
-      config_ranch             => false,
-      tcp_keepalive            => true,
-      tcp_backlog              => 128,
-    }
-  } else {
-    class { '::rabbitmq':
-      port             => 0 + hiera('CONFIG_AMQP_CLIENTS_PORT'),
-      ssl              => false,
-      default_user     => hiera('CONFIG_AMQP_AUTH_USER'),
-      default_pass     => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
-      package_provider => 'yum',
-      repos_ensure     => false,
-      admin_enable     => false,
-      loopback_users   => [],
-      config_ranch             => false,
-      tcp_keepalive            => true,
-      tcp_backlog              => 128,
-    }
-  }
-}
-
 class packstack::amqp ()
 {
   $amqp = hiera('CONFIG_AMQP_BACKEND')

packstack/puppet/modules/packstack/manifests/amqp/enable_rabbitmq.pp

@@ -0,0 +1,59 @@
+define packstack::amqp::enable_rabbitmq {
+  create_resources(packstack::firewall, hiera('FIREWALL_AMQP_RULES', {}))
+  $amqp_enable_ssl = hiera('CONFIG_AMQP_SSL_ENABLED')
+
+  if $amqp_enable_ssl {
+    $kombu_ssl_ca_certs = hiera('CONFIG_AMQP_SSL_CACERT_FILE', undef)
+    $kombu_ssl_keyfile = '/etc/pki/tls/private/ssl_amqp.key'
+    $kombu_ssl_certfile = '/etc/pki/tls/certs/ssl_amqp.crt'
+
+    $files_to_set_owner = [ $kombu_ssl_keyfile, $kombu_ssl_certfile ]
+    file { $files_to_set_owner:
+      owner   => 'rabbitmq',
+      group   => 'rabbitmq',
+      require => Package['rabbitmq-server'],
+      notify  => Service['rabbitmq-server'],
+    }
+
+    file { $kombu_ssl_ca_certs:
+      mode    => '0644',
+      require => Package['rabbitmq-server'],
+      notify  => Service['rabbitmq-server'],
+    }
+
+    class { '::rabbitmq':
+      port                     => undef,
+      ssl_port                 => 0 + hiera('CONFIG_AMQP_CLIENTS_PORT'),
+      ssl_only                 => true,
+      ssl                      => true,
+      ssl_cacert               => $kombu_ssl_ca_certs,
+      ssl_cert                 => $kombu_ssl_certfile,
+      ssl_key                  => $kombu_ssl_keyfile,
+      default_user             => hiera('CONFIG_AMQP_AUTH_USER'),
+      default_pass             => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
+      package_provider         => 'yum',
+      repos_ensure             => false,
+      admin_enable             => false,
+      loopback_users           => [],
+      # FIXME: it's ugly to not to require client certs
+      ssl_fail_if_no_peer_cert => true,
+      config_ranch             => false,
+      tcp_keepalive            => true,
+      tcp_backlog              => 128,
+    }
+  } else {
+    class { '::rabbitmq':
+      port             => 0 + hiera('CONFIG_AMQP_CLIENTS_PORT'),
+      ssl              => false,
+      default_user     => hiera('CONFIG_AMQP_AUTH_USER'),
+      default_pass     => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
+      package_provider => 'yum',
+      repos_ensure     => false,
+      admin_enable     => false,
+      loopback_users   => [],
+      config_ranch     => false,
+      tcp_keepalive    => true,
+      tcp_backlog      => 128,
+    }
+  }
+}

packstack/puppet/modules/packstack/manifests/ceilometer.pp

@@ -18,7 +18,7 @@ class packstack::ceilometer ()
       $redis_port = hiera('CONFIG_REDIS_PORT')
       $coordination_url = "redis://${redis_host}:${redis_port}"
 
-      ensure_resource('package', "python-redis", {
+      ensure_resource('package', 'python-redis', {
         name   => "python${pyvers}-redis",
         tag    => 'openstack',
       })
@@ -35,12 +35,12 @@ class packstack::ceilometer ()
       tries     => 20
     }
 
-    Keystone::Resource::Service_identity<||> -> Exec['ceilometer-db-upgrade'] ~>
+    Keystone::Resource::Service_identity<||> -> Exec['ceilometer-db-upgrade']
-      Service['ceilometer-agent-notification']
+      ~> Service['ceilometer-agent-notification']
 
     class { '::ceilometer::agent::notification':
       manage_event_pipeline     => true,
-      event_pipeline_publishers => ["gnocchi://", "panko://"],
+      event_pipeline_publishers => ['gnocchi://', 'panko://'],
     }
 
     class { '::ceilometer::agent::auth':

packstack/puppet/modules/packstack/manifests/chrony.pp

@@ -91,11 +91,11 @@ class packstack::chrony ()
       hasrestart => true,
     }
 
-    Package['chrony'] ->
+    Package['chrony']
-    Package['ntpdate'] ->
+    -> Package['ntpdate']
-    File['chrony_conf'] ->
+    -> File['chrony_conf']
-    Exec['stop-chronyd'] ->
+    -> Exec['stop-chronyd']
-    Service['ntpd'] ->
+    -> Service['ntpd']
-    Exec['ntpdate'] ->
+    -> Exec['ntpdate']
-    Service['chronyd']
+    -> Service['chronyd']
 }

packstack/puppet/modules/packstack/manifests/cinder/backend/gluster.pp

@@ -10,7 +10,7 @@ class packstack::cinder::backend::gluster ()
 
     cinder_type { 'glusterfs':
       ensure     => present,
-      properties => ["volume_backend_name=gluster"],
+      properties => ['volume_backend_name=gluster'],
       require    => Class['cinder::api'],
     }
 }

packstack/puppet/modules/packstack/manifests/cinder/backend/lvm.pp

@@ -20,8 +20,8 @@ class packstack::cinder::backend::lvm ()
 
           file_line{ 'rc.local_losetup_cinder_volume':
             path  => '/etc/rc.d/rc.local',
-            match => "^.*/var/lib/cinder/$cinder_volume_name.*$",
+            match => "^.*/var/lib/cinder/${cinder_volume_name}.*$",
-            line  => "losetup -f /var/lib/cinder/$cinder_volume_name && service openstack-cinder-volume restart",
+            line  => "losetup -f /var/lib/cinder/${cinder_volume_name} && service openstack-cinder-volume restart",
           }
 
           file { '/etc/rc.d/rc.local':
@@ -42,8 +42,8 @@ class packstack::cinder::backend::lvm ()
 
     [Service]
     Type=oneshot
-    ExecStart=/usr/bin/sh -c \'/usr/sbin/losetup -j /var/lib/cinder/$cinder_volume_name | /usr/bin/grep /var/lib/cinder/$cinder_volume_name || /usr/sbin/losetup -f /var/lib/cinder/$cinder_volume_name\'
+    ExecStart=/usr/bin/sh -c \'/usr/sbin/losetup -j /var/lib/cinder/${cinder_volume_name} | /usr/bin/grep /var/lib/cinder/${cinder_volume_name} || /usr/sbin/losetup -f /var/lib/cinder/${cinder_volume_name}\'
-    ExecStop=/usr/bin/sh -c \'/usr/sbin/losetup -j /var/lib/cinder/$cinder_volume_name | /usr/bin/cut -d : -f 1 | /usr/bin/xargs /usr/sbin/losetup -d\'
+    ExecStop=/usr/bin/sh -c \'/usr/sbin/losetup -j /var/lib/cinder/${cinder_volume_name} | /usr/bin/cut -d : -f 1 | /usr/bin/xargs /usr/sbin/losetup -d\'
     TimeoutSec=60
     RemainAfterExit=yes
 
@@ -92,7 +92,7 @@ class packstack::cinder::backend::lvm ()
 
     cinder_type { 'iscsi':
       ensure     => present,
-      properties => ["volume_backend_name=lvm"],
+      properties => ['volume_backend_name=lvm'],
       require    => Class['cinder::api'],
     }
 }

packstack/puppet/modules/packstack/manifests/cinder/backend/nfs.pp

@@ -10,7 +10,7 @@ class packstack::cinder::backend::nfs ()
 
     cinder_type { 'nfs':
       ensure     => present,
-      properties => ["volume_backend_name=nfs"],
+      properties => ['volume_backend_name=nfs'],
       require    => Class['cinder::api'],
     }
 }

packstack/puppet/modules/packstack/manifests/cinder/backend/vmdk.pp

@@ -8,7 +8,7 @@ class packstack::cinder::backend::vmdk ()
 
     cinder_type { 'vmdk':
       ensure     => present,
-      properties => ["volume_backend_name=vmdk"],
+      properties => ['volume_backend_name=vmdk'],
       require    => Class['cinder::api'],
     }
 }

packstack/puppet/modules/packstack/manifests/heat/cfn.pp

@@ -9,9 +9,9 @@ class packstack::heat::cfn ()
     $heat_cfn_cfg_ctrl_host = hiera('CONFIG_KEYSTONE_HOST_URL')
 
     class { '::heat::keystone::auth_cfn':
-      admin_url    => "http://$heat_cfn_cfg_ctrl_host:8000/v1",
+      admin_url    => "http://${heat_cfn_cfg_ctrl_host}:8000/v1",
-      public_url   => "http://$heat_cfn_cfg_ctrl_host:8000/v1",
+      public_url   => "http://${heat_cfn_cfg_ctrl_host}:8000/v1",
-      internal_url => "http://$heat_cfn_cfg_ctrl_host:8000/v1",
+      internal_url => "http://${heat_cfn_cfg_ctrl_host}:8000/v1",
       password     => hiera('CONFIG_HEAT_KS_PW'),
     }
 }

packstack/puppet/modules/packstack/manifests/keystone.pp

@@ -33,7 +33,7 @@ class packstack::keystone ()
 
     class { '::keystone':
       database_connection => "mysql+pymysql://keystone_admin:${keystone_cfg_ks_db_pw}@${keystone_cfg_mariadb_host}/keystone",
-      token_provider      => "${keystone_token_provider_str}",
+      token_provider      => $keystone_token_provider_str,
       enable_fernet_setup => true,
       service_name        => 'httpd',
       enable_ssl          => $keystone_use_ssl,

packstack/puppet/modules/packstack/manifests/keystone/cinder.pp

@@ -3,7 +3,7 @@ class packstack::keystone::cinder ()
     $cinder_protocol = 'http'
     $cinder_host = hiera('CONFIG_STORAGE_HOST_URL')
     $cinder_port = '8776'
-    $cinder_url = "${cinder_protocol}://${cinder_host}:$cinder_port"
+    $cinder_url = "${cinder_protocol}://${cinder_host}:${cinder_port}"
 
     class { '::cinder::keystone::auth':
       region          => hiera('CONFIG_KEYSTONE_REGION'),

packstack/puppet/modules/packstack/manifests/keystone/ironic.pp

@@ -3,7 +3,7 @@ class packstack::keystone::ironic ()
     $ironic_protocol = 'http'
     $ironic_host = hiera('CONFIG_KEYSTONE_HOST_URL')
     $ironic_port = '6385'
-    $ironic_url = "${ironic_protocol}://${ironic_host}:$ironic_port"
+    $ironic_url = "${ironic_protocol}://${ironic_host}:${ironic_port}"
 
     class { '::ironic::keystone::auth':
         region       => hiera('CONFIG_KEYSTONE_REGION'),

packstack/puppet/modules/packstack/manifests/keystone/magnum.pp

@@ -3,7 +3,7 @@ class packstack::keystone::magnum ()
     $magnum_protocol = 'http'
     $magnum_host = hiera('CONFIG_KEYSTONE_HOST_URL')
     $magnum_port = '9511'
-    $magnum_url = "${magnum_protocol}://${magnum_host}:$magnum_port/v1"
+    $magnum_url = "${magnum_protocol}://${magnum_host}:${magnum_port}/v1"
 
     class { '::magnum::keystone::auth':
       region       => hiera('CONFIG_KEYSTONE_REGION'),

packstack/puppet/modules/packstack/manifests/keystone/manila.pp

@@ -3,8 +3,8 @@ class packstack::keystone::manila ()
     $manila_protocol = 'http'
     $manila_host = hiera('CONFIG_STORAGE_HOST_URL')
     $manila_port = '8786'
-    $manila_url = "${manila_protocol}://${manila_host}:$manila_port/v1/%(tenant_id)s"
+    $manila_url = "${manila_protocol}://${manila_host}:${manila_port}/v1/%(tenant_id)s"
-    $manila_url_v2 = "${manila_protocol}://${manila_host}:$manila_port/v2/%(tenant_id)s"
+    $manila_url_v2 = "${manila_protocol}://${manila_host}:${manila_port}/v2/%(tenant_id)s"
 
     class { '::manila::keystone::auth':
       password        => hiera('CONFIG_MANILA_KS_PW'),

packstack/puppet/modules/packstack/manifests/keystone/neutron.pp

@@ -3,7 +3,7 @@ class packstack::keystone::neutron ()
     $neutron_protocol = 'http'
     $neutron_host = hiera('CONFIG_KEYSTONE_HOST_URL')
     $neutron_port = '9696'
-    $neutron_url = "${neutron_protocol}://${neutron_host}:$neutron_port"
+    $neutron_url = "${neutron_protocol}://${neutron_host}:${neutron_port}"
 
     class { '::neutron::keystone::auth':
       region       => hiera('CONFIG_KEYSTONE_REGION'),

packstack/puppet/modules/packstack/manifests/keystone/sahara.pp

@@ -3,7 +3,7 @@ class packstack::keystone::sahara ()
     $sahara_protocol = 'http'
     $sahara_host = hiera('CONFIG_KEYSTONE_HOST_URL')
     $sahara_port = '8386'
-    $sahara_url = "${sahara_protocol}://${sahara_host}:$sahara_port"
+    $sahara_url = "${sahara_protocol}://${sahara_host}:${sahara_port}"
 
     class { '::sahara::keystone::auth':
       password     => hiera('CONFIG_SAHARA_KS_PW'),

packstack/puppet/modules/packstack/manifests/keystone/swift.pp

@@ -3,7 +3,7 @@ class packstack::keystone::swift ()
     $swift_protocol = 'http'
     $swift_host = hiera('CONFIG_STORAGE_HOST_URL')
     $swift_port = '8080'
-    $swift_url = "${swift_protocol}://${swift_host}:$swift_port/v1/AUTH_%(tenant_id)s"
+    $swift_url = "${swift_protocol}://${swift_host}:${swift_port}/v1/AUTH_%(tenant_id)s"
 
     class { '::swift::keystone::auth':
       region                => hiera('CONFIG_KEYSTONE_REGION'),

packstack/puppet/modules/packstack/manifests/keystone/trove.pp

@@ -3,7 +3,7 @@ class packstack::keystone::trove ()
     $trove_protocol = 'http'
     $trove_host = hiera('CONFIG_KEYSTONE_HOST_URL')
     $trove_port = '8779'
-    $trove_url = "${trove_protocol}://${trove_host}:$trove_port/v1.0/%(tenant_id)s"
+    $trove_url = "${trove_protocol}://${trove_host}:${trove_port}/v1.0/%(tenant_id)s"
 
     class { '::trove::keystone::auth':
       region       => hiera('CONFIG_KEYSTONE_REGION'),

packstack/puppet/modules/packstack/manifests/magnum.pp

@@ -11,7 +11,7 @@ class packstack::magnum ()
     $magnum_protocol = 'http'
     $magnum_host = hiera('CONFIG_KEYSTONE_HOST_URL')
     $magnum_port = '9511'
-    $magnum_url = "${magnum_protocol}://${magnum_host}:$magnum_port/v1"
+    $magnum_url = "${magnum_protocol}://${magnum_host}:${magnum_port}/v1"
     class { '::magnum::keystone::authtoken':
       www_authenticate_uri => "${magnum_protocol}://${magnum_host}:5000/v3",
       auth_url             => "${magnum_protocol}://${magnum_host}:5000",

packstack/puppet/modules/packstack/manifests/manila/backend/generic.pp

@@ -22,8 +22,8 @@ class packstack::manila::backend::generic ()
       disk    => '1',
       vcpus   => '1',
       require => [ Class['::nova::api'], Class['::nova::keystone::auth'] ],
-    } ->
+    }
-    manila::service_instance{ 'generic':
+    -> manila::service_instance{ 'generic':
       service_image_location     => hiera('CONFIG_MANILA_SERVICE_IMAGE_LOCATION'),
       service_instance_user      => hiera('CONFIG_MANILA_SERVICE_INSTANCE_USER'),
       service_instance_password  => hiera('CONFIG_MANILA_SERVICE_INSTANCE_PASSWORD'),

packstack/puppet/modules/packstack/manifests/neutron/ml2.pp

@@ -32,8 +32,8 @@ class packstack::neutron::ml2 ()
     # For cases where "neutron-db-manage upgrade" command is called
     # we need to fill config file first
     if defined(Exec['neutron-db-manage upgrade']) {
-      Neutron_plugin_ml2<||> ->
+      Neutron_plugin_ml2<||>
-      File['/etc/neutron/plugin.ini'] ->
+      -> File['/etc/neutron/plugin.ini']
-      Exec['neutron-db-manage upgrade']
+      -> Exec['neutron-db-manage upgrade']
     }
 }

packstack/puppet/modules/packstack/manifests/nova/compute/libvirt.pp

@@ -17,14 +17,14 @@ class packstack::nova::compute::libvirt ()
         file { '/dev/kvm':
           owner => 'root',
           group => 'kvm',
-          mode   => '666',
+          mode  => '0666',
         }
 
         # We have to fix the permissions after the installation has been done
         # and before the service is started.
-        Package <| title == 'libvirt' |> ->
+        Package <| title == 'libvirt' |>
-        File['/dev/kvm'] ->
+        -> File['/dev/kvm']
-        Service <| title == 'libvirt' |>
+        -> Service <| title == 'libvirt' |>
     }
 
     $migrate_transport = hiera('CONFIG_NOVA_COMPUTE_MIGRATE_PROTOCOL')
@@ -65,7 +65,6 @@ class packstack::nova::compute::libvirt ()
 
     $libvirt_debug = hiera('CONFIG_DEBUG_MODE')
     if $libvirt_debug {
-
       file_line { '/etc/libvirt/libvirt.conf log_filters':
         path   => '/etc/libvirt/libvirtd.conf',
         line   => 'log_filters = "1:libvirt 1:qemu 1:conf 1:security 3:event 3:json 3:file 1:util"',
@@ -79,6 +78,5 @@ class packstack::nova::compute::libvirt ()
         match  => 'log_outputs =',
         notify => Service['libvirt'],
       }
-
     }
 }

packstack/puppet/modules/packstack/manifests/prereqs.pp

@@ -10,8 +10,8 @@ class packstack::prereqs ()
 
     package { 'audit':
       ensure => present,
-    } ->
+    }
-    service { 'auditd':
+    -> service { 'auditd':
       ensure => running,
       enable => true,
     }

packstack/puppet/modules/packstack/manifests/provision.pp

@@ -10,15 +10,14 @@ class packstack::provision ()
       $password             = hiera('CONFIG_KEYSTONE_DEMO_PW')
       $tenant_name          = 'demo'
       $floating_range       = hiera('CONFIG_PROVISION_DEMO_FLOATRANGE')
-      $allocation_pools     = hiera(
+      $allocation_pools     = hiera('CONFIG_PROVISION_DEMO_ALLOCATION_POOLS')
-                              'CONFIG_PROVISION_DEMO_ALLOCATION_POOLS')
     } elsif $provision_tempest {
       $username             = hiera('CONFIG_PROVISION_TEMPEST_USER')
       $password             = hiera('CONFIG_PROVISION_TEMPEST_USER_PW')
       $tenant_name          = 'tempest'
       $floating_range       = hiera('CONFIG_PROVISION_TEMPEST_FLOATRANGE')
       $allocation_pools     = []
-      if (empty($tempest_user) or empty($tempest_password)) {
+      if (empty($username) or empty($password)) {
         fail("Both CONFIG_PROVISION_TEMPEST_USER and
         CONFIG_PROVISION_TEMPEST_USER_PW need to be configured.")
       }

packstack/puppet/modules/packstack/manifests/provision/bridge.pp

@@ -25,8 +25,8 @@ class packstack::provision::bridge ()
     if $provision_neutron_br and $setup_ovs_bridge {
       Neutron_config<||> -> Neutron_l3_ovs_bridge['demo_bridge']
       neutron_l3_ovs_bridge { 'demo_bridge':
-        name        => $public_bridge_name,
         ensure      => present,
+        name        => $public_bridge_name,
         subnet_name => 'public_subnet',
       }
 

packstack/puppet/modules/packstack/manifests/provision/tempest.pp

@@ -54,13 +54,13 @@ class packstack::provision::tempest ()
     $tempest_password      = hiera('CONFIG_PROVISION_TEMPEST_USER_PW')
 
     $tempest_flavor_name = hiera('CONFIG_PROVISION_TEMPEST_FLAVOR_NAME')
-    $tempest_flavor_ref  = "42"
+    $tempest_flavor_ref  = '42'
     $tempest_flavor_ram  = hiera('CONFIG_PROVISION_TEMPEST_FLAVOR_RAM')
     $tempest_flavor_disk = hiera('CONFIG_PROVISION_TEMPEST_FLAVOR_DISK')
     $tempest_flavor_vcpus= hiera('CONFIG_PROVISION_TEMPEST_FLAVOR_VCPUS')
 
     $tempest_flavor_alt_name = hiera('CONFIG_PROVISION_TEMPEST_FLAVOR_ALT_NAME')
-    $tempest_flavor_alt_ref  = "84"
+    $tempest_flavor_alt_ref  = '84'
     $tempest_flavor_alt_ram  = hiera('CONFIG_PROVISION_TEMPEST_FLAVOR_ALT_RAM')
     $tempest_flavor_alt_disk = hiera('CONFIG_PROVISION_TEMPEST_FLAVOR_ALT_DISK')
     $tempest_flavor_alt_vcpus= hiera('CONFIG_PROVISION_TEMPEST_FLAVOR_ALT_VCPUS')