diff --git a/packstack/plugins/neutron_350.py b/packstack/plugins/neutron_350.py
index b66bc4297..9b072539e 100644
--- a/packstack/plugins/neutron_350.py
+++ b/packstack/plugins/neutron_350.py
@@ -459,7 +459,7 @@ def initSequences(controller):
         config['CONFIG_NEUTRON_ML2_TENANT_NETWORK_TYPES'] += ', flat'
         if 'openvswitch' not in config['CONFIG_NEUTRON_ML2_MECHANISM_DRIVERS']:
             config['CONFIG_NEUTRON_ML2_MECHANISM_DRIVERS'] += 'openvswitch'
-        config['CONFIG_NEUTRON_ML2_FLAT_NETWORKS'] = 'physnet1'
+        config['CONFIG_NEUTRON_ML2_FLAT_NETWORKS'] = 'extnet'
 
     if use_ml2_with_sriovnicswitch(config):
         if ('openvswitch' not in config['CONFIG_NEUTRON_ML2_MECHANISM_DRIVERS']
diff --git a/packstack/puppet/modules/packstack/manifests/nova/compute/ironic.pp b/packstack/puppet/modules/packstack/manifests/nova/compute/ironic.pp
index 327c38156..b5e8a7cea 100644
--- a/packstack/puppet/modules/packstack/manifests/nova/compute/ironic.pp
+++ b/packstack/puppet/modules/packstack/manifests/nova/compute/ironic.pp
@@ -1,14 +1,15 @@
 class packstack::nova::compute::ironic ()
 {
-    $ironic_config_controller_host = hiera('CONFIG_KEYSTONE_HOST_URL')
-    $ironic_config_keystone_admin = hiera('CONFIG_KEYSTONE_ADMIN_URL')
-    $ironic_config_keystone_version = hiera('CONFIG_KEYSTONE_API_VERSION')
+  $ironic_config_controller_host = hiera('CONFIG_KEYSTONE_HOST_URL')
+  $ironic_config_keystone_admin = hiera('CONFIG_KEYSTONE_ADMIN_URL')
 
-    class { '::nova::compute::ironic':
-      admin_user        => 'ironic',
-      admin_passwd      => hiera('CONFIG_IRONIC_KS_PW'),
-      admin_url         => "${ironic_config_keystone_admin}/${ironic_config_keystone_version}",
-      admin_tenant_name => 'services',
-      api_endpoint      => "http://${ironic_config_controller_host}:6385/v1",
-    }
+  class { '::nova::ironic::common':
+      username     => 'ironic',
+      password     => hiera('CONFIG_IRONIC_KS_PW'),
+      auth_url     => $ironic_config_keystone_admin,
+      project_name => 'services',
+      api_endpoint => "http://${ironic_config_controller_host}:6385/v1",
+  }
+
+  include ::nova::compute::ironic
 }
diff --git a/packstack/puppet/modules/packstack/manifests/nova/sched/ironic.pp b/packstack/puppet/modules/packstack/manifests/nova/sched/ironic.pp
index f3a74ec96..0e764d256 100644
--- a/packstack/puppet/modules/packstack/manifests/nova/sched/ironic.pp
+++ b/packstack/puppet/modules/packstack/manifests/nova/sched/ironic.pp
@@ -1,7 +1,10 @@
 class packstack::nova::sched::ironic ()
 {
-    nova_config {
-      'DEFAULT/scheduler_host_manager':
-        value => 'nova.scheduler.ironic_host_manager.IronicHostManager';
-    }
-}
+  class {'::nova::scheduler::filter':
+    scheduler_host_manager => 'ironic_host_manager',
+  }
+
+  class { '::nova::scheduler':
+    enabled => true,
+  }
+}
\ No newline at end of file
diff --git a/packstack/puppet/templates/controller.pp b/packstack/puppet/templates/controller.pp
old mode 100755
new mode 100644
index 5400e60c3..9f735909d
--- a/packstack/puppet/templates/controller.pp
+++ b/packstack/puppet/templates/controller.pp
@@ -77,8 +77,9 @@ if hiera('CONFIG_NOVA_INSTALL') == 'y' {
   include '::packstack::nova::conductor'
   if hiera('CONFIG_IRONIC_INSTALL') == 'y' {
     include '::packstack::nova::sched::ironic'
+  } else {
+    include '::packstack::nova::sched'
   }
-  include '::packstack::nova::sched'
   include '::packstack::nova::vncproxy'
   if hiera('CONFIG_NEUTRON_INSTALL') == 'y' {
     include '::packstack::nova::neutron'