diff --git a/manifests/api.pp b/manifests/api.pp index 697d81044..1f5cb6bd7 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -83,7 +83,7 @@ class nova::api( } } else { nova_config { - 'DEFAULT/service_neutron_metadata_proxy': value => false; + 'DEFAULT/service_neutron_metadata_proxy': value => false; 'DEFAULT/neutron_metadata_proxy_shared_secret': ensure => absent; } } diff --git a/manifests/init.pp b/manifests/init.pp index a9e693234..6c93340f1 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -187,11 +187,11 @@ class nova( } if $rabbit_hosts { - nova_config { 'DEFAULT/rabbit_hosts': value => join($rabbit_hosts, ',') } - nova_config { 'DEFAULT/rabbit_ha_queues': value => true } + nova_config { 'DEFAULT/rabbit_hosts': value => join($rabbit_hosts, ',') } + nova_config { 'DEFAULT/rabbit_ha_queues': value => true } } else { - nova_config { 'DEFAULT/rabbit_host': value => $rabbit_host } - nova_config { 'DEFAULT/rabbit_port': value => $rabbit_port } + nova_config { 'DEFAULT/rabbit_host': value => $rabbit_host } + nova_config { 'DEFAULT/rabbit_port': value => $rabbit_port } nova_config { 'DEFAULT/rabbit_hosts': value => "${rabbit_host}:${rabbit_port}" } nova_config { 'DEFAULT/rabbit_ha_queues': value => false } } diff --git a/manifests/quota.pp b/manifests/quota.pp index 76ff5641e..4badfcf92 100644 --- a/manifests/quota.pp +++ b/manifests/quota.pp @@ -19,22 +19,22 @@ class nova::quota( ) { nova_config { - 'DEFAULT/quota_instances': value => $quota_instances; - 'DEFAULT/quota_cores': value => $quota_cores; - 'DEFAULT/quota_ram': value => $quota_ram; - 'DEFAULT/quota_volumes': value => $quota_volumes; - 'DEFAULT/quota_gigabytes': value => $quota_gigabytes; - 'DEFAULT/quota_floating_ips': value => $quota_floating_ips; - 'DEFAULT/quota_metadata_items': value => $quota_metadata_items; - 'DEFAULT/quota_max_injected_files': value => $quota_max_injected_files; + 'DEFAULT/quota_instances': value => $quota_instances; + 'DEFAULT/quota_cores': value => $quota_cores; + 'DEFAULT/quota_ram': value => $quota_ram; + 'DEFAULT/quota_volumes': value => $quota_volumes; + 'DEFAULT/quota_gigabytes': value => $quota_gigabytes; + 'DEFAULT/quota_floating_ips': value => $quota_floating_ips; + 'DEFAULT/quota_metadata_items': value => $quota_metadata_items; + 'DEFAULT/quota_max_injected_files': value => $quota_max_injected_files; 'DEFAULT/quota_max_injected_file_content_bytes': value => $quota_max_injected_file_content_bytes; - 'DEFAULT/quota_max_injected_file_path_bytes': value => $quota_max_injected_file_path_bytes; - 'DEFAULT/quota_security_groups': value => $quota_security_groups; - 'DEFAULT/quota_security_group_rules': value => $quota_security_group_rules; - 'DEFAULT/quota_key_pairs': value => $quota_key_pairs; - 'DEFAULT/reservation_expire': value => $reservation_expire; - 'DEFAULT/max_age': value => $max_age; - 'DEFAULT/quota_driver': value => $quota_driver + 'DEFAULT/quota_max_injected_file_path_bytes': value => $quota_max_injected_file_path_bytes; + 'DEFAULT/quota_security_groups': value => $quota_security_groups; + 'DEFAULT/quota_security_group_rules': value => $quota_security_group_rules; + 'DEFAULT/quota_key_pairs': value => $quota_key_pairs; + 'DEFAULT/reservation_expire': value => $reservation_expire; + 'DEFAULT/max_age': value => $max_age; + 'DEFAULT/quota_driver': value => $quota_driver } }