diff --git a/Puppetfile b/Puppetfile
index ad83a8b..19b7c80 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -41,7 +41,7 @@ else
   if openstack_version == 'grizzly'
     openstack_module_branch   = 'stable/grizzly'
   elsif openstack_version == 'havana'
-    openstack_module_branch   = 'master'
+    openstack_module_branch   = 'stable/havana'
   else
     abort('only grizzly and havana are supported atm')
   end
@@ -177,7 +177,6 @@ cisco_module_prefix = "#{base_url}/CiscoSystems/puppet-"
   'graphite',
   'pip',
   'dnsmasq',
-  'naginator'
 ].each do |module_name|
   mod "CiscoSystems/#{module_name}",
     :git => "#{cisco_module_prefix}#{module_name}",
diff --git a/data/class_groups/build.yaml b/data/class_groups/build.yaml
index 4ffaf6a..bec6ccf 100644
--- a/data/class_groups/build.yaml
+++ b/data/class_groups/build.yaml
@@ -1,6 +1,5 @@
 classes:
   - apache
-  - naginator
   - collectd
   # - coi::profiles::cobbler_server
   - coi::profiles::cache_server
diff --git a/data/data_mappings/common.yaml b/data/data_mappings/common.yaml
index 3347f1a..8a85dfb 100644
--- a/data/data_mappings/common.yaml
+++ b/data/data_mappings/common.yaml
@@ -299,9 +299,9 @@ package_ensure:
   - neutron::agents::vpnaas::package_ensure
 region:
   - cinder::keystone::auth::region
-  - glance:keystone::auth::region
-  - nova:keystone::auth::region
-  - quantum:keystone::auth::region
+  - glance::keystone::auth::region
+  - nova::keystone::auth::region
+  - quantum::keystone::auth::region
   - neutron::keystone::auth::region
   - keystone::endpoint::region
   - nova::network::quantumclient::quantum_region_name
@@ -309,6 +309,17 @@ region:
   - quantum::agents::metadata::auth_region
   - neutron::agents::metadata::auth_region
   - ceilometer::keystone::auth::region
+  - ceilometer::agent::auth::auth_region
+  - heat::keystone::auth::region
+  - heat::keystone::auth_cfn::region
+  - nova::network::neutron::neutron_region_name
+  - neutron::keystone::auth::region
+  - openstack-ha::controller::region
+  - openstack::controller::region
+  - openstack::keystone::region
+  - openstack::all::region
+  - openstack::auth_file::region_name
+  - swift::keystone::auth::region
 neutron_sync_db:
   - neutron::server::sync_db
 # SSL support
diff --git a/data/data_mappings/enable_ha/true.yaml b/data/data_mappings/enable_ha/true.yaml
index 10b018a..9d985c2 100644
--- a/data/data_mappings/enable_ha/true.yaml
+++ b/data/data_mappings/enable_ha/true.yaml
@@ -32,10 +32,12 @@ allowed_hosts:
   - quantum::db::mysql::allowed_hosts
   - neutron::db::mysql::allowed_hosts
 bind_address:
+  - horizon::bind_address
   - horizon::cache_server_ip
   - cinder::api::bind_host
   - glance::registry::bind_host
   - glance::api::bind_host
+  - nova::vncproxy::host
   - nova::api::api_bind_address
   - mysql::config::bind_address
   - keystone::bind_host
diff --git a/data/hiera_data/common.yaml b/data/hiera_data/common.yaml
index 4bf9c76..961c0f2 100644
--- a/data/hiera_data/common.yaml
+++ b/data/hiera_data/common.yaml
@@ -148,10 +148,6 @@ openstack::test_file::image_type: cirros
 # This is often overridden in higher-layer yaml files.
 openstack::client::ceilometer: false
 
-# The ISCSI IP address given to initiators when using the iSCSI driver
-# for Cinder.  This should generally match the public IP address.
-cinder::volume::iscsi::iscsi_ip_address: 0.0.0.0
-
 # How to set the swift_store_user directive in swift.conf.
 # This should be an account name and a username separated by
 # a colon.
diff --git a/data/hiera_data/enable_ha/true.yaml b/data/hiera_data/enable_ha/true.yaml
index 5a81d3e..9823ace 100644
--- a/data/hiera_data/enable_ha/true.yaml
+++ b/data/hiera_data/enable_ha/true.yaml
@@ -10,7 +10,7 @@ enabled: true
 #
 # always use the cisco repos when HA is enabled
 #
