diff --git a/deployment/puppet/cluster/templates/conntrackd.conf.erb b/deployment/puppet/cluster/templates/conntrackd.conf.erb
index e351758305..ed8e15b4b8 100644
--- a/deployment/puppet/cluster/templates/conntrackd.conf.erb
+++ b/deployment/puppet/cluster/templates/conntrackd.conf.erb
@@ -93,7 +93,7 @@ Sync {
     # send the synchronization messages. Remember that you must
     # use a dedicated link for the synchronization messages.
     #
-    IPv4_interface 240.1.0.<%= @ipaddress_br_mgmt.rpartition(".")[-1] %>
+    IPv4_interface 240.1.0.<%= @internal_address.rpartition(".").last %>
 
     #
     # The name of the interface that you are going to use to
diff --git a/deployment/puppet/osnailyfacter/lib/puppet/type/install_ssh_keys.rb b/deployment/puppet/osnailyfacter/lib/puppet/type/install_ssh_keys.rb
index ec2923ef75..e4ee8249f3 100644
--- a/deployment/puppet/osnailyfacter/lib/puppet/type/install_ssh_keys.rb
+++ b/deployment/puppet/osnailyfacter/lib/puppet/type/install_ssh_keys.rb
@@ -32,16 +32,14 @@ ENDOFDOC
   newparam :private_key_path do
     desc 'Path to private key in temporary location'
     validate do |value|
-      raise Puppet::Error, "#{value} does not look like PATH" unless value =~ /^\/\S/
-      raise Puppet::Error, "#{value} no such file" unless File.exists? value
+      fail "#{value}: does not look like PATH" unless value =~ /^\/\S/
     end
   end
 
   newparam :public_key_path do
     desc 'Path to public key in temporary location'
     validate do |value|
-      raise Puppet::Error, "#{value} does not look like PATH" unless value =~ /^\/\S/
-      raise Puppet::Error, "#{value} no such file" unless File.exists? value
+      fail "#{value}: does not look like PATH" unless value =~ /^\/\S/
     end
   end
 
@@ -51,7 +49,7 @@ ENDOFDOC
     defaultto 'id_rsa'
 
     validate do |value|
-      raise Puppet::Error, "Private key name is empty!" if value.empty?
+      fail "Private key name is empty!" if value.empty?
     end
   end
 
@@ -61,7 +59,7 @@ ENDOFDOC
     defaultto 'id_rsa.pub'
 
     validate do |value|
-      raise Puppet::Error, "Public key name is empty!" if value.empty?
+      fail "Public key name is empty!" if value.empty?
     end
   end
 
@@ -70,8 +68,8 @@ ENDOFDOC
     defaultto 'authorized_keys'
 
     validate do |value|
-      unless ['authorized_keys', 'authorized_keys2'].include? value
-        raise Puppet::Error, "#{value} it should be authorized_keys or authorized_keys2"
+      unless %w(authorized_keys authorized_keys2).include? value
+        fail "#{value}: should be authorized_keys or authorized_keys2"
       end
     end
   end
diff --git a/deployment/puppet/osnailyfacter/modular/murano/murano.pp b/deployment/puppet/osnailyfacter/modular/murano/murano.pp
index 0f066705e1..efc745c3ad 100644
--- a/deployment/puppet/osnailyfacter/modular/murano/murano.pp
+++ b/deployment/puppet/osnailyfacter/modular/murano/murano.pp
@@ -23,6 +23,10 @@ $primary_controller         = hiera('primary_controller')
 
 if $murano_hash['enabled'] {
 
+  if ! $use_neutron {
+    fail 'Murano requires Neutron! Nova-Network is not supported!'
+  }
+
   ####### Disable upstart startup on install #######
   if($::operatingsystem == 'Ubuntu') {
     tweaks::ubuntu_service_override { ['murano_api', 'murano_engine']:
diff --git a/deployment/puppet/osnailyfacter/modular/virtual_ips/conntrackd.pp b/deployment/puppet/osnailyfacter/modular/virtual_ips/conntrackd.pp
index 81db0db2fd..906ea704d3 100644
--- a/deployment/puppet/osnailyfacter/modular/virtual_ips/conntrackd.pp
+++ b/deployment/puppet/osnailyfacter/modular/virtual_ips/conntrackd.pp
@@ -9,6 +9,8 @@ case $operatingsystem {
 ### CONNTRACKD for CentOS 6 doesn't work under namespaces ##
 
 if $operatingsystem == 'Ubuntu' {
+  $internal_address = hiera('internal_address')
+
   package { $conntrackd_package:
     ensure => installed,
   } ->
diff --git a/deployment/puppet/osnailyfacter/modular/vmware/vcenter.pp b/deployment/puppet/osnailyfacter/modular/vmware/vcenter.pp
index acc1edba36..db229585ea 100644
--- a/deployment/puppet/osnailyfacter/modular/vmware/vcenter.pp
+++ b/deployment/puppet/osnailyfacter/modular/vmware/vcenter.pp
@@ -8,6 +8,8 @@ $use_neutron = hiera('use_neutron', false)
 $ceilometer_hash = hiera('ceilometer',{})
 $debug = hiera('debug', false)
 
+echo($vcenter_hash)
+
 # vCenter integration
 if hiera('libvirt_type') == 'vcenter' {
   class { 'vmware' :
diff --git a/deployment/puppet/zabbix/lib/puppet/type/zabbix_host.rb b/deployment/puppet/zabbix/lib/puppet/type/zabbix_host.rb
index 4081f9664e..4f892716e4 100644
--- a/deployment/puppet/zabbix/lib/puppet/type/zabbix_host.rb
+++ b/deployment/puppet/zabbix/lib/puppet/type/zabbix_host.rb
@@ -31,13 +31,9 @@ Puppet::Type.newtype(:zabbix_host) do
     desc 'Host groups to add the host to.'
     isrequired
 
-    validate do |value|
-      fail("groups is not an array") unless value.kind_of?(Array) or value.kind_of?(String)
-      fail("groups array is empty") if value.empty?
-      value.each do |item|
-        fail("group name is not a string") unless item.kind_of?(String)
-        fail("group name is empty") unless item =~ /.+/
-      end
+    munge do |value|
+      value = [value] unless value.is_a? Array
+      value
     end
   end
 
@@ -81,4 +77,13 @@ Puppet::Type.newtype(:zabbix_host) do
     end
   end
 
+  def validate
+    value = self[:groups]
+    fail("groups is not an array") unless value.kind_of?(Array) or value.kind_of?(String)
+    fail("groups array is empty") if value.empty?
+    value.each do |item|
+      fail("group name is not a string") unless item.kind_of?(String)
+      fail("group name is empty") unless item =~ /.+/
+    end
+  end
 end
diff --git a/tests/noop/astute.yaml/novanet_flat.cinder-vmware.vcenter.yaml b/tests/noop/astute.yaml/novanet_flat.cinder-vmware.vcenter.yaml
new file mode 100644
index 0000000000..d61ec9f0a1
--- /dev/null
+++ b/tests/noop/astute.yaml/novanet_flat.cinder-vmware.vcenter.yaml
@@ -0,0 +1,686 @@
+---
+tasks:
+- priority: 100
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/hiera/hiera.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 200
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/globals/globals.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 300
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/logging/logging.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 400
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/tools/tools.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 500
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/umm/umm.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 600
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/netconfig/netconfig.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 700
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/firewall/firewall.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 800
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/hosts/hosts.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 900
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/zabbix/zabbix.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1000
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/cluster/cluster.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1100
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/virtual_ips/virtual_ips.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1200
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/cluster-haproxy/cluster-haproxy.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1300
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/openstack-haproxy/openstack-haproxy.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1400
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/dns/dns-server.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1500
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/dns/dns-client.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1600
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/ntp/ntp-server.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1700
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/database/database.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1800
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/ceilometer/controller.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1900
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/rabbitmq/rabbitmq.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2000
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/memcached/memcached.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2100
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/keystone/keystone.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2200
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/openstack-cinder/openstack-cinder.pp"
+    timeout: 1200
+    cwd: "/"
+- priority: 2300
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/glance/glance.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2400
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/openstack-controller/openstack-controller.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2500
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/openstack-network/openstack-network-controller.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2600
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/heat/heat.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2700
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/horizon/horizon.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2800
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/murano/murano.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2900
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/sahara/sahara.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 3000
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/api-proxy/api-proxy.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 3100
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/ceph/mon.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 3200
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/ceph/radosgw.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 3300
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/swift/swift.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 3400
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/roles/controller.pp"
+    timeout: 3600
+    cwd: "/"
+user_node_name: slave-01_controller
+uid: '1'
+storage:
+  iser: false
+  volumes_ceph: false
+  objects_ceph: false
+  ephemeral_ceph: false
+  volumes_lvm: false
+  volumes_vmdk: true
+  images_vcenter: true
+  osd_pool_size: '2'
+  pg_num: 128
+  images_ceph: false
+  metadata:
+    weight: 60
+    label: Storage
+management_vip: 10.108.2.2
+public_vip: 10.108.1.2
+syslog:
+  syslog_port: '514'
+  syslog_transport: tcp
+  syslog_server: ''
+  metadata:
+    weight: 50
+    label: Syslog
+libvirt_type: qemu
+puppet:
+  modules: rsync://10.108.0.2:/puppet/2014.2-6.1/modules/
+  manifests: rsync://10.108.0.2:/puppet/2014.2-6.1/manifests/
+nsx_plugin:
+  replication_mode: true
+  nsx_password: ''
+  nsx_username: admin
+  connector_type: stt
+  packages_url: ''
+  nsx_controllers: ''
+  l3_gw_service_uuid: ''
+  transport_zone_uuid: ''
+  metadata:
+    restrictions:
+    - action: hide
+      condition: cluster:net_provider != 'neutron' or networking_parameters:net_l23_provider
+        != 'nsx'
+    enabled: true
+    weight: 20
+    label: VMware NSX
+mysql:
+  root_password: NDG84Pcc
+  wsrep_password: 4JFDJzqR
+fail_if_error: true
+use_cow_images: true
+glance:
+  image_cache_max_size: '13868466176'
+  user_password: HQQj24u9
+  db_password: n1x6qtJg
+cobbler:
+  profile: centos-x86_64
+mongo:
+  enabled: true
+provision:
+  image_data:
+    "/boot":
+      container: gzip
+      uri: http://10.108.0.2:8080/targetimages/centos_65_x86_64-boot.img.gz
+      format: ext2
+    "/":
+      container: gzip
+      uri: http://10.108.0.2:8080/targetimages/centos_65_x86_64.img.gz
+      format: ext4
+  method: image
+  metadata:
+    weight: 80
+    label: Provision
+quantum_settings:
+  metadata:
+    metadata_proxy_shared_secret: i7fy2HtN
+  keystone:
+    admin_password: AMWxUzaE
+  database:
+    passwd: me99pk1l
+use_vcenter: true
+openstack_version: 2014.2-6.1
+public_vrouter_vip: 10.108.1.3
+kernel_params:
+  kernel: console=ttyS0,9600 console=tty0 biosdevname=0 crashkernel=none rootdelay=90
+    nomodeset
+  metadata:
+    weight: 40
+    label: Kernel parameters
+swift:
+  user_password: MdNIkfj3
+resume_guests_state_on_host_boot: true
+fixed_network_range: 10.0.0.0/16
+nova:
+  db_password: 2upYv98H
+  user_password: M9mWs2C0
+  state_path: "/var/lib/nova"
+master_ip: 10.108.0.2
+priority: 200
+external_dns:
+  dns_list: 8.8.8.8, 8.8.4.4
+  metadata:
+    weight: 90
+    label: Upstream DNS
+murano:
+  db_password: lDMWrLai
+  user_password: jF9pPs9a
+  enabled: true
+  rabbit_password: P46eXV4F
+role: cinder-vmware
+external_mongo:
+  mongo_db_name: ceilometer
+  mongo_replset: ''
+  mongo_user: ceilometer
+  hosts_ip: ''
+  mongo_password: ceilometer
+  metadata:
+    restrictions:
+    - action: hide
+      condition: settings:additional_components.mongo.value == false
+    weight: 20
+    label: External MongoDB
+online: true
+keystone:
+  db_password: rscfOUx4
+  admin_token: hrsjAgBf
+nodes:
+- user_node_name: slave-01_controller
+  uid: '1'
+  public_address: 10.108.1.4
+  internal_netmask: 255.255.255.0
+  fqdn: node-1.test.domain.local
+  role: primary-controller
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.4
+  storage_address: 10.108.4.2
+  swift_zone: '1'
+  storage_netmask: 255.255.255.0
+  name: node-1
+- user_node_name: slave-02_controller
+  uid: '2'
+  public_address: 10.108.1.5
+  internal_netmask: 255.255.255.0
+  fqdn: node-2.test.domain.local
+  role: controller
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.5
+  storage_address: 10.108.4.3
+  swift_zone: '2'
+  storage_netmask: 255.255.255.0
+  name: node-2
+- user_node_name: slave-03_controller
+  uid: '3'
+  public_address: 10.108.1.6
+  internal_netmask: 255.255.255.0
+  fqdn: node-3.test.domain.local
+  role: controller
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.6
+  storage_address: 10.108.4.4
+  swift_zone: '3'
+  storage_netmask: 255.255.255.0
+  name: node-3
+- user_node_name: slave-04_compute
+  uid: '4'
+  public_address: 10.108.1.7
+  internal_netmask: 255.255.255.0
+  fqdn: node-4.test.domain.local
+  role: compute
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.7
+  storage_address: 10.108.4.5
+  swift_zone: '4'
+  storage_netmask: 255.255.255.0
+  name: node-4
+- user_node_name: slave-05_mongo
+  uid: '5'
+  public_address: 10.108.1.8
+  internal_netmask: 255.255.255.0
+  fqdn: node-5.test.domain.local
+  role: primary-mongo
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.8
+  storage_address: 10.108.4.6
+  swift_zone: '5'
+  storage_netmask: 255.255.255.0
+  name: node-5
+nova_quota: false
+ceilometer:
+  db_password: cOPq2iRs
+  user_password: E7tYGtuu
+  metering_secret: 1euklWmj
+  enabled: true
+external_ntp:
+  ntp_list: 0.pool.ntp.org, 1.pool.ntp.org
+  metadata:
+    weight: 100
+    label: Upstream NTP
+metadata:
+  weight: 30
+  label: Common
+status: discover
+repo_setup:
+  repos:
+  - priority: 20
+    type: rpm
+    name: MOS
+    uri: http://10.108.0.2:8080/2014.2-6.1/centos/x86_64
+  metadata:
+    restrictions:
+    - action: hide
+      condition: 'true'
+    weight: 50
+    label: Repositories
+deployment_mode: ha_compact
+management_vrouter_vip: 10.108.2.3
+novanetwork_parameters:
+  network_manager: FlatDHCPManager
+  network_size: 65536
+  num_networks: 1
+sahara:
+  db_password: LwV220yW
+  user_password: xqnj91LB
+  enabled: true
+network_scheme:
+  transformations:
+  - action: add-br
+    name: br-fw-admin
+  - action: add-br
+    name: br-storage
+  - action: add-br
+    name: br-mgmt
+  - action: add-br
+    name: br-ex
+  - action: add-port
+    bridge: br-fw-admin
+    name: eth0
+  - action: add-port
+    bridge: br-ex
+    name: eth1
+  - action: add-port
+    bridge: br-mgmt
+    name: eth2
+  - action: add-port
+    bridge: br-storage
+    name: eth4
+  - action: add-port
+    name: eth3.103
+  roles:
+    management: br-mgmt
+    storage: br-storage
+    ex: br-ex
+    novanetwork/fixed: eth3.103
+    fw-admin: br-fw-admin
+  interfaces:
+    eth4: {}
+    eth3: {}
+    eth2: {}
+    eth1: {}
+    eth0: {}
+  version: '1.1'
+  provider: lnx
+  endpoints:
+    eth3.103:
+      IP: none
+    br-fw-admin:
+      IP:
+      - 10.108.0.3/24
+    br-storage:
+      IP:
+      - 10.108.4.2/24
+    br-mgmt:
+      IP:
+      - 10.108.2.4/24
+    br-ex:
+      IP:
+      - 10.108.1.4/24
+      gateway: 10.108.1.1
+heat:
+  db_password: ey8Q2Tmb
+  user_password: Z2rvUcbg
+  enabled: true
+  auth_encryption_key: d69db5365b0329c49d01155175f6a45f
+  rabbit_password: y4xH2ENh
+test_vm_image:
+  os_name: cirros
+  img_path: "/opt/vm/cirros-x86_64-disk.img"
+  container_format: bare
+  min_ram: 64
+  disk_format: qcow2
+  glance_properties: ''
+  img_name: TestVM
+  public: 'true'
+fuel_version: '6.1'
+rabbit:
+  password: U7sRLche
+public_network_assignment:
+  assign_to_all_nodes: false
+  metadata:
+    restrictions:
+    - action: hide
+      condition: cluster:net_provider != 'neutron'
+    weight: 50
+    label: Public network assignment
+management_network_range: 10.108.2.0/24
+base_syslog:
+  syslog_port: '514'
+  syslog_server: 10.108.0.2
+storage_network_range: 10.108.4.0/24
+workloads_collector:
+  username: workloads_collector
+  password: YN5rNkho
+  enabled: true
+  tenant: services
+  metadata:
+    restrictions:
+    - action: hide
+      condition: 'true'
+    weight: 10
+    label: Workloads Collector User
+floating_network_range:
+- 10.108.1.128-10.108.1.254
+auth_key: ''
+corosync:
+  verified: false
+  group: 226.94.1.1
+  port: '12000'
+  metadata:
+    restrictions:
+    - action: hide
+      condition: 'true'
+    weight: 50
+    label: Corosync
+access:
+  user: ceilometerHA
+  password: ceilometerHA
+  email: admin@localhost
+  tenant: ceilometerHA
+  metadata:
+    weight: 10
+    label: Access
+last_controller: node-3
+fqdn: node-1.test.domain.local
+auto_assign_floating_ip: false
+zabbix:
+  username: admin
+  db_password: EWqZG8w0
+  password: zabbix
+  metadata:
+    restrictions:
+    - action: hide
+      condition: not ('experimental' in version:feature_groups)
+    weight: 70
+    label: Zabbix Access
+  db_root_password: zxbaysgM
+mp:
+- weight: '1'
+  point: '1'
+- weight: '2'
+  point: '2'
+neutron_mellanox:
+  vf_num: '16'
+  plugin: disabled
+  metadata:
+    enabled: true
+    weight: 50
+    toggleable: false
+    label: Mellanox Neutron components
+dns_nameservers:
+- 8.8.4.4
+- 8.8.8.8
+debug: true
+cinder:
+  db_password: g9tWweJY
+  user_password: 0Q8lKhCc
+  fixed_key: fb64afea3f59f22d971956f8f773b93482fe3f6465067e5f5337c3e4391b172b
+deployment_id: 1
+openstack_version_prev: 
diff --git a/tests/noop/astute.yaml/novanet_flat.controller.platforms.yaml b/tests/noop/astute.yaml/novanet_flat.controller.platforms.yaml
new file mode 100644
index 0000000000..3548e16877
--- /dev/null
+++ b/tests/noop/astute.yaml/novanet_flat.controller.platforms.yaml
@@ -0,0 +1,696 @@
+---
+tasks:
+- priority: 100
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/hiera/hiera.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 200
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/globals/globals.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 300
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/logging/logging.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 400
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/tools/tools.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 500
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/umm/umm.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 600
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/netconfig/netconfig.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 700
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/firewall/firewall.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 800
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/hosts/hosts.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 900
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/zabbix/zabbix.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1000
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/cluster/cluster.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1100
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/virtual_ips/virtual_ips.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1200
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/cluster-haproxy/cluster-haproxy.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1300
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/openstack-haproxy/openstack-haproxy.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1400
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/dns/dns-server.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1500
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/dns/dns-client.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1600
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/ntp/ntp-server.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1700
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/database/database.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1800
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/ceilometer/controller.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1900
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/rabbitmq/rabbitmq.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2000
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/memcached/memcached.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2100
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/keystone/keystone.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2200
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/openstack-cinder/openstack-cinder.pp"
+    timeout: 1200
+    cwd: "/"
+- priority: 2300
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/glance/glance.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2400
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/openstack-controller/openstack-controller.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2500
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/openstack-network/openstack-network-controller.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2600
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/heat/heat.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2700
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/horizon/horizon.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2800
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/murano/murano.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2900
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/sahara/sahara.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 3000
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/api-proxy/api-proxy.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 3100
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/ceph/mon.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 3200
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/ceph/radosgw.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 3300
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/swift/swift.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 3400
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/roles/controller.pp"
+    timeout: 3600
+    cwd: "/"
+user_node_name: slave-01_controller
+uid: '1'
+storage:
+  iser: false
+  volumes_ceph: false
+  objects_ceph: false
+  ephemeral_ceph: false
+  volumes_lvm: true
+  images_vcenter: false
+  osd_pool_size: '2'
+  pg_num: 128
+  images_ceph: false
+  metadata:
+    weight: 60
+    label: Storage
+management_vip: 10.108.2.2
+public_vip: 10.108.1.2
+syslog:
+  syslog_port: '514'
+  syslog_transport: tcp
+  syslog_server: ''
+  metadata:
+    weight: 50
+    label: Syslog
+libvirt_type: qemu
+puppet:
+  modules: rsync://10.108.0.2:/puppet/2014.2-6.1/modules/
+  manifests: rsync://10.108.0.2:/puppet/2014.2-6.1/manifests/
+nsx_plugin:
+  replication_mode: true
+  nsx_password: ''
+  nsx_username: admin
+  connector_type: stt
+  packages_url: ''
+  nsx_controllers: ''
+  l3_gw_service_uuid: ''
+  transport_zone_uuid: ''
+  metadata:
+    restrictions:
+    - action: hide
+      condition: cluster:net_provider != 'neutron' or networking_parameters:net_l23_provider
+        != 'nsx'
+    enabled: false
+    weight: 20
+    label: VMware NSX
+mysql:
+  root_password: NDG84Pcc
+  wsrep_password: 4JFDJzqR
+fail_if_error: true
+use_cow_images: true
+glance:
+  image_cache_max_size: '13868466176'
+  user_password: HQQj24u9
+  db_password: n1x6qtJg
+cobbler:
+  profile: centos-x86_64
+mongo:
+  enabled: true
+provision:
+  image_data:
+    "/boot":
+      container: gzip
+      uri: http://10.108.0.2:8080/targetimages/centos_65_x86_64-boot.img.gz
+      format: ext2
+    "/":
+      container: gzip
+      uri: http://10.108.0.2:8080/targetimages/centos_65_x86_64.img.gz
+      format: ext4
+  method: image
+  metadata:
+    weight: 80
+    label: Provision
+quantum_settings:
+  metadata:
+    metadata_proxy_shared_secret: i7fy2HtN
+  keystone:
+    admin_password: AMWxUzaE
+  database:
+    passwd: me99pk1l
+use_vcenter: false
+openstack_version: 2014.2-6.1
+public_vrouter_vip: 10.108.1.3
+kernel_params:
+  kernel: console=ttyS0,9600 console=tty0 biosdevname=0 crashkernel=none rootdelay=90
+    nomodeset
+  metadata:
+    weight: 40
+    label: Kernel parameters
+swift:
+  user_password: MdNIkfj3
+resume_guests_state_on_host_boot: true
+fixed_network_range: 10.0.0.0/16
+nova:
+  db_password: 2upYv98H
+  user_password: M9mWs2C0
+  state_path: "/var/lib/nova"
+master_ip: 10.108.0.2
+priority: 200
+external_dns:
+  dns_list: 8.8.8.8, 8.8.4.4
+  metadata:
+    weight: 90
+    label: Upstream DNS
+murano:
+  db_password: lDMWrLai
+  user_password: jF9pPs9a
+  enabled: false
+  rabbit_password: P46eXV4F
+role: controller
+external_mongo:
+  mongo_db_name: ceilometer
+  mongo_replset: ''
+  mongo_user: ceilometer
+  hosts_ip: ''
+  mongo_password: ceilometer
+  metadata:
+    restrictions:
+    - action: hide
+      condition: settings:additional_components.mongo.value == false
+    weight: 20
+    label: External MongoDB
+online: true
+keystone:
+  db_password: rscfOUx4
+  admin_token: hrsjAgBf
+nodes:
+- user_node_name: slave-01_controller
+  uid: '1'
+  public_address: 10.108.1.4
+  internal_netmask: 255.255.255.0
+  fqdn: node-1.test.domain.local
+  role: primary-controller
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.4
+  storage_address: 10.108.4.2
+  swift_zone: '1'
+  storage_netmask: 255.255.255.0
+  name: node-1
+- user_node_name: slave-02_controller
+  uid: '2'
+  public_address: 10.108.1.5
+  internal_netmask: 255.255.255.0
+  fqdn: node-2.test.domain.local
+  role: controller
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.5
+  storage_address: 10.108.4.3
+  swift_zone: '2'
+  storage_netmask: 255.255.255.0
+  name: node-2
+- user_node_name: slave-03_controller
+  uid: '3'
+  public_address: 10.108.1.6
+  internal_netmask: 255.255.255.0
+  fqdn: node-3.test.domain.local
+  role: controller
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.6
+  storage_address: 10.108.4.4
+  swift_zone: '3'
+  storage_netmask: 255.255.255.0
+  name: node-3
+- user_node_name: slave-04_compute
+  uid: '4'
+  public_address: 10.108.1.7
+  internal_netmask: 255.255.255.0
+  fqdn: node-4.test.domain.local
+  role: compute
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.7
+  storage_address: 10.108.4.5
+  swift_zone: '4'
+  storage_netmask: 255.255.255.0
+  name: node-4
+- user_node_name: slave-05_mongo
+  uid: '5'
+  public_address: 10.108.1.8
+  internal_netmask: 255.255.255.0
+  fqdn: node-5.test.domain.local
+  role: primary-mongo
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.8
+  storage_address: 10.108.4.6
+  swift_zone: '5'
+  storage_netmask: 255.255.255.0
+  name: node-5
+- user_node_name: slave-06_mongo
+  uid: '6'
+  public_address: 10.108.1.9
+  internal_netmask: 255.255.255.0
+  fqdn: node-6.test.domain.local
+  role: mongo
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.9
+  storage_address: 10.108.4.7
+  storage_netmask: 255.255.255.0
+  name: node-6
+nova_quota: false
+ceilometer:
+  db_password: cOPq2iRs
+  user_password: E7tYGtuu
+  metering_secret: 1euklWmj
+  enabled: true
+external_ntp:
+  ntp_list: 0.pool.ntp.org, 1.pool.ntp.org
+  metadata:
+    weight: 100
+    label: Upstream NTP
+metadata:
+  weight: 30
+  label: Common
+status: discover
+repo_setup:
+  repos:
+  - priority: 20
+    type: rpm
+    name: MOS
+    uri: http://10.108.0.2:8080/2014.2-6.1/centos/x86_64
+  metadata:
+    restrictions:
+    - action: hide
+      condition: 'true'
+    weight: 50
+    label: Repositories
+deployment_mode: ha_compact
+management_vrouter_vip: 10.108.2.3
+novanetwork_parameters:
+  network_manager: FlatDHCPManager
+  network_size: 65536
+  num_networks: 1
+sahara:
+  db_password: LwV220yW
+  user_password: xqnj91LB
+  enabled: true
+network_scheme:
+  transformations:
+  - action: add-br
+    name: br-fw-admin
+  - action: add-br
+    name: br-storage
+  - action: add-br
+    name: br-mgmt
+  - action: add-br
+    name: br-ex
+  - action: add-port
+    bridge: br-fw-admin
+    name: eth0
+  - action: add-port
+    bridge: br-ex
+    name: eth1
+  - action: add-port
+    bridge: br-mgmt
+    name: eth2
+  - action: add-port
+    bridge: br-storage
+    name: eth4
+  - action: add-port
+    name: eth3.103
+  roles:
+    management: br-mgmt
+    storage: br-storage
+    ex: br-ex
+    novanetwork/fixed: eth3.103
+    fw-admin: br-fw-admin
+  interfaces:
+    eth4: {}
+    eth3: {}
+    eth2: {}
+    eth1: {}
+    eth0: {}
+  version: '1.1'
+  provider: lnx
+  endpoints:
+    eth3.103:
+      IP: none
+    br-fw-admin:
+      IP:
+      - 10.108.0.3/24
+    br-storage:
+      IP:
+      - 10.108.4.2/24
+    br-mgmt:
+      IP:
+      - 10.108.2.4/24
+    br-ex:
+      IP:
+      - 10.108.1.4/24
+      gateway: 10.108.1.1
+heat:
+  db_password: ey8Q2Tmb
+  user_password: Z2rvUcbg
+  enabled: true
+  auth_encryption_key: d69db5365b0329c49d01155175f6a45f
+  rabbit_password: y4xH2ENh
+test_vm_image:
+  os_name: cirros
+  img_path: "/opt/vm/cirros-x86_64-disk.img"
+  container_format: bare
+  min_ram: 64
+  disk_format: qcow2
+  glance_properties: ''
+  img_name: TestVM
+  public: 'true'
+fuel_version: '6.1'
+rabbit:
+  password: U7sRLche
+public_network_assignment:
+  assign_to_all_nodes: false
+  metadata:
+    restrictions:
+    - action: hide
+      condition: cluster:net_provider != 'neutron'
+    weight: 50
+    label: Public network assignment
+management_network_range: 10.108.2.0/24
+base_syslog:
+  syslog_port: '514'
+  syslog_server: 10.108.0.2
+storage_network_range: 10.108.4.0/24
+workloads_collector:
+  username: workloads_collector
+  password: YN5rNkho
+  enabled: true
+  tenant: services
+  metadata:
+    restrictions:
+    - action: hide
+      condition: 'true'
+    weight: 10
+    label: Workloads Collector User
+floating_network_range:
+- 10.108.1.128-10.108.1.254
+auth_key: ''
+corosync:
+  verified: false
+  group: 226.94.1.1
+  port: '12000'
+  metadata:
+    restrictions:
+    - action: hide
+      condition: 'true'
+    weight: 50
+    label: Corosync
+access:
+  user: ceilometerHA
+  password: ceilometerHA
+  email: admin@localhost
+  tenant: ceilometerHA
+  metadata:
+    weight: 10
+    label: Access
+last_controller: node-3
+fqdn: node-1.test.domain.local
+auto_assign_floating_ip: false
+zabbix:
+  username: admin
+  db_password: EWqZG8w0
+  password: zabbix
+  metadata:
+    restrictions:
+    - action: hide
+      condition: not ('experimental' in version:feature_groups)
+    weight: 70
+    label: Zabbix Access
+  db_root_password: zxbaysgM
+mp:
+- weight: '1'
+  point: '1'
+- weight: '2'
+  point: '2'
+neutron_mellanox:
+  vf_num: '16'
+  plugin: disabled
+  metadata:
+    enabled: true
+    weight: 50
+    toggleable: false
+    label: Mellanox Neutron components
+dns_nameservers:
+- 8.8.4.4
+- 8.8.8.8
+debug: true
+cinder:
+  db_password: g9tWweJY
+  user_password: 0Q8lKhCc
+  fixed_key: fb64afea3f59f22d971956f8f773b93482fe3f6465067e5f5337c3e4391b172b
+deployment_id: 1
+openstack_version_prev: 
diff --git a/tests/noop/astute.yaml/novanet_flat.mongo.platforms.yaml b/tests/noop/astute.yaml/novanet_flat.mongo.platforms.yaml
new file mode 100644
index 0000000000..a46ddb56ea
--- /dev/null
+++ b/tests/noop/astute.yaml/novanet_flat.mongo.platforms.yaml
@@ -0,0 +1,696 @@
+---
+tasks:
+- priority: 100
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/hiera/hiera.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 200
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/globals/globals.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 300
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/logging/logging.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 400
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/tools/tools.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 500
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/umm/umm.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 600
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/netconfig/netconfig.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 700
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/firewall/firewall.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 800
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/hosts/hosts.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 900
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/zabbix/zabbix.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1000
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/cluster/cluster.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1100
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/virtual_ips/virtual_ips.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1200
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/cluster-haproxy/cluster-haproxy.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1300
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/openstack-haproxy/openstack-haproxy.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1400
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/dns/dns-server.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1500
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/dns/dns-client.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1600
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/ntp/ntp-server.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1700
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/database/database.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1800
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/ceilometer/controller.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1900
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/rabbitmq/rabbitmq.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2000
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/memcached/memcached.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2100
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/keystone/keystone.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2200
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/openstack-cinder/openstack-cinder.pp"
+    timeout: 1200
+    cwd: "/"
+- priority: 2300
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/glance/glance.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2400
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/openstack-controller/openstack-controller.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2500
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/openstack-network/openstack-network-controller.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2600
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/heat/heat.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2700
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/horizon/horizon.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2800
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/murano/murano.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2900
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/sahara/sahara.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 3000
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/api-proxy/api-proxy.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 3100
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/ceph/mon.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 3200
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/ceph/radosgw.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 3300
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/swift/swift.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 3400
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/roles/controller.pp"
+    timeout: 3600
+    cwd: "/"
+user_node_name: slave-01_controller
+uid: '1'
+storage:
+  iser: false
+  volumes_ceph: false
+  objects_ceph: false
+  ephemeral_ceph: false
+  volumes_lvm: true
+  images_vcenter: false
+  osd_pool_size: '2'
+  pg_num: 128
+  images_ceph: false
+  metadata:
+    weight: 60
+    label: Storage
+management_vip: 10.108.2.2
+public_vip: 10.108.1.2
+syslog:
+  syslog_port: '514'
+  syslog_transport: tcp
+  syslog_server: ''
+  metadata:
+    weight: 50
+    label: Syslog
+libvirt_type: qemu
+puppet:
+  modules: rsync://10.108.0.2:/puppet/2014.2-6.1/modules/
+  manifests: rsync://10.108.0.2:/puppet/2014.2-6.1/manifests/
+nsx_plugin:
+  replication_mode: true
+  nsx_password: ''
+  nsx_username: admin
+  connector_type: stt
+  packages_url: ''
+  nsx_controllers: ''
+  l3_gw_service_uuid: ''
+  transport_zone_uuid: ''
+  metadata:
+    restrictions:
+    - action: hide
+      condition: cluster:net_provider != 'neutron' or networking_parameters:net_l23_provider
+        != 'nsx'
+    enabled: false
+    weight: 20
+    label: VMware NSX
+mysql:
+  root_password: NDG84Pcc
+  wsrep_password: 4JFDJzqR
+fail_if_error: true
+use_cow_images: true
+glance:
+  image_cache_max_size: '13868466176'
+  user_password: HQQj24u9
+  db_password: n1x6qtJg
+cobbler:
+  profile: centos-x86_64
+mongo:
+  enabled: true
+provision:
+  image_data:
+    "/boot":
+      container: gzip
+      uri: http://10.108.0.2:8080/targetimages/centos_65_x86_64-boot.img.gz
+      format: ext2
+    "/":
+      container: gzip
+      uri: http://10.108.0.2:8080/targetimages/centos_65_x86_64.img.gz
+      format: ext4
+  method: image
+  metadata:
+    weight: 80
+    label: Provision
+quantum_settings:
+  metadata:
+    metadata_proxy_shared_secret: i7fy2HtN
+  keystone:
+    admin_password: AMWxUzaE
+  database:
+    passwd: me99pk1l
+use_vcenter: false
+openstack_version: 2014.2-6.1
+public_vrouter_vip: 10.108.1.3
+kernel_params:
+  kernel: console=ttyS0,9600 console=tty0 biosdevname=0 crashkernel=none rootdelay=90
+    nomodeset
+  metadata:
+    weight: 40
+    label: Kernel parameters
+swift:
+  user_password: MdNIkfj3
+resume_guests_state_on_host_boot: true
+fixed_network_range: 10.0.0.0/16
+nova:
+  db_password: 2upYv98H
+  user_password: M9mWs2C0
+  state_path: "/var/lib/nova"
+master_ip: 10.108.0.2
+priority: 200
+external_dns:
+  dns_list: 8.8.8.8, 8.8.4.4
+  metadata:
+    weight: 90
+    label: Upstream DNS
+murano:
+  db_password: lDMWrLai
+  user_password: jF9pPs9a
+  enabled: true
+  rabbit_password: P46eXV4F
+role: mongo
+external_mongo:
+  mongo_db_name: ceilometer
+  mongo_replset: ''
+  mongo_user: ceilometer
+  hosts_ip: ''
+  mongo_password: ceilometer
+  metadata:
+    restrictions:
+    - action: hide
+      condition: settings:additional_components.mongo.value == false
+    weight: 20
+    label: External MongoDB
+online: true
+keystone:
+  db_password: rscfOUx4
+  admin_token: hrsjAgBf
+nodes:
+- user_node_name: slave-01_controller
+  uid: '1'
+  public_address: 10.108.1.4
+  internal_netmask: 255.255.255.0
+  fqdn: node-1.test.domain.local
+  role: primary-controller
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.4
+  storage_address: 10.108.4.2
+  swift_zone: '1'
+  storage_netmask: 255.255.255.0
+  name: node-1
+- user_node_name: slave-02_controller
+  uid: '2'
+  public_address: 10.108.1.5
+  internal_netmask: 255.255.255.0
+  fqdn: node-2.test.domain.local
+  role: controller
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.5
+  storage_address: 10.108.4.3
+  swift_zone: '2'
+  storage_netmask: 255.255.255.0
+  name: node-2
+- user_node_name: slave-03_controller
+  uid: '3'
+  public_address: 10.108.1.6
+  internal_netmask: 255.255.255.0
+  fqdn: node-3.test.domain.local
+  role: controller
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.6
+  storage_address: 10.108.4.4
+  swift_zone: '3'
+  storage_netmask: 255.255.255.0
+  name: node-3
+- user_node_name: slave-04_compute
+  uid: '4'
+  public_address: 10.108.1.7
+  internal_netmask: 255.255.255.0
+  fqdn: node-4.test.domain.local
+  role: compute
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.7
+  storage_address: 10.108.4.5
+  swift_zone: '4'
+  storage_netmask: 255.255.255.0
+  name: node-4
+- user_node_name: slave-05_mongo
+  uid: '5'
+  public_address: 10.108.1.8
+  internal_netmask: 255.255.255.0
+  fqdn: node-5.test.domain.local
+  role: primary-mongo
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.8
+  storage_address: 10.108.4.6
+  swift_zone: '5'
+  storage_netmask: 255.255.255.0
+  name: node-5
+- user_node_name: slave-06_mongo
+  uid: '6'
+  public_address: 10.108.1.9
+  internal_netmask: 255.255.255.0
+  fqdn: node-6.test.domain.local
+  role: mongo
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.9
+  storage_address: 10.108.4.7
+  storage_netmask: 255.255.255.0
+  name: node-6
+nova_quota: false
+ceilometer:
+  db_password: cOPq2iRs
+  user_password: E7tYGtuu
+  metering_secret: 1euklWmj
+  enabled: true
+external_ntp:
+  ntp_list: 0.pool.ntp.org, 1.pool.ntp.org
+  metadata:
+    weight: 100
+    label: Upstream NTP
+metadata:
+  weight: 30
+  label: Common
+status: discover
+repo_setup:
+  repos:
+  - priority: 20
+    type: rpm
+    name: MOS
+    uri: http://10.108.0.2:8080/2014.2-6.1/centos/x86_64
+  metadata:
+    restrictions:
+    - action: hide
+      condition: 'true'
+    weight: 50
+    label: Repositories
+deployment_mode: ha_compact
+management_vrouter_vip: 10.108.2.3
+novanetwork_parameters:
+  network_manager: FlatDHCPManager
+  network_size: 65536
+  num_networks: 1
+sahara:
+  db_password: LwV220yW
+  user_password: xqnj91LB
+  enabled: true
+network_scheme:
+  transformations:
+  - action: add-br
+    name: br-fw-admin
+  - action: add-br
+    name: br-storage
+  - action: add-br
+    name: br-mgmt
+  - action: add-br
+    name: br-ex
+  - action: add-port
+    bridge: br-fw-admin
+    name: eth0
+  - action: add-port
+    bridge: br-ex
+    name: eth1
+  - action: add-port
+    bridge: br-mgmt
+    name: eth2
+  - action: add-port
+    bridge: br-storage
+    name: eth4
+  - action: add-port
+    name: eth3.103
+  roles:
+    management: br-mgmt
+    storage: br-storage
+    ex: br-ex
+    novanetwork/fixed: eth3.103
+    fw-admin: br-fw-admin
+  interfaces:
+    eth4: {}
+    eth3: {}
+    eth2: {}
+    eth1: {}
+    eth0: {}
+  version: '1.1'
+  provider: lnx
+  endpoints:
+    eth3.103:
+      IP: none
+    br-fw-admin:
+      IP:
+      - 10.108.0.3/24
+    br-storage:
+      IP:
+      - 10.108.4.2/24
+    br-mgmt:
+      IP:
+      - 10.108.2.4/24
+    br-ex:
+      IP:
+      - 10.108.1.4/24
+      gateway: 10.108.1.1
+heat:
+  db_password: ey8Q2Tmb
+  user_password: Z2rvUcbg
+  enabled: true
+  auth_encryption_key: d69db5365b0329c49d01155175f6a45f
+  rabbit_password: y4xH2ENh
+test_vm_image:
+  os_name: cirros
+  img_path: "/opt/vm/cirros-x86_64-disk.img"
+  container_format: bare
+  min_ram: 64
+  disk_format: qcow2
+  glance_properties: ''
+  img_name: TestVM
+  public: 'true'
+fuel_version: '6.1'
+rabbit:
+  password: U7sRLche
+public_network_assignment:
+  assign_to_all_nodes: false
+  metadata:
+    restrictions:
+    - action: hide
+      condition: cluster:net_provider != 'neutron'
+    weight: 50
+    label: Public network assignment
+management_network_range: 10.108.2.0/24
+base_syslog:
+  syslog_port: '514'
+  syslog_server: 10.108.0.2
+storage_network_range: 10.108.4.0/24
+workloads_collector:
+  username: workloads_collector
+  password: YN5rNkho
+  enabled: true
+  tenant: services
+  metadata:
+    restrictions:
+    - action: hide
+      condition: 'true'
+    weight: 10
+    label: Workloads Collector User
+floating_network_range:
+- 10.108.1.128-10.108.1.254
+auth_key: ''
+corosync:
+  verified: false
+  group: 226.94.1.1
+  port: '12000'
+  metadata:
+    restrictions:
+    - action: hide
+      condition: 'true'
+    weight: 50
+    label: Corosync
+access:
+  user: ceilometerHA
+  password: ceilometerHA
+  email: admin@localhost
+  tenant: ceilometerHA
+  metadata:
+    weight: 10
+    label: Access
+last_controller: node-3
+fqdn: node-1.test.domain.local
+auto_assign_floating_ip: false
+zabbix:
+  username: admin
+  db_password: EWqZG8w0
+  password: zabbix
+  metadata:
+    restrictions:
+    - action: hide
+      condition: not ('experimental' in version:feature_groups)
+    weight: 70
+    label: Zabbix Access
+  db_root_password: zxbaysgM
+mp:
+- weight: '1'
+  point: '1'
+- weight: '2'
+  point: '2'
+neutron_mellanox:
+  vf_num: '16'
+  plugin: disabled
+  metadata:
+    enabled: true
+    weight: 50
+    toggleable: false
+    label: Mellanox Neutron components
+dns_nameservers:
+- 8.8.4.4
+- 8.8.8.8
+debug: true
+cinder:
+  db_password: g9tWweJY
+  user_password: 0Q8lKhCc
+  fixed_key: fb64afea3f59f22d971956f8f773b93482fe3f6465067e5f5337c3e4391b172b
+deployment_id: 1
+openstack_version_prev: 
diff --git a/tests/noop/astute.yaml/novanet_flat.primary-controller.platforms.yaml b/tests/noop/astute.yaml/novanet_flat.primary-controller.platforms.yaml
new file mode 100644
index 0000000000..8c16a99e19
--- /dev/null
+++ b/tests/noop/astute.yaml/novanet_flat.primary-controller.platforms.yaml
@@ -0,0 +1,696 @@
+---
+tasks:
+- priority: 100
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/hiera/hiera.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 200
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/globals/globals.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 300
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/logging/logging.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 400
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/tools/tools.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 500
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/umm/umm.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 600
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/netconfig/netconfig.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 700
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/firewall/firewall.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 800
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/hosts/hosts.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 900
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/zabbix/zabbix.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1000
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/cluster/cluster.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1100
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/virtual_ips/virtual_ips.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1200
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/cluster-haproxy/cluster-haproxy.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1300
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/openstack-haproxy/openstack-haproxy.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1400
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/dns/dns-server.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1500
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/dns/dns-client.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1600
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/ntp/ntp-server.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1700
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/database/database.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1800
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/ceilometer/controller.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1900
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/rabbitmq/rabbitmq.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2000
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/memcached/memcached.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2100
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/keystone/keystone.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2200
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/openstack-cinder/openstack-cinder.pp"
+    timeout: 1200
+    cwd: "/"
+- priority: 2300
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/glance/glance.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2400
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/openstack-controller/openstack-controller.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2500
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/openstack-network/openstack-network-controller.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2600
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/heat/heat.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2700
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/horizon/horizon.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2800
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/murano/murano.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2900
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/sahara/sahara.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 3000
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/api-proxy/api-proxy.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 3100
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/ceph/mon.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 3200
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/ceph/radosgw.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 3300
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/swift/swift.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 3400
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/roles/controller.pp"
+    timeout: 3600
+    cwd: "/"
+user_node_name: slave-01_controller
+uid: '1'
+storage:
+  iser: false
+  volumes_ceph: false
+  objects_ceph: false
+  ephemeral_ceph: false
+  volumes_lvm: true
+  images_vcenter: false
+  osd_pool_size: '2'
+  pg_num: 128
+  images_ceph: false
+  metadata:
+    weight: 60
+    label: Storage
+management_vip: 10.108.2.2
+public_vip: 10.108.1.2
+syslog:
+  syslog_port: '514'
+  syslog_transport: tcp
+  syslog_server: ''
+  metadata:
+    weight: 50
+    label: Syslog
+libvirt_type: qemu
+puppet:
+  modules: rsync://10.108.0.2:/puppet/2014.2-6.1/modules/
+  manifests: rsync://10.108.0.2:/puppet/2014.2-6.1/manifests/
+nsx_plugin:
+  replication_mode: true
+  nsx_password: ''
+  nsx_username: admin
+  connector_type: stt
+  packages_url: ''
+  nsx_controllers: ''
+  l3_gw_service_uuid: ''
+  transport_zone_uuid: ''
+  metadata:
+    restrictions:
+    - action: hide
+      condition: cluster:net_provider != 'neutron' or networking_parameters:net_l23_provider
+        != 'nsx'
+    enabled: false
+    weight: 20
+    label: VMware NSX
+mysql:
+  root_password: NDG84Pcc
+  wsrep_password: 4JFDJzqR
+fail_if_error: true
+use_cow_images: true
+glance:
+  image_cache_max_size: '13868466176'
+  user_password: HQQj24u9
+  db_password: n1x6qtJg
+cobbler:
+  profile: centos-x86_64
+mongo:
+  enabled: true
+provision:
+  image_data:
+    "/boot":
+      container: gzip
+      uri: http://10.108.0.2:8080/targetimages/centos_65_x86_64-boot.img.gz
+      format: ext2
+    "/":
+      container: gzip
+      uri: http://10.108.0.2:8080/targetimages/centos_65_x86_64.img.gz
+      format: ext4
+  method: image
+  metadata:
+    weight: 80
+    label: Provision
+quantum_settings:
+  metadata:
+    metadata_proxy_shared_secret: i7fy2HtN
+  keystone:
+    admin_password: AMWxUzaE
+  database:
+    passwd: me99pk1l
+use_vcenter: false
+openstack_version: 2014.2-6.1
+public_vrouter_vip: 10.108.1.3
+kernel_params:
+  kernel: console=ttyS0,9600 console=tty0 biosdevname=0 crashkernel=none rootdelay=90
+    nomodeset
+  metadata:
+    weight: 40
+    label: Kernel parameters
+swift:
+  user_password: MdNIkfj3
+resume_guests_state_on_host_boot: true
+fixed_network_range: 10.0.0.0/16
+nova:
+  db_password: 2upYv98H
+  user_password: M9mWs2C0
+  state_path: "/var/lib/nova"
+master_ip: 10.108.0.2
+priority: 200
+external_dns:
+  dns_list: 8.8.8.8, 8.8.4.4
+  metadata:
+    weight: 90
+    label: Upstream DNS
+murano:
+  db_password: lDMWrLai
+  user_password: jF9pPs9a
+  enabled: false
+  rabbit_password: P46eXV4F
+role: primary-controller
+external_mongo:
+  mongo_db_name: ceilometer
+  mongo_replset: ''
+  mongo_user: ceilometer
+  hosts_ip: ''
+  mongo_password: ceilometer
+  metadata:
+    restrictions:
+    - action: hide
+      condition: settings:additional_components.mongo.value == false
+    weight: 20
+    label: External MongoDB
+online: true
+keystone:
+  db_password: rscfOUx4
+  admin_token: hrsjAgBf
+nodes:
+- user_node_name: slave-01_controller
+  uid: '1'
+  public_address: 10.108.1.4
+  internal_netmask: 255.255.255.0
+  fqdn: node-1.test.domain.local
+  role: primary-controller
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.4
+  storage_address: 10.108.4.2
+  swift_zone: '1'
+  storage_netmask: 255.255.255.0
+  name: node-1
+- user_node_name: slave-02_controller
+  uid: '2'
+  public_address: 10.108.1.5
+  internal_netmask: 255.255.255.0
+  fqdn: node-2.test.domain.local
+  role: controller
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.5
+  storage_address: 10.108.4.3
+  swift_zone: '2'
+  storage_netmask: 255.255.255.0
+  name: node-2
+- user_node_name: slave-03_controller
+  uid: '3'
+  public_address: 10.108.1.6
+  internal_netmask: 255.255.255.0
+  fqdn: node-3.test.domain.local
+  role: controller
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.6
+  storage_address: 10.108.4.4
+  swift_zone: '3'
+  storage_netmask: 255.255.255.0
+  name: node-3
+- user_node_name: slave-04_compute
+  uid: '4'
+  public_address: 10.108.1.7
+  internal_netmask: 255.255.255.0
+  fqdn: node-4.test.domain.local
+  role: compute
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.7
+  storage_address: 10.108.4.5
+  swift_zone: '4'
+  storage_netmask: 255.255.255.0
+  name: node-4
+- user_node_name: slave-05_mongo
+  uid: '5'
+  public_address: 10.108.1.8
+  internal_netmask: 255.255.255.0
+  fqdn: node-5.test.domain.local
+  role: primary-mongo
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.8
+  storage_address: 10.108.4.6
+  swift_zone: '5'
+  storage_netmask: 255.255.255.0
+  name: node-5
+- user_node_name: slave-06_mongo
+  uid: '6'
+  public_address: 10.108.1.9
+  internal_netmask: 255.255.255.0
+  fqdn: node-6.test.domain.local
+  role: mongo
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.9
+  storage_address: 10.108.4.7
+  storage_netmask: 255.255.255.0
+  name: node-6
+nova_quota: false
+ceilometer:
+  db_password: cOPq2iRs
+  user_password: E7tYGtuu
+  metering_secret: 1euklWmj
+  enabled: true
+external_ntp:
+  ntp_list: 0.pool.ntp.org, 1.pool.ntp.org
+  metadata:
+    weight: 100
+    label: Upstream NTP
+metadata:
+  weight: 30
+  label: Common
+status: discover
+repo_setup:
+  repos:
+  - priority: 20
+    type: rpm
+    name: MOS
+    uri: http://10.108.0.2:8080/2014.2-6.1/centos/x86_64
+  metadata:
+    restrictions:
+    - action: hide
+      condition: 'true'
+    weight: 50
+    label: Repositories
+deployment_mode: ha_compact
+management_vrouter_vip: 10.108.2.3
+novanetwork_parameters:
+  network_manager: FlatDHCPManager
+  network_size: 65536
+  num_networks: 1
+sahara:
+  db_password: LwV220yW
+  user_password: xqnj91LB
+  enabled: true
+network_scheme:
+  transformations:
+  - action: add-br
+    name: br-fw-admin
+  - action: add-br
+    name: br-storage
+  - action: add-br
+    name: br-mgmt
+  - action: add-br
+    name: br-ex
+  - action: add-port
+    bridge: br-fw-admin
+    name: eth0
+  - action: add-port
+    bridge: br-ex
+    name: eth1
+  - action: add-port
+    bridge: br-mgmt
+    name: eth2
+  - action: add-port
+    bridge: br-storage
+    name: eth4
+  - action: add-port
+    name: eth3.103
+  roles:
+    management: br-mgmt
+    storage: br-storage
+    ex: br-ex
+    novanetwork/fixed: eth3.103
+    fw-admin: br-fw-admin
+  interfaces:
+    eth4: {}
+    eth3: {}
+    eth2: {}
+    eth1: {}
+    eth0: {}
+  version: '1.1'
+  provider: lnx
+  endpoints:
+    eth3.103:
+      IP: none
+    br-fw-admin:
+      IP:
+      - 10.108.0.3/24
+    br-storage:
+      IP:
+      - 10.108.4.2/24
+    br-mgmt:
+      IP:
+      - 10.108.2.4/24
+    br-ex:
+      IP:
+      - 10.108.1.4/24
+      gateway: 10.108.1.1
+heat:
+  db_password: ey8Q2Tmb
+  user_password: Z2rvUcbg
+  enabled: true
+  auth_encryption_key: d69db5365b0329c49d01155175f6a45f
+  rabbit_password: y4xH2ENh
+test_vm_image:
+  os_name: cirros
+  img_path: "/opt/vm/cirros-x86_64-disk.img"
+  container_format: bare
+  min_ram: 64
+  disk_format: qcow2
+  glance_properties: ''
+  img_name: TestVM
+  public: 'true'
+fuel_version: '6.1'
+rabbit:
+  password: U7sRLche
+public_network_assignment:
+  assign_to_all_nodes: false
+  metadata:
+    restrictions:
+    - action: hide
+      condition: cluster:net_provider != 'neutron'
+    weight: 50
+    label: Public network assignment
+management_network_range: 10.108.2.0/24
+base_syslog:
+  syslog_port: '514'
+  syslog_server: 10.108.0.2
+storage_network_range: 10.108.4.0/24
+workloads_collector:
+  username: workloads_collector
+  password: YN5rNkho
+  enabled: true
+  tenant: services
+  metadata:
+    restrictions:
+    - action: hide
+      condition: 'true'
+    weight: 10
+    label: Workloads Collector User
+floating_network_range:
+- 10.108.1.128-10.108.1.254
+auth_key: ''
+corosync:
+  verified: false
+  group: 226.94.1.1
+  port: '12000'
+  metadata:
+    restrictions:
+    - action: hide
+      condition: 'true'
+    weight: 50
+    label: Corosync
+access:
+  user: ceilometerHA
+  password: ceilometerHA
+  email: admin@localhost
+  tenant: ceilometerHA
+  metadata:
+    weight: 10
+    label: Access
+last_controller: node-3
+fqdn: node-1.test.domain.local
+auto_assign_floating_ip: false
+zabbix:
+  username: admin
+  db_password: EWqZG8w0
+  password: zabbix
+  metadata:
+    restrictions:
+    - action: hide
+      condition: not ('experimental' in version:feature_groups)
+    weight: 70
+    label: Zabbix Access
+  db_root_password: zxbaysgM
+mp:
+- weight: '1'
+  point: '1'
+- weight: '2'
+  point: '2'
+neutron_mellanox:
+  vf_num: '16'
+  plugin: disabled
+  metadata:
+    enabled: true
+    weight: 50
+    toggleable: false
+    label: Mellanox Neutron components
+dns_nameservers:
+- 8.8.4.4
+- 8.8.8.8
+debug: true
+cinder:
+  db_password: g9tWweJY
+  user_password: 0Q8lKhCc
+  fixed_key: fb64afea3f59f22d971956f8f773b93482fe3f6465067e5f5337c3e4391b172b
+deployment_id: 1
+openstack_version_prev: 
diff --git a/tests/noop/astute.yaml/novanet_flat.primary-controller.vcenter.yaml b/tests/noop/astute.yaml/novanet_flat.primary-controller.vcenter.yaml
new file mode 100644
index 0000000000..a24bf18233
--- /dev/null
+++ b/tests/noop/astute.yaml/novanet_flat.primary-controller.vcenter.yaml
@@ -0,0 +1,685 @@
+---
+tasks:
+- priority: 100
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/hiera/hiera.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 200
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/globals/globals.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 300
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/logging/logging.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 400
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/tools/tools.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 500
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/umm/umm.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 600
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/netconfig/netconfig.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 700
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/firewall/firewall.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 800
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/hosts/hosts.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 900
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/zabbix/zabbix.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1000
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/cluster/cluster.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1100
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/virtual_ips/virtual_ips.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1200
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/cluster-haproxy/cluster-haproxy.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1300
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/openstack-haproxy/openstack-haproxy.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1400
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/dns/dns-server.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1500
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/dns/dns-client.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1600
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/ntp/ntp-server.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1700
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/database/database.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1800
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/ceilometer/controller.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1900
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/rabbitmq/rabbitmq.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2000
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/memcached/memcached.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2100
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/keystone/keystone.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2200
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/openstack-cinder/openstack-cinder.pp"
+    timeout: 1200
+    cwd: "/"
+- priority: 2300
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/glance/glance.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2400
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/openstack-controller/openstack-controller.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2500
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/openstack-network/openstack-network-controller.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2600
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/heat/heat.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2700
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/horizon/horizon.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2800
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/murano/murano.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2900
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/sahara/sahara.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 3000
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/api-proxy/api-proxy.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 3100
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/ceph/mon.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 3200
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/ceph/radosgw.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 3300
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/swift/swift.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 3400
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/roles/controller.pp"
+    timeout: 3600
+    cwd: "/"
+user_node_name: slave-01_controller
+uid: '1'
+storage:
+  iser: false
+  volumes_ceph: false
+  objects_ceph: false
+  ephemeral_ceph: false
+  volumes_lvm: true
+  images_vcenter: false
+  osd_pool_size: '2'
+  pg_num: 128
+  images_ceph: false
+  metadata:
+    weight: 60
+    label: Storage
+management_vip: 10.108.2.2
+public_vip: 10.108.1.2
+syslog:
+  syslog_port: '514'
+  syslog_transport: tcp
+  syslog_server: ''
+  metadata:
+    weight: 50
+    label: Syslog
+libvirt_type: qemu
+puppet:
+  modules: rsync://10.108.0.2:/puppet/2014.2-6.1/modules/
+  manifests: rsync://10.108.0.2:/puppet/2014.2-6.1/manifests/
+nsx_plugin:
+  replication_mode: true
+  nsx_password: ''
+  nsx_username: admin
+  connector_type: stt
+  packages_url: ''
+  nsx_controllers: ''
+  l3_gw_service_uuid: ''
+  transport_zone_uuid: ''
+  metadata:
+    restrictions:
+    - action: hide
+      condition: cluster:net_provider != 'neutron' or networking_parameters:net_l23_provider
+        != 'nsx'
+    enabled: true
+    weight: 20
+    label: VMware NSX
+mysql:
+  root_password: NDG84Pcc
+  wsrep_password: 4JFDJzqR
+fail_if_error: true
+use_cow_images: true
+glance:
+  image_cache_max_size: '13868466176'
+  user_password: HQQj24u9
+  db_password: n1x6qtJg
+cobbler:
+  profile: centos-x86_64
+mongo:
+  enabled: true
+provision:
+  image_data:
+    "/boot":
+      container: gzip
+      uri: http://10.108.0.2:8080/targetimages/centos_65_x86_64-boot.img.gz
+      format: ext2
+    "/":
+      container: gzip
+      uri: http://10.108.0.2:8080/targetimages/centos_65_x86_64.img.gz
+      format: ext4
+  method: image
+  metadata:
+    weight: 80
+    label: Provision
+quantum_settings:
+  metadata:
+    metadata_proxy_shared_secret: i7fy2HtN
+  keystone:
+    admin_password: AMWxUzaE
+  database:
+    passwd: me99pk1l
+use_vcenter: false
+openstack_version: 2014.2-6.1
+public_vrouter_vip: 10.108.1.3
+kernel_params:
+  kernel: console=ttyS0,9600 console=tty0 biosdevname=0 crashkernel=none rootdelay=90
+    nomodeset
+  metadata:
+    weight: 40
+    label: Kernel parameters
+swift:
+  user_password: MdNIkfj3
+resume_guests_state_on_host_boot: true
+fixed_network_range: 10.0.0.0/16
+nova:
+  db_password: 2upYv98H
+  user_password: M9mWs2C0
+  state_path: "/var/lib/nova"
+master_ip: 10.108.0.2
+priority: 200
+external_dns:
+  dns_list: 8.8.8.8, 8.8.4.4
+  metadata:
+    weight: 90
+    label: Upstream DNS
+murano:
+  db_password: lDMWrLai
+  user_password: jF9pPs9a
+  enabled: false
+  rabbit_password: P46eXV4F
+role: primary-controller
+external_mongo:
+  mongo_db_name: ceilometer
+  mongo_replset: ''
+  mongo_user: ceilometer
+  hosts_ip: ''
+  mongo_password: ceilometer
+  metadata:
+    restrictions:
+    - action: hide
+      condition: settings:additional_components.mongo.value == false
+    weight: 20
+    label: External MongoDB
+online: true
+keystone:
+  db_password: rscfOUx4
+  admin_token: hrsjAgBf
+nodes:
+- user_node_name: slave-01_controller
+  uid: '1'
+  public_address: 10.108.1.4
+  internal_netmask: 255.255.255.0
+  fqdn: node-1.test.domain.local
+  role: primary-controller
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.4
+  storage_address: 10.108.4.2
+  swift_zone: '1'
+  storage_netmask: 255.255.255.0
+  name: node-1
+- user_node_name: slave-02_controller
+  uid: '2'
+  public_address: 10.108.1.5
+  internal_netmask: 255.255.255.0
+  fqdn: node-2.test.domain.local
+  role: controller
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.5
+  storage_address: 10.108.4.3
+  swift_zone: '2'
+  storage_netmask: 255.255.255.0
+  name: node-2
+- user_node_name: slave-03_controller
+  uid: '3'
+  public_address: 10.108.1.6
+  internal_netmask: 255.255.255.0
+  fqdn: node-3.test.domain.local
+  role: controller
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.6
+  storage_address: 10.108.4.4
+  swift_zone: '3'
+  storage_netmask: 255.255.255.0
+  name: node-3
+- user_node_name: slave-04_compute
+  uid: '4'
+  public_address: 10.108.1.7
+  internal_netmask: 255.255.255.0
+  fqdn: node-4.test.domain.local
+  role: compute
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.7
+  storage_address: 10.108.4.5
+  swift_zone: '4'
+  storage_netmask: 255.255.255.0
+  name: node-4
+- user_node_name: slave-05_mongo
+  uid: '5'
+  public_address: 10.108.1.8
+  internal_netmask: 255.255.255.0
+  fqdn: node-5.test.domain.local
+  role: primary-mongo
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.8
+  storage_address: 10.108.4.6
+  swift_zone: '5'
+  storage_netmask: 255.255.255.0
+  name: node-5
+nova_quota: false
+ceilometer:
+  db_password: cOPq2iRs
+  user_password: E7tYGtuu
+  metering_secret: 1euklWmj
+  enabled: true
+external_ntp:
+  ntp_list: 0.pool.ntp.org, 1.pool.ntp.org
+  metadata:
+    weight: 100
+    label: Upstream NTP
+metadata:
+  weight: 30
+  label: Common
+status: discover
+repo_setup:
+  repos:
+  - priority: 20
+    type: rpm
+    name: MOS
+    uri: http://10.108.0.2:8080/2014.2-6.1/centos/x86_64
+  metadata:
+    restrictions:
+    - action: hide
+      condition: 'true'
+    weight: 50
+    label: Repositories
+deployment_mode: ha_compact
+management_vrouter_vip: 10.108.2.3
+novanetwork_parameters:
+  network_manager: FlatDHCPManager
+  network_size: 65536
+  num_networks: 1
+sahara:
+  db_password: LwV220yW
+  user_password: xqnj91LB
+  enabled: true
+network_scheme:
+  transformations:
+  - action: add-br
+    name: br-fw-admin
+  - action: add-br
+    name: br-storage
+  - action: add-br
+    name: br-mgmt
+  - action: add-br
+    name: br-ex
+  - action: add-port
+    bridge: br-fw-admin
+    name: eth0
+  - action: add-port
+    bridge: br-ex
+    name: eth1
+  - action: add-port
+    bridge: br-mgmt
+    name: eth2
+  - action: add-port
+    bridge: br-storage
+    name: eth4
+  - action: add-port
+    name: eth3.103
+  roles:
+    management: br-mgmt
+    storage: br-storage
+    ex: br-ex
+    novanetwork/fixed: eth3.103
+    fw-admin: br-fw-admin
+  interfaces:
+    eth4: {}
+    eth3: {}
+    eth2: {}
+    eth1: {}
+    eth0: {}
+  version: '1.1'
+  provider: lnx
+  endpoints:
+    eth3.103:
+      IP: none
+    br-fw-admin:
+      IP:
+      - 10.108.0.3/24
+    br-storage:
+      IP:
+      - 10.108.4.2/24
+    br-mgmt:
+      IP:
+      - 10.108.2.4/24
+    br-ex:
+      IP:
+      - 10.108.1.4/24
+      gateway: 10.108.1.1
+heat:
+  db_password: ey8Q2Tmb
+  user_password: Z2rvUcbg
+  enabled: true
+  auth_encryption_key: d69db5365b0329c49d01155175f6a45f
+  rabbit_password: y4xH2ENh
+test_vm_image:
+  os_name: cirros
+  img_path: "/opt/vm/cirros-x86_64-disk.img"
+  container_format: bare
+  min_ram: 64
+  disk_format: qcow2
+  glance_properties: ''
+  img_name: TestVM
+  public: 'true'
+fuel_version: '6.1'
+rabbit:
+  password: U7sRLche
+public_network_assignment:
+  assign_to_all_nodes: false
+  metadata:
+    restrictions:
+    - action: hide
+      condition: cluster:net_provider != 'neutron'
+    weight: 50
+    label: Public network assignment
+management_network_range: 10.108.2.0/24
+base_syslog:
+  syslog_port: '514'
+  syslog_server: 10.108.0.2
+storage_network_range: 10.108.4.0/24
+workloads_collector:
+  username: workloads_collector
+  password: YN5rNkho
+  enabled: true
+  tenant: services
+  metadata:
+    restrictions:
+    - action: hide
+      condition: 'true'
+    weight: 10
+    label: Workloads Collector User
+floating_network_range:
+- 10.108.1.128-10.108.1.254
+auth_key: ''
+corosync:
+  verified: false
+  group: 226.94.1.1
+  port: '12000'
+  metadata:
+    restrictions:
+    - action: hide
+      condition: 'true'
+    weight: 50
+    label: Corosync
+access:
+  user: ceilometerHA
+  password: ceilometerHA
+  email: admin@localhost
+  tenant: ceilometerHA
+  metadata:
+    weight: 10
+    label: Access
+last_controller: node-3
+fqdn: node-1.test.domain.local
+auto_assign_floating_ip: false
+zabbix:
+  username: admin
+  db_password: EWqZG8w0
+  password: zabbix
+  metadata:
+    restrictions:
+    - action: hide
+      condition: not ('experimental' in version:feature_groups)
+    weight: 70
+    label: Zabbix Access
+  db_root_password: zxbaysgM
+mp:
+- weight: '1'
+  point: '1'
+- weight: '2'
+  point: '2'
+neutron_mellanox:
+  vf_num: '16'
+  plugin: disabled
+  metadata:
+    enabled: true
+    weight: 50
+    toggleable: false
+    label: Mellanox Neutron components
+dns_nameservers:
+- 8.8.4.4
+- 8.8.8.8
+debug: true
+cinder:
+  db_password: g9tWweJY
+  user_password: 0Q8lKhCc
+  fixed_key: fb64afea3f59f22d971956f8f773b93482fe3f6465067e5f5337c3e4391b172b
+deployment_id: 1
+openstack_version_prev: 
diff --git a/tests/noop/astute.yaml/novanet_flat.primary-mongo.platforms.yaml b/tests/noop/astute.yaml/novanet_flat.primary-mongo.platforms.yaml
new file mode 100644
index 0000000000..78a6009c72
--- /dev/null
+++ b/tests/noop/astute.yaml/novanet_flat.primary-mongo.platforms.yaml
@@ -0,0 +1,696 @@
+---
+tasks:
+- priority: 100
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/hiera/hiera.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 200
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/globals/globals.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 300
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/logging/logging.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 400
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/tools/tools.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 500
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/umm/umm.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 600
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/netconfig/netconfig.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 700
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/firewall/firewall.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 800
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/hosts/hosts.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 900
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/zabbix/zabbix.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1000
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/cluster/cluster.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1100
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/virtual_ips/virtual_ips.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1200
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/cluster-haproxy/cluster-haproxy.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1300
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/openstack-haproxy/openstack-haproxy.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1400
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/dns/dns-server.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1500
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/dns/dns-client.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1600
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/ntp/ntp-server.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1700
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/database/database.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1800
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/ceilometer/controller.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 1900
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/rabbitmq/rabbitmq.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2000
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/memcached/memcached.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2100
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/keystone/keystone.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2200
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/openstack-cinder/openstack-cinder.pp"
+    timeout: 1200
+    cwd: "/"
+- priority: 2300
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/glance/glance.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2400
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/openstack-controller/openstack-controller.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2500
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/openstack-network/openstack-network-controller.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2600
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/heat/heat.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2700
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/horizon/horizon.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2800
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/murano/murano.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 2900
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/sahara/sahara.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 3000
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/api-proxy/api-proxy.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 3100
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/ceph/mon.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 3200
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/ceph/radosgw.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 3300
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/swift/swift.pp"
+    timeout: 3600
+    cwd: "/"
+- priority: 3400
+  type: puppet
+  uids:
+  - '1'
+  parameters:
+    puppet_modules: "/etc/puppet/modules"
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/roles/controller.pp"
+    timeout: 3600
+    cwd: "/"
+user_node_name: slave-01_controller
+uid: '1'
+storage:
+  iser: false
+  volumes_ceph: false
+  objects_ceph: false
+  ephemeral_ceph: false
+  volumes_lvm: true
+  images_vcenter: false
+  osd_pool_size: '2'
+  pg_num: 128
+  images_ceph: false
+  metadata:
+    weight: 60
+    label: Storage
+management_vip: 10.108.2.2
+public_vip: 10.108.1.2
+syslog:
+  syslog_port: '514'
+  syslog_transport: tcp
+  syslog_server: ''
+  metadata:
+    weight: 50
+    label: Syslog
+libvirt_type: qemu
+puppet:
+  modules: rsync://10.108.0.2:/puppet/2014.2-6.1/modules/
+  manifests: rsync://10.108.0.2:/puppet/2014.2-6.1/manifests/
+nsx_plugin:
+  replication_mode: true
+  nsx_password: ''
+  nsx_username: admin
+  connector_type: stt
+  packages_url: ''
+  nsx_controllers: ''
+  l3_gw_service_uuid: ''
+  transport_zone_uuid: ''
+  metadata:
+    restrictions:
+    - action: hide
+      condition: cluster:net_provider != 'neutron' or networking_parameters:net_l23_provider
+        != 'nsx'
+    enabled: false
+    weight: 20
+    label: VMware NSX
+mysql:
+  root_password: NDG84Pcc
+  wsrep_password: 4JFDJzqR
+fail_if_error: true
+use_cow_images: true
+glance:
+  image_cache_max_size: '13868466176'
+  user_password: HQQj24u9
+  db_password: n1x6qtJg
+cobbler:
+  profile: centos-x86_64
+mongo:
+  enabled: true
+provision:
+  image_data:
+    "/boot":
+      container: gzip
+      uri: http://10.108.0.2:8080/targetimages/centos_65_x86_64-boot.img.gz
+      format: ext2
+    "/":
+      container: gzip
+      uri: http://10.108.0.2:8080/targetimages/centos_65_x86_64.img.gz
+      format: ext4
+  method: image
+  metadata:
+    weight: 80
+    label: Provision
+quantum_settings:
+  metadata:
+    metadata_proxy_shared_secret: i7fy2HtN
+  keystone:
+    admin_password: AMWxUzaE
+  database:
+    passwd: me99pk1l
+use_vcenter: false
+openstack_version: 2014.2-6.1
+public_vrouter_vip: 10.108.1.3
+kernel_params:
+  kernel: console=ttyS0,9600 console=tty0 biosdevname=0 crashkernel=none rootdelay=90
+    nomodeset
+  metadata:
+    weight: 40
+    label: Kernel parameters
+swift:
+  user_password: MdNIkfj3
+resume_guests_state_on_host_boot: true
+fixed_network_range: 10.0.0.0/16
+nova:
+  db_password: 2upYv98H
+  user_password: M9mWs2C0
+  state_path: "/var/lib/nova"
+master_ip: 10.108.0.2
+priority: 200
+external_dns:
+  dns_list: 8.8.8.8, 8.8.4.4
+  metadata:
+    weight: 90
+    label: Upstream DNS
+murano:
+  db_password: lDMWrLai
+  user_password: jF9pPs9a
+  enabled: true
+  rabbit_password: P46eXV4F
+role: primary-mongo
+external_mongo:
+  mongo_db_name: ceilometer
+  mongo_replset: ''
+  mongo_user: ceilometer
+  hosts_ip: ''
+  mongo_password: ceilometer
+  metadata:
+    restrictions:
+    - action: hide
+      condition: settings:additional_components.mongo.value == false
+    weight: 20
+    label: External MongoDB
+online: true
+keystone:
+  db_password: rscfOUx4
+  admin_token: hrsjAgBf
+nodes:
+- user_node_name: slave-01_controller
+  uid: '1'
+  public_address: 10.108.1.4
+  internal_netmask: 255.255.255.0
+  fqdn: node-1.test.domain.local
+  role: primary-controller
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.4
+  storage_address: 10.108.4.2
+  swift_zone: '1'
+  storage_netmask: 255.255.255.0
+  name: node-1
+- user_node_name: slave-02_controller
+  uid: '2'
+  public_address: 10.108.1.5
+  internal_netmask: 255.255.255.0
+  fqdn: node-2.test.domain.local
+  role: controller
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.5
+  storage_address: 10.108.4.3
+  swift_zone: '2'
+  storage_netmask: 255.255.255.0
+  name: node-2
+- user_node_name: slave-03_controller
+  uid: '3'
+  public_address: 10.108.1.6
+  internal_netmask: 255.255.255.0
+  fqdn: node-3.test.domain.local
+  role: controller
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.6
+  storage_address: 10.108.4.4
+  swift_zone: '3'
+  storage_netmask: 255.255.255.0
+  name: node-3
+- user_node_name: slave-04_compute
+  uid: '4'
+  public_address: 10.108.1.7
+  internal_netmask: 255.255.255.0
+  fqdn: node-4.test.domain.local
+  role: compute
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.7
+  storage_address: 10.108.4.5
+  swift_zone: '4'
+  storage_netmask: 255.255.255.0
+  name: node-4
+- user_node_name: slave-05_mongo
+  uid: '5'
+  public_address: 10.108.1.8
+  internal_netmask: 255.255.255.0
+  fqdn: node-5.test.domain.local
+  role: primary-mongo
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.8
+  storage_address: 10.108.4.6
+  swift_zone: '5'
+  storage_netmask: 255.255.255.0
+  name: node-5
+- user_node_name: slave-06_mongo
+  uid: '6'
+  public_address: 10.108.1.9
+  internal_netmask: 255.255.255.0
+  fqdn: node-6.test.domain.local
+  role: mongo
+  public_netmask: 255.255.255.0
+  internal_address: 10.108.2.9
+  storage_address: 10.108.4.7
+  storage_netmask: 255.255.255.0
+  name: node-6
+nova_quota: false
+ceilometer:
+  db_password: cOPq2iRs
+  user_password: E7tYGtuu
+  metering_secret: 1euklWmj
+  enabled: true
+external_ntp:
+  ntp_list: 0.pool.ntp.org, 1.pool.ntp.org
+  metadata:
+    weight: 100
+    label: Upstream NTP
+metadata:
+  weight: 30
+  label: Common
+status: discover
+repo_setup:
+  repos:
+  - priority: 20
+    type: rpm
+    name: MOS
+    uri: http://10.108.0.2:8080/2014.2-6.1/centos/x86_64
+  metadata:
+    restrictions:
+    - action: hide
+      condition: 'true'
+    weight: 50
+    label: Repositories
+deployment_mode: ha_compact
+management_vrouter_vip: 10.108.2.3
+novanetwork_parameters:
+  network_manager: FlatDHCPManager
+  network_size: 65536
+  num_networks: 1
+sahara:
+  db_password: LwV220yW
+  user_password: xqnj91LB
+  enabled: true
+network_scheme:
+  transformations:
+  - action: add-br
+    name: br-fw-admin
+  - action: add-br
+    name: br-storage
+  - action: add-br
+    name: br-mgmt
+  - action: add-br
+    name: br-ex
+  - action: add-port
+    bridge: br-fw-admin
+    name: eth0
+  - action: add-port
+    bridge: br-ex
+    name: eth1
+  - action: add-port
+    bridge: br-mgmt
+    name: eth2
+  - action: add-port
+    bridge: br-storage
+    name: eth4
+  - action: add-port
+    name: eth3.103
+  roles:
+    management: br-mgmt
+    storage: br-storage
+    ex: br-ex
+    novanetwork/fixed: eth3.103
+    fw-admin: br-fw-admin
+  interfaces:
+    eth4: {}
+    eth3: {}
+    eth2: {}
+    eth1: {}
+    eth0: {}
+  version: '1.1'
+  provider: lnx
+  endpoints:
+    eth3.103:
+      IP: none
+    br-fw-admin:
+      IP:
+      - 10.108.0.3/24
+    br-storage:
+      IP:
+      - 10.108.4.2/24
+    br-mgmt:
+      IP:
+      - 10.108.2.4/24
+    br-ex:
+      IP:
+      - 10.108.1.4/24
+      gateway: 10.108.1.1
+heat:
+  db_password: ey8Q2Tmb
+  user_password: Z2rvUcbg
+  enabled: true
+  auth_encryption_key: d69db5365b0329c49d01155175f6a45f
+  rabbit_password: y4xH2ENh
+test_vm_image:
+  os_name: cirros
+  img_path: "/opt/vm/cirros-x86_64-disk.img"
+  container_format: bare
+  min_ram: 64
+  disk_format: qcow2
+  glance_properties: ''
+  img_name: TestVM
+  public: 'true'
+fuel_version: '6.1'
+rabbit:
+  password: U7sRLche
+public_network_assignment:
+  assign_to_all_nodes: false
+  metadata:
+    restrictions:
+    - action: hide
+      condition: cluster:net_provider != 'neutron'
+    weight: 50
+    label: Public network assignment
+management_network_range: 10.108.2.0/24
+base_syslog:
+  syslog_port: '514'
+  syslog_server: 10.108.0.2
+storage_network_range: 10.108.4.0/24
+workloads_collector:
+  username: workloads_collector
+  password: YN5rNkho
+  enabled: true
+  tenant: services
+  metadata:
+    restrictions:
+    - action: hide
+      condition: 'true'
+    weight: 10
+    label: Workloads Collector User
+floating_network_range:
+- 10.108.1.128-10.108.1.254
+auth_key: ''
+corosync:
+  verified: false
+  group: 226.94.1.1
+  port: '12000'
+  metadata:
+    restrictions:
+    - action: hide
+      condition: 'true'
+    weight: 50
+    label: Corosync
+access:
+  user: ceilometerHA
+  password: ceilometerHA
+  email: admin@localhost
+  tenant: ceilometerHA
+  metadata:
+    weight: 10
+    label: Access
+last_controller: node-3
+fqdn: node-1.test.domain.local
+auto_assign_floating_ip: false
+zabbix:
+  username: admin
+  db_password: EWqZG8w0
+  password: zabbix
+  metadata:
+    restrictions:
+    - action: hide
+      condition: not ('experimental' in version:feature_groups)
+    weight: 70
+    label: Zabbix Access
+  db_root_password: zxbaysgM
+mp:
+- weight: '1'
+  point: '1'
+- weight: '2'
+  point: '2'
+neutron_mellanox:
+  vf_num: '16'
+  plugin: disabled
+  metadata:
+    enabled: true
+    weight: 50
+    toggleable: false
+    label: Mellanox Neutron components
+dns_nameservers:
+- 8.8.4.4
+- 8.8.8.8
+debug: true
+cinder:
+  db_password: g9tWweJY
+  user_password: 0Q8lKhCc
+  fixed_key: fb64afea3f59f22d971956f8f773b93482fe3f6465067e5f5337c3e4391b172b
+deployment_id: 1
+openstack_version_prev: 
diff --git a/tests/noop/spec/hosts/keystone/keystone_spec.rb b/tests/noop/spec/hosts/keystone/keystone_spec.rb
index 737fbde890..c42030aa98 100644
--- a/tests/noop/spec/hosts/keystone/keystone_spec.rb
+++ b/tests/noop/spec/hosts/keystone/keystone_spec.rb
@@ -9,10 +9,10 @@ describe manifest do
 
     nodes = Noop.hiera 'nodes'
     internal_address = Noop.node_hash['internal_address']
-    primary_controller_nodes = filter_nodes(nodes,'role','primary-controller')
-    controllers = primary_controller_nodes + filter_nodes(nodes,'role','controller')
-    controller_internal_addresses = nodes_to_hash(controllers,'name','internal_address')
-    controller_nodes = ipsort(controller_internal_addresses.values)
+    primary_controller_nodes = Noop::Utils.filter_nodes(nodes,'role','primary-controller')
+    controllers = primary_controller_nodes + Noop::Utils.filter_nodes(nodes,'role','controller')
+    controller_internal_addresses = Noop::Utils.nodes_to_hash(controllers,'name','internal_address')
+    controller_nodes = Noop::Utils.ipsort(controller_internal_addresses.values)
     memcached_servers = controller_nodes.map{ |n| n = n + ':11211' }.join(',')
     admin_token = Noop.hiera_structure 'keystone/admin_token'
 
diff --git a/tests/noop/spec/hosts/roles/mongo_primary_spec.rb b/tests/noop/spec/hosts/roles/mongo_primary_spec.rb
index 8c9f486617..d1e9736d46 100644
--- a/tests/noop/spec/hosts/roles/mongo_primary_spec.rb
+++ b/tests/noop/spec/hosts/roles/mongo_primary_spec.rb
@@ -3,6 +3,13 @@ require 'shared-examples'
 manifest = 'roles/mongo_primary.pp'
 
 describe manifest do
+  before (:each) do
+    Puppet::Parser::Functions::newfunction(:file, :arity => -2, :type => :rvalue) do |vals|
+      return 'key' if vals.first == '/var/lib/astute/mongodb/mongodb.key'
+      raise Puppet::ParseError, "Could not find any files from #{vals.join(", ")}"
+    end
+  end
+
   test_ubuntu_and_centos manifest
 end
 
diff --git a/tests/noop/spec/hosts/roles/mongo_spec.rb b/tests/noop/spec/hosts/roles/mongo_spec.rb
index c30fac6d3d..d16d88e809 100644
--- a/tests/noop/spec/hosts/roles/mongo_spec.rb
+++ b/tests/noop/spec/hosts/roles/mongo_spec.rb
@@ -3,6 +3,18 @@ require 'shared-examples'
 manifest = 'roles/mongo.pp'
 
 describe manifest do
+  before (:each) do
+    Puppet::Parser::Functions::newfunction(:file, :arity => -2, :type => :rvalue) do |vals|
+      return 'key' if vals.first == '/var/lib/astute/mongodb/mongodb.key'
+      raise Puppet::ParseError, "Could not find any files from #{vals.join(", ")}"
+    end
+  end
+
+  shared_examples 'catalog' do
+    it do
+      should contain_file('/etc/mongodb.key').with_content('key')
+    end
+  end
   test_ubuntu_and_centos manifest
 end
 
diff --git a/tests/noop/spec/hosts/swift/swift_spec.rb b/tests/noop/spec/hosts/swift/swift_spec.rb
index 4ce8348e5f..bf9af2fe7d 100644
--- a/tests/noop/spec/hosts/swift/swift_spec.rb
+++ b/tests/noop/spec/hosts/swift/swift_spec.rb
@@ -7,10 +7,10 @@ describe manifest do
     role = Noop.hiera 'role'
     storage_hash = Noop.hiera['storage']
     nodes = Noop.hiera 'nodes'
-    primary_controller_nodes = filter_nodes(nodes,'role','primary-controller')
-    controllers = primary_controller_nodes + filter_nodes(nodes,'role','controller')
-    controller_internal_addresses = nodes_to_hash(controllers,'name','internal_address')
-    controller_nodes = ipsort(controller_internal_addresses.values)
+    primary_controller_nodes = Noop::Utils.filter_nodes(nodes,'role','primary-controller')
+    controllers = primary_controller_nodes + Noop::Utils.filter_nodes(nodes,'role','controller')
+    controller_internal_addresses = Noop::Utils.nodes_to_hash(controllers,'name','internal_address')
+    controller_nodes = Noop::Utils.ipsort(controller_internal_addresses.values)
     memcached_servers = controller_nodes.map{ |n| n = n + ':11211' }
 
     # Swift
diff --git a/tests/noop/spec/hosts/virtual_ips/public_vip_ping_spec.rb b/tests/noop/spec/hosts/virtual_ips/public_vip_ping_spec.rb
index 725d982ddf..2be62a02a3 100644
--- a/tests/noop/spec/hosts/virtual_ips/public_vip_ping_spec.rb
+++ b/tests/noop/spec/hosts/virtual_ips/public_vip_ping_spec.rb
@@ -11,6 +11,13 @@ describe manifest do
       ping_host
     }
 
+    it do
+      expect(subject).to contain_cluster__virtual_ip_ping('vip__public').with(
+                             :name      => "vip__public",
+                             :host_list => ping_host,
+                         )
+    end
+
     it do
       expect(subject).to contain_cs_resource('ping_vip__public').with(
                              :name            => "ping_vip__public",
@@ -39,11 +46,11 @@ describe manifest do
                              :name      => "loc_ping_vip__public",
                              :primitive => "vip__public",
                              :cib       => "ping_vip__public",
-                             :rules     => {"score"=>"-inf", "boolean"=>"", "expressions"=>[{"attribute"=>"not_defined", "operation"=>"pingd", "value"=>"or"}, {"attribute"=>"pingd", "operation"=>"lte", "value"=>"0"}]},
                              :before    => "Service[ping_vip__public]",
                          )
     end
 
+
   end
 
   test_ubuntu_and_centos manifest
diff --git a/tests/noop/spec/shared-examples.rb b/tests/noop/spec/shared-examples.rb
index 7bde347dd4..8bb422c437 100644
--- a/tests/noop/spec/shared-examples.rb
+++ b/tests/noop/spec/shared-examples.rb
@@ -1,166 +1,166 @@
-# Shared functions
-def filter_nodes(hash, name, value)
-  hash.select do |it|
-    it[name] == value
+shared_examples 'compile' do
+  it do
+    should compile
   end
 end
 
-def nodes_to_hash(hash, name, value)
-  result = {}
-  hash.each do |element|
-    result[element[name]] = element[value]
+shared_examples 'should_not_install_bin_files_with_puppet' do
+  it 'should not install binary files with puppet' do
+    binary_files_regexp = %r{^/bin|^/usr/bin|^/usr/local/bin|^/usr/sbin|^/sbin|^/usr/lib|^/usr/share|^/etc/init.d|^/usr/local/sbin|^/etc/rc\S\.d}
+    binary_files = []
+    downloaded_files = []
+    file_resources.each do |resource|
+      next unless %w(present file directory).include? resource[:ensure] or not resource[:ensure]
+      file_path = resource[:path] or resource[:title]
+      file_source = resource[:source]
+      binary_files << file_path if file_path =~ binary_files_regexp
+      downloaded_files << file_path if file_source
+    end
+    error_message_template = <<-eos
+<% if binary_files.any? -%>
+You have <%= binary_files.length -%> binary files installed with puppet:
+<% binary_files.each do |file| -%>
+<%= file %>
+<% end -%>
+<% end -%>
+<% if downloaded_files.any? -%>
+You are downloading <%= downloaded_files.length -%> binary files installed with puppet:
+<% downloaded_files.each do |file| -%>
+<%= file %>
+<% end -%>
+<% end -%>
+    eos
+    fail ERB.new(error_message_template, nil, '-').result(binding) if binary_files.any? or downloaded_files.any?
   end
-  result
 end
 
-def ipsort (ips)
-  require 'rubygems'
-  require 'ipaddr'
-  ips.sort { |a,b| IPAddr.new( a ) <=> IPAddr.new( b ) }
+shared_examples 'save_files_list' do
+  it 'should save the list of file resources' do
+    files={}
+    file_resources.each do |resource|
+      next unless %w(present file directory).include? resource[:ensure] or not resource[:ensure]
+      if resource[:source]
+        content = resource[:source]
+      elsif resource[:content]
+        content = 'TEMPLATE'
+      else
+        content = nil
+      end
+      next unless content
+      files[resource[:path]] = content
+      if files.any?
+        Noop.save_file_resources_list files, os_name
+      end
+    end
+  end
 end
 
-def test_ubuntu_and_centos(manifest, force_manifest = false)
+shared_examples 'save_packages_list' do
+  it 'should save the list of file resources' do
+    catalog = subject
+    catalog = subject.call if subject.is_a? Proc
+    package_resources = {}
+    catalog.resources.each do |resource|
+      next unless resource.type == 'Package'
+      next if %w(absent purged).include? resource[:ensure] or not resource[:ensure]
+      package_resources[resource[:name]] = resource[:ensure]
+    end
+    if package_resources.any?
+      Noop.save_package_resources_list package_resources, os_name
+    end
+  end
+end
+
+shared_examples 'debug' do
+  it 'shows catalog contents' do
+    Noop.show_catalog subject
+  end
+end
+
+shared_examples 'generate' do
+  it 'shows catalog contents' do
+    Noop.catalog_to_spec subject
+  end
+end
+
+shared_examples 'status' do
+  it 'shows status' do
+    puts <<-eos
+      =============================================
+      OS:       #{os_name}
+      YAML:     #{Noop.astute_yaml_base}
+      Spec:     #{Noop.current_spec example}
+      Manifest: #{Noop.manifest_path}
+      Node:     #{Noop.fqdn}
+      Role:     #{Noop.hiera 'role'}
+      =============================================
+    eos
+  end
+end
+
+shared_examples 'OS' do
+  it_behaves_like 'compile'
+
+  it_behaves_like 'status' if ENV['SPEC_SHOW_STATUS']
+  it_behaves_like 'debug' if ENV['SPEC_CATALOG_DEBUG']
+  it_behaves_like 'generate' if ENV['SPEC_SPEC_GENERATE']
+  it_behaves_like 'save_files_list' if ENV['SPEC_SAVE_FILE_RESOURCES']
+  it_behaves_like 'save_packages_list'if ENV['SPEC_SAVE_PACKAGE_RESOURCES']
+  it_behaves_like 'should_not_install_bin_files_with_puppet' if ENV['SPEC_PUPPET_BINARY_FILES']
+
+  begin
+    it_behaves_like 'catalog'
+  rescue ArgumentError
+    true
+  end
+
+  at_exit { RSpec::Puppet::Coverage.report! } if ENV['SPEC_COVERAGE']
+end
+
+###############################################################################
+
+def test_ubuntu_and_centos(manifest_file, force_manifest = false)
   # check if task is present in the task list
-  unless force_manifest or Noop.manifest_present? manifest
-    # puts "Manifest '#{manifest}' is not enabled on the node '#{Noop.hostname}'. Skipping tests."
+  unless force_manifest or Noop.manifest_present? manifest_file
+    Noop.debug "Manifest '#{manifest_file}' is not enabled on the node '#{Noop.hostname}'. Skipping tests."
     return
   end
 
   # set manifest file
   before(:all) do
-    Noop.manifest = manifest
+    Noop.manifest = manifest_file
   end
 
-  let(:os) do
+  let(:os_name) do
     os = facts[:operatingsystem]
     os = os.downcase if os
     os
   end
 
-  shared_examples 'compile' do
-    it do
-      File.stubs(:exists?).with('/var/lib/astute/ceph/ceph').returns(true)
-      File.stubs(:exists?).with('/var/lib/astute/mongodb/mongodb.key').returns(true)
-      File.stubs(:exists?).with('/var/lib/astute/mongodb/mongodb.key').returns(true)
-      File.stubs(:exists?).with('/var/lib/astute/ceph/ceph').returns(true)
-      File.stubs(:exists?).with('/var/lib/astute/nova/nova').returns(true)
-      File.stubs(:exists?).with('/var/lib/astute/ceph/ceph').returns(true)
-      File.stubs(:exists?).returns(false)
-      should compile.with_all_deps
-    end
+  let(:catalog) do
+    catalog = subject
+    catalog = subject.call if subject.is_a? Proc
+    catalog
   end
 
-  shared_examples 'save_files_list' do
-    it 'should save the list of file resources' do
-      catalog = subject
-      catalog = subject.call if subject.is_a? Proc
-      file_resources = {}
-      catalog.resources.each do |resource|
-        next unless resource.type == 'File'
-        next unless %w(present file directory).include? resource[:ensure] or not resource[:ensure]
-
-        if resource[:source]
-          content = resource[:source]
-        elsif resource[:content]
-          content = 'TEMPLATE'
-        else
-          content = nil
-        end
-        next unless content
-        file_resources[resource[:path]] = content
-      end
-      if file_resources.any?
-        Noop.save_file_resources_list file_resources, manifest, os
-      end
-    end
+  let(:file_resources) do
+   files = catalog.resources.select do |resource|
+      resource.type == 'File'
+   end
+   files
   end
 
-  shared_examples 'save_packages_list' do
-    it 'should save the list of file resources' do
-      catalog = subject
-      catalog = subject.call if subject.is_a? Proc
-      package_resources = {}
-      catalog.resources.each do |resource|
-        next unless resource.type == 'Package'
-        next if %w(absent purged).include? resource[:ensure] or not resource[:ensure]
-        package_resources[resource[:name]] = resource[:ensure]
-      end
-      if package_resources.any?
-        Noop.save_package_resources_list package_resources, manifest, os
-      end
-    end
-  end
-
-  shared_examples 'debug' do
-    it 'shows catalog contents' do
-      Noop.show_catalog subject
-    end
-  end
-
-  shared_examples 'generate' do
-    it 'shows catalog contents' do
-      Noop.catalog_to_spec subject
-    end
-  end
-
-  shared_examples 'status' do
-    it 'shows status' do
-      puts <<-eos
-      =============================================
-      OS:       #{os}
-      YAML:     #{Noop.astute_yaml_base}
-      Manifest: #{Noop.manifest}
-      Node:     #{Noop.fqdn}
-      Role:     #{Noop.hiera 'role'}
-      =============================================
-      eos
-    end
-  end
-
-  #######################################
-  # Testing on different operating systems
-
   if Noop.test_ubuntu?
     context 'on Ubuntu platforms' do
       let(:facts) { Noop.ubuntu_facts }
-
-      it_behaves_like 'compile'
-
-      it_behaves_like 'status' if ENV['SPEC_SHOW_STATUS']
-      it_behaves_like 'debug' if ENV['SPEC_CATALOG_DEBUG']
-      it_behaves_like 'generate' if ENV['SPEC_SPEC_GENERATE']
-      it_behaves_like 'save_files_list' if ENV['SPEC_SAVE_FILE_RESOURCES']
-      it_behaves_like 'save_packages_list'if ENV['SPEC_SAVE_PACKAGE_RESOURCES']
-
-      begin
-        it_behaves_like 'catalog'
-      rescue ArgumentError
-        true
-      end
-
-      at_exit { RSpec::Puppet::Coverage.report! } if ENV['SPEC_COVERAGE']
+      it_behaves_like 'OS'
     end
   end
 
   if Noop.test_centos?
     context 'on CentOS platforms' do
       let(:facts) { Noop.centos_facts }
-
-      it_behaves_like 'compile'
-
-      it_behaves_like 'status' if ENV['SPEC_SHOW_STATUS']
-      it_behaves_like 'debug' if ENV['SPEC_CATALOG_DEBUG']
-      it_behaves_like 'generate' if ENV['SPEC_SPEC_GENERATE']
-      it_behaves_like 'save_files_list' if ENV['SPEC_SAVE_FILE_RESOURCES']
-      it_behaves_like 'save_packages_list'if ENV['SPEC_SAVE_PACKAGE_RESOURCES']
-
-      begin
-        it_behaves_like 'catalog'
-      rescue ArgumentError
-        true
-      end
-
-      at_exit { RSpec::Puppet::Coverage.report! } if ENV['SPEC_COVERAGE']
+      it_behaves_like 'OS'
     end
   end
 
diff --git a/tests/noop/spec/spec_helper.rb b/tests/noop/spec/spec_helper.rb
index 81986f6738..6132b43c2d 100644
--- a/tests/noop/spec/spec_helper.rb
+++ b/tests/noop/spec/spec_helper.rb
@@ -24,12 +24,17 @@ module Noop
     @fixtures_path = File.expand_path(File.join(__FILE__, '..', '..', 'fixtures'))
   end
 
+  def self.spec_path
+    return @spec_path if @spec_path
+    @spec_path = File.expand_path(File.join(__FILE__, '..', 'hosts'))
+  end
+
   def self.astute_yaml_name
-    ENV['astute_filename'] || 'novanet-primary-controller.yaml'
+    ENV['SPEC_ASTUTE_FILE_NAME'] || 'novanet-primary-controller.yaml'
   end
 
   def self.puppet_logs_dir
-    ENV['PUPPET_LOGS_DIR']
+    ENV['SPEC_PUPPET_LOGS_DIR']
   end
 
   def self.puppet_log_file
@@ -210,6 +215,7 @@ module Noop
   end
 
   def self.manifest=(manifest)
+    debug "Set manifest to: #{manifest} -> #{File.join self.modular_manifests_local_dir, manifest}"
     RSpec.configuration.manifest = File.join self.modular_manifests_local_dir, manifest
     @manifest = manifest
   end
@@ -243,7 +249,7 @@ module Noop
     File.join file_resources_lists_dir, file_name
   end
 
-  def self.save_file_resources_list(data, manifest, os)
+  def self.save_file_resources_list(data, os)
     begin
       file_path = file_resources_list_file manifest, os
       FileUtils.mkdir_p file_resources_lists_dir unless File.directory? file_resources_lists_dir
@@ -268,7 +274,7 @@ module Noop
     File.join package_resources_lists_dir, file_name
   end
 
-  def self.save_package_resources_list(data, manifest, os)
+  def self.save_package_resources_list(data, os)
     begin
       file_path = package_resources_list_file manifest, os
       FileUtils.mkdir_p package_resources_lists_dir unless File.directory? package_resources_lists_dir
@@ -316,6 +322,41 @@ module Noop
     end
   end
 
+  def self.debug(msg)
+    puts msg if ENV['SPEC_RSPEC_DEBUG']
+  end
+
+  def self.current_spec(example)
+    example_group = lambda do |metdata|
+      return example_group.call metdata[:example_group] if metdata[:example_group]
+      return example_group.call metdata[:parent_example_group] if metdata[:parent_example_group]
+      file_path = metdata[:absolute_file_path]
+      return file_path
+    end
+    example_group.call example.metadata
+  end
+
+  module Utils
+    def self.filter_nodes(hash, name, value)
+      hash.select do |it|
+        it[name] == value
+      end
+    end
+
+    def self.nodes_to_hash(hash, name, value)
+      result = {}
+      hash.each do |element|
+        result[element[name]] = element[value]
+      end
+      result
+    end
+
+    def self.ipsort (ips)
+      require 'rubygems'
+      require 'ipaddr'
+      ips.sort { |a,b| IPAddr.new( a ) <=> IPAddr.new( b ) }
+    end
+  end
 end
 
 # Add fixture lib dirs to LOAD_PATH. Work-around for PUP-3336
@@ -357,6 +398,8 @@ RSpec.configure do |c|
     end
   end
 
+  c.mock_with :rspec
+
 end
 
 Noop.hiera_puppet_override
diff --git a/utils/jenkins/fuel_noop_tests.rb b/utils/jenkins/fuel_noop_tests.rb
index 82e198fd45..7e22f74927 100755
--- a/utils/jenkins/fuel_noop_tests.rb
+++ b/utils/jenkins/fuel_noop_tests.rb
@@ -21,7 +21,7 @@ require 'optparse'
 module NoopTests
   GLOBALS_SPEC = 'globals/globals_spec.rb'
   RSPEC_OPTIONS = '--format documentation --color --tty --backtrace'
-  ASTUTE_YAML_VAR = 'astute_filename'
+  ASTUTE_YAML_VAR = 'SPEC_ASTUTE_FILE_NAME'
   BUNDLE_DIR = '.bundled_gems'
   BUNDLE_VAR = 'GEM_HOME'
   GLOBALS_PREFIX = 'globals_yaml_for_'
@@ -42,7 +42,7 @@ module NoopTests
       opts.on('-i', '--individually', 'Run each spec individually') do
         @options[:run_individually] = true
       end
-      opts.on('-p', '--purge_globals', 'Purge globals yaml files') do
+      opts.on('-g', '--purge_globals', 'Purge globals yaml files') do
         @options[:purge_globals] = true
       end
       opts.on('-a', '--astute_yaml_dir DIR', 'Path to astute_yaml folder') do |dir|
@@ -56,13 +56,13 @@ module NoopTests
         @options[:list_specs] = true
       end
       opts.separator 'Filter options:'
-      opts.on('-s', '--specs SPEC1,SPEC2', Array, 'Run only these specs') do |specs|
+      opts.on('-s', '--specs SPEC1,SPEC2', Array, 'Run only these specs. Example: "hosts/hosts_spec.rb"') do |specs|
         @options[:filter_specs] = specs
       end
-      opts.on('-y', '--yamls YAML1,YAML2', Array, 'Run only these yamls') do |yamls|
+      opts.on('-y', '--yamls YAML1,YAML2', Array, 'Run only these yamls. Example: "novanet-primary-controller.yaml"') do |yamls|
         @options[:filter_yamls] = yamls
       end
-      opts.on('-e', '--examples STR1,STR2', Array, 'Run only these exemples') do |examples|
+      opts.on('-e', '--examples STR1,STR2', Array, 'Run only these exemples. Example: "should compile"') do |examples|
         @options[:filter_examples] = examples
       end
       opts.separator 'Debug options:'
@@ -97,8 +97,17 @@ module NoopTests
       opts.on('-R', '--test_centos', 'Run tests for CentOS facts') do
         ENV['SPEC_TEST_CENTOS'] = 'YES'
       end
+      opts.on('-r', '--rspec_debug', 'Show debug messages in rspec tests') do
+        ENV['SPEC_RSPEC_DEBUG'] = 'YES'
+      end
+      opts.on('-p', '--puppet_debug', 'Show Puppet debug messages') do
+        ENV['SPEC_PUPPET_DEBUG'] = 'YES'
+      end
+      opts.on('-B', '--puppet_binary_files', 'Check if Puppet installs binary files') do
+        ENV['SPEC_PUPPET_BINARY_FILES'] = 'YES'
+      end
       opts.on('-L', '--puppet_logs_dir DIR', 'Save Puppet logs in this directory') do |dir|
-        ENV['PUPPET_LOGS_DIR'] = dir
+        ENV['SPEC_PUPPET_LOGS_DIR'] = dir
         @options[:puppet_logs_dir] = dir
       end
     end
@@ -328,9 +337,9 @@ module NoopTests
   def self.run_all_specs_individually
     results = {}
     errors = 0
-    trap('SIGINT') do
-      skip
-    end
+    # trap('SIGINT') do
+    #   skip
+    # end
     noop_spec_files.each do |spec|
       if @skip
         @skip = false