Merge pull request #427 from Mirantis/fuel-666

Fuel 666 fixes
Mirantis · Jul 31, 2013 · ba6fa14 · ba6fa14
2 parents 633281f + ce794dd
commit ba6fa14
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/deployment/puppet/osnailyfacter/manifests/cluster_ha.pp b/deployment/puppet/osnailyfacter/manifests/cluster_ha.pp
@@ -266,7 +266,6 @@
         rabbit_password        => $rabbit_hash[password],
         rabbit_user            => $rabbit_user,
         rabbit_ha_virtual_ip   => $management_vip,
-        auto_assign_floating_ip => $bool_auto_assign_floating_ip,
         queue_provider         => $::queue_provider,
         qpid_password          => $rabbit_hash[password],
         qpid_user              => $rabbit_user,
@@ -325,9 +324,6 @@
         manage_volumes       => true,
         enabled              => true,
         auth_host            => $management_vip,
-        qpid_password        => $rabbit_hash[password],
-        qpid_user            => $rabbit_user,
-        qpid_nodes           => $controller_hostnames,
         iscsi_bind_host      => $storage_address,
         cinder_user_password => $cinder_hash[user_password],
         use_syslog           => true,

diff --git a/deployment/puppet/osnailyfacter/manifests/network_setup.pp b/deployment/puppet/osnailyfacter/manifests/network_setup.pp
@@ -28,8 +28,8 @@
 }
 
 class osnailyfacter::network_setup (
-  interfaces = keys(parsejson($network_data)),
-  network_settings = parsejson($network_data),
+  $interfaces = keys(parsejson($network_data)),
+  $network_settings = parsejson($network_data),
 ) {
   setup_interfaces{$interfaces: network_settings=>$network_settings} ->
   check_base_interfaces{$interfaces:}