-coe::base::openstack_repo_location:  http://openstack-repo.cisco.com/openstack
+coe::base::openstack_repo_location:  http://openstack-repo.cisco.com/openstack/cisco
 coe::base::supplemental_repo: http://openstack-repo.cisco.com/openstack/cisco_supplemental
 coe::base::package_repo: cisco_repo
 
diff --git a/data/hiera_data/user.common.yaml b/data/hiera_data/user.common.yaml
index 6fa8fc2..942749a 100644
--- a/data/hiera_data/user.common.yaml
+++ b/data/hiera_data/user.common.yaml
@@ -80,6 +80,9 @@ public_interface: eth1
 # be set to the same interface as public_interface.
 private_interface: eth1
 
+# iSCSI listener interface. Set this the s ame as public_interface.
+cinder::volume::iscsi::iscsi_ip_address: "%{ipaddress_eth1}"
+
 ### Cobbler config
 # The IP address of the node on which Cobbler will be installed and
 # on which it will listen.
diff --git a/data/scenarios/2_role.yaml b/data/scenarios/2_role.yaml
index 4d643d6..630b8a3 100644
--- a/data/scenarios/2_role.yaml
+++ b/data/scenarios/2_role.yaml
@@ -13,7 +13,6 @@ roles:
       - build
   controller:
     classes:
-      - naginator::control_target
       - coe::base
     class_groups:
       - controller
@@ -22,7 +21,6 @@ roles:
   compute:
     classes:
       - coe::base
-      - naginator::compute_target
       - cinder::setup_test_volume
     class_groups:
       - compute
diff --git a/data/scenarios/all_in_one.yaml b/data/scenarios/all_in_one.yaml
index c51a61c..8a22114 100644
--- a/data/scenarios/all_in_one.yaml
+++ b/data/scenarios/all_in_one.yaml
@@ -5,7 +5,6 @@ roles:
   all_in_one:
     classes:
       - coe::base
-      - naginator::compute_target
       - cinder::setup_test_volume
       - openstack::swift::proxy
       - openstack::swift::storage-node
@@ -18,7 +17,6 @@ roles:
   compute:
     classes:
       - coe::base
-      - naginator::compute_target
       - cinder::setup_test_volume
     class_groups:
       - compute
diff --git a/data/scenarios/full_ha.yaml b/data/scenarios/full_ha.yaml
index 48e8c83..f3e1f2c 100644
--- a/data/scenarios/full_ha.yaml
+++ b/data/scenarios/full_ha.yaml
@@ -10,7 +10,6 @@ roles:
       - build
   controller:
     classes:
-      - naginator::control_target
       - coe::base
       - coe::network::interface
       - mongodb::replset
@@ -21,7 +20,6 @@ roles:
       - ceph_mon
   controller_without_mon:
     classes:
-      - naginator::control_target
       - coe::base
       - coe::network::interface
       - mongodb::replset
@@ -37,7 +35,6 @@ roles:
     classes:
       - coe::base
       - coe::network::interface
-      - naginator::compute_target
       - cinder::setup_test_volume
     class_groups:
       - compute
@@ -46,7 +43,6 @@ roles:
     classes:
       - coe::base
       - coe::network::interface
-      - naginator::compute_target
       - cinder::setup_test_volume
     class_groups:
       - compute
diff --git a/data/scenarios/swift.yaml b/data/scenarios/swift.yaml
index 1fdc913..5fc1062 100644
--- a/data/scenarios/swift.yaml
+++ b/data/scenarios/swift.yaml
@@ -10,7 +10,6 @@ roles:
       - build
   controller:
     classes:
-      - naginator::control_target
       - coe::base
     class_groups:
       - controller
diff --git a/install-scripts/install.sh b/install-scripts/install.sh
index c8c10c9..b57cade 100755
--- a/install-scripts/install.sh
+++ b/install-scripts/install.sh
@@ -90,6 +90,7 @@ ntp_servers:
 build_node_name: ${build_server}
 coe::base::controller_hostname: "${build_server}"
 controller_internal_address: "${build_server_ip}"
+cobbler_node_ip: "${build_server_ip}"
 controller_public_address: "${build_server_ip}"
 controller_admin_address: "${build_server_ip}"
 swift_internal_address: "${build_server_ip}"
diff --git a/modules.list b/modules.list
index cd73ac5..4f47585 100644
--- a/modules.list
+++ b/modules.list
@@ -27,7 +27,6 @@ keystone
 memcached
 mongodb
 mysql
-naginator
 network
 neutron
 nova