diff --git a/resources/apache_puppet/actions/run.pp b/resources/apache_puppet/actions/run.pp index ee2379da..52d642de 100644 --- a/resources/apache_puppet/actions/run.pp +++ b/resources/apache_puppet/actions/run.pp @@ -1,61 +1,61 @@ $resource = hiera($::resource_name) -$apache_name = $resource['input']['apache_name']['value'] -$service_name = $resource['input']['service_name']['value'] -$default_mods = $resource['input']['default_mods']['value'] -$default_vhost = $resource['input']['default_vhost']['value'] -$default_charset = $resource['input']['default_charset']['value'] -$default_confd_files = $resource['input']['default_confd_files']['value'] -$default_ssl_vhost = $resource['input']['default_ssl_vhost']['value'] -$default_ssl_cert = $resource['input']['default_ssl_cert']['value'] -$default_ssl_key = $resource['input']['default_ssl_key']['value'] -$default_ssl_chain = $resource['input']['default_ssl_chain']['value'] -$default_ssl_ca = $resource['input']['default_ssl_ca']['value'] -$default_ssl_crl_path = $resource['input']['default_ssl_crl_path']['value'] -$default_ssl_crl = $resource['input']['default_ssl_crl']['value'] -$default_ssl_crl_check = $resource['input']['default_ssl_crl_check']['value'] -$default_type = $resource['input']['default_type']['value'] -$ip = $resource['input']['ip']['value'] -$service_restart = $resource['input']['service_restart']['value'] -$purge_configs = $resource['input']['purge_configs']['value'] -$purge_vhost_dir = $resource['input']['purge_vhost_dir']['value'] -$purge_vdir = $resource['input']['purge_vdir']['value'] -$serveradmin = $resource['input']['serveradmin']['value'] -$sendfile = $resource['input']['sendfile']['value'] -$error_documents = $resource['input']['error_documents']['value'] -$timeout = $resource['input']['timeout']['value'] -$httpd_dir = $resource['input']['httpd_dir']['value'] -$server_root = $resource['input']['server_root']['value'] -$conf_dir = $resource['input']['conf_dir']['value'] -$confd_dir = $resource['input']['confd_dir']['value'] -$vhost_dir = $resource['input']['vhost_dir']['value'] -$vhost_enable_dir = $resource['input']['vhost_enable_dir']['value'] -$mod_dir = $resource['input']['mod_dir']['value'] -$mod_enable_dir = $resource['input']['mod_enable_dir']['value'] -$mpm_module = $resource['input']['mpm_module']['value'] -$lib_path = $resource['input']['lib_path']['value'] -$conf_template = $resource['input']['conf_template']['value'] -$servername = $resource['input']['servername']['value'] -$manage_user = $resource['input']['manage_user']['value'] -$manage_group = $resource['input']['manage_group']['value'] -$user = $resource['input']['user']['value'] -$group = $resource['input']['group']['value'] -$keepalive = $resource['input']['keepalive']['value'] -$keepalive_timeout = $resource['input']['keepalive_timeout']['value'] -$max_keepalive_requests = $resource['input']['max_keepalive_requests']['value'] -$logroot = $resource['input']['logroot']['value'] -$logroot_mode = $resource['input']['logroot_mode']['value'] -$log_level = $resource['input']['log_level']['value'] -$log_formats = $resource['input']['log_formats']['value'] -$ports_file = $resource['input']['ports_file']['value'] -$docroot = $resource['input']['docroot']['value'] -$apache_version = $resource['input']['apache_version']['value'] -$server_tokens = $resource['input']['server_tokens']['value'] -$server_signature = $resource['input']['server_signature']['value'] -$trace_enable = $resource['input']['trace_enable']['value'] -$allow_encoded_slashes = $resource['input']['allow_encoded_slashes']['value'] -$package_ensure = $resource['input']['package_ensure']['value'] -$use_optional_includes = $resource['input']['use_optional_includes']['value'] +$apache_name = $resource['input']['apache_name'] +$service_name = $resource['input']['service_name'] +$default_mods = $resource['input']['default_mods'] +$default_vhost = $resource['input']['default_vhost'] +$default_charset = $resource['input']['default_charset'] +$default_confd_files = $resource['input']['default_confd_files'] +$default_ssl_vhost = $resource['input']['default_ssl_vhost'] +$default_ssl_cert = $resource['input']['default_ssl_cert'] +$default_ssl_key = $resource['input']['default_ssl_key'] +$default_ssl_chain = $resource['input']['default_ssl_chain'] +$default_ssl_ca = $resource['input']['default_ssl_ca'] +$default_ssl_crl_path = $resource['input']['default_ssl_crl_path'] +$default_ssl_crl = $resource['input']['default_ssl_crl'] +$default_ssl_crl_check = $resource['input']['default_ssl_crl_check'] +$default_type = $resource['input']['default_type'] +$ip = $resource['input']['ip'] +$service_restart = $resource['input']['service_restart'] +$purge_configs = $resource['input']['purge_configs'] +$purge_vhost_dir = $resource['input']['purge_vhost_dir'] +$purge_vdir = $resource['input']['purge_vdir'] +$serveradmin = $resource['input']['serveradmin'] +$sendfile = $resource['input']['sendfile'] +$error_documents = $resource['input']['error_documents'] +$timeout = $resource['input']['timeout'] +$httpd_dir = $resource['input']['httpd_dir'] +$server_root = $resource['input']['server_root'] +$conf_dir = $resource['input']['conf_dir'] +$confd_dir = $resource['input']['confd_dir'] +$vhost_dir = $resource['input']['vhost_dir'] +$vhost_enable_dir = $resource['input']['vhost_enable_dir'] +$mod_dir = $resource['input']['mod_dir'] +$mod_enable_dir = $resource['input']['mod_enable_dir'] +$mpm_module = $resource['input']['mpm_module'] +$lib_path = $resource['input']['lib_path'] +$conf_template = $resource['input']['conf_template'] +$servername = $resource['input']['servername'] +$manage_user = $resource['input']['manage_user'] +$manage_group = $resource['input']['manage_group'] +$user = $resource['input']['user'] +$group = $resource['input']['group'] +$keepalive = $resource['input']['keepalive'] +$keepalive_timeout = $resource['input']['keepalive_timeout'] +$max_keepalive_requests = $resource['input']['max_keepalive_requests'] +$logroot = $resource['input']['logroot'] +$logroot_mode = $resource['input']['logroot_mode'] +$log_level = $resource['input']['log_level'] +$log_formats = $resource['input']['log_formats'] +$ports_file = $resource['input']['ports_file'] +$docroot = $resource['input']['docroot'] +$apache_version = $resource['input']['apache_version'] +$server_tokens = $resource['input']['server_tokens'] +$server_signature = $resource['input']['server_signature'] +$trace_enable = $resource['input']['trace_enable'] +$allow_encoded_slashes = $resource['input']['allow_encoded_slashes'] +$package_ensure = $resource['input']['package_ensure'] +$use_optional_includes = $resource['input']['use_optional_includes'] class {'apache': apache_name => $apache_name, diff --git a/resources/cinder_api_puppet/actions/run.pp b/resources/cinder_api_puppet/actions/run.pp index 857cbca1..f7d18786 100644 --- a/resources/cinder_api_puppet/actions/run.pp +++ b/resources/cinder_api_puppet/actions/run.pp @@ -1,24 +1,24 @@ $resource = hiera($::resource_name) -$keystone_password = $resource['input']['keystone_password']['value'] -$keystone_enabled = $resource['input']['keystone_enabled']['value'] -$keystone_tenant = $resource['input']['keystone_tenant']['value'] -$keystone_user = $resource['input']['keystone_user']['value'] -$keystone_auth_host = $resource['input']['keystone_auth_host']['value'] -$keystone_auth_port = $resource['input']['keystone_auth_port']['value'] -$keystone_auth_protocol = $resource['input']['keystone_auth_protocol']['value'] -$keystone_auth_admin_prefix = $resource['input']['keystone_auth_admin_prefix']['value'] -$keystone_auth_uri = $resource['input']['keystone_auth_uri']['value'] -$os_region_name = $resource['input']['os_region_name']['value'] -$service_port = $resource['input']['service_port']['value'] -$service_workers = $resource['input']['service_workers']['value'] -$package_ensure = $resource['input']['package_ensure']['value'] -$bind_host = $resource['input']['bind_host']['value'] -$ratelimits = $resource['input']['ratelimits']['value'] -$default_volume_type = $resource['input']['default_volume_type']['value'] -$ratelimits_factory = $resource['input']['ratelimits_factory']['value'] -$validate = $resource['input']['validate']['value'] -$validation_options = $resource['input']['validation_options']['value'] +$keystone_password = $resource['input']['keystone_password'] +$keystone_enabled = $resource['input']['keystone_enabled'] +$keystone_tenant = $resource['input']['keystone_tenant'] +$keystone_user = $resource['input']['keystone_user'] +$keystone_auth_host = $resource['input']['keystone_auth_host'] +$keystone_auth_port = $resource['input']['keystone_auth_port'] +$keystone_auth_protocol = $resource['input']['keystone_auth_protocol'] +$keystone_auth_admin_prefix = $resource['input']['keystone_auth_admin_prefix'] +$keystone_auth_uri = $resource['input']['keystone_auth_uri'] +$os_region_name = $resource['input']['os_region_name'] +$service_port = $resource['input']['service_port'] +$service_workers = $resource['input']['service_workers'] +$package_ensure = $resource['input']['package_ensure'] +$bind_host = $resource['input']['bind_host'] +$ratelimits = $resource['input']['ratelimits'] +$default_volume_type = $resource['input']['default_volume_type'] +$ratelimits_factory = $resource['input']['ratelimits_factory'] +$validate = $resource['input']['validate'] +$validation_options = $resource['input']['validation_options'] include cinder::params diff --git a/resources/cinder_api_puppet/actions/update.pp b/resources/cinder_api_puppet/actions/update.pp index f0eae3f4..3486c9a2 100644 --- a/resources/cinder_api_puppet/actions/update.pp +++ b/resources/cinder_api_puppet/actions/update.pp @@ -1,24 +1,24 @@ $resource = hiera($::resource_name) -$keystone_password = $resource['input']['keystone_password']['value'] -$keystone_enabled = $resource['input']['keystone_enabled']['value'] -$keystone_tenant = $resource['input']['keystone_tenant']['value'] -$keystone_user = $resource['input']['keystone_user']['value'] -$keystone_auth_host = $resource['input']['keystone_auth_host']['value'] -$keystone_auth_port = $resource['input']['keystone_auth_port']['value'] -$keystone_auth_protocol = $resource['input']['keystone_auth_protocol']['value'] -$keystone_auth_admin_prefix = $resource['input']['keystone_auth_admin_prefix']['value'] -$keystone_auth_uri = $resource['input']['keystone_auth_uri']['value'] -$os_region_name = $resource['input']['os_region_name']['value'] -$service_port = $resource['input']['service_port']['value'] -$service_workers = $resource['input']['service_workers']['value'] -$package_ensure = $resource['input']['package_ensure']['value'] -$bind_host = $resource['input']['bind_host']['value'] -$ratelimits = $resource['input']['ratelimits']['value'] -$default_volume_type = $resource['input']['default_volume_type']['value'] -$ratelimits_factory = $resource['input']['ratelimits_factory']['value'] -$validate = $resource['input']['validate']['value'] -$validation_options = $resource['input']['validation_options']['value'] +$keystone_password = $resource['input']['keystone_password'] +$keystone_enabled = $resource['input']['keystone_enabled'] +$keystone_tenant = $resource['input']['keystone_tenant'] +$keystone_user = $resource['input']['keystone_user'] +$keystone_auth_host = $resource['input']['keystone_auth_host'] +$keystone_auth_port = $resource['input']['keystone_auth_port'] +$keystone_auth_protocol = $resource['input']['keystone_auth_protocol'] +$keystone_auth_admin_prefix = $resource['input']['keystone_auth_admin_prefix'] +$keystone_auth_uri = $resource['input']['keystone_auth_uri'] +$os_region_name = $resource['input']['os_region_name'] +$service_port = $resource['input']['service_port'] +$service_workers = $resource['input']['service_workers'] +$package_ensure = $resource['input']['package_ensure'] +$bind_host = $resource['input']['bind_host'] +$ratelimits = $resource['input']['ratelimits'] +$default_volume_type = $resource['input']['default_volume_type'] +$ratelimits_factory = $resource['input']['ratelimits_factory'] +$validate = $resource['input']['validate'] +$validation_options = $resource['input']['validation_options'] include cinder::params diff --git a/resources/cinder_glance_puppet/actions/run.pp b/resources/cinder_glance_puppet/actions/run.pp index c5b030d7..fdbe9618 100644 --- a/resources/cinder_glance_puppet/actions/run.pp +++ b/resources/cinder_glance_puppet/actions/run.pp @@ -1,12 +1,12 @@ $resource = hiera($::resource_name) -$glance_api_version = $resource['input']['glance_api_version']['value'] -$glance_num_retries = $resource['input']['glance_num_retries']['value'] -$glance_api_insecure = $resource['input']['glance_api_insecure']['value'] -$glance_api_ssl_compression = $resource['input']['glance_api_ssl_compression']['value'] -$glance_request_timeout = $resource['input']['glance_request_timeout']['value'] -$glance_api_servers_host = $resource['input']['glance_api_servers_host']['value'] -$glance_api_servers_port = $resource['input']['glance_api_servers_port']['value'] +$glance_api_version = $resource['input']['glance_api_version'] +$glance_num_retries = $resource['input']['glance_num_retries'] +$glance_api_insecure = $resource['input']['glance_api_insecure'] +$glance_api_ssl_compression = $resource['input']['glance_api_ssl_compression'] +$glance_request_timeout = $resource['input']['glance_request_timeout'] +$glance_api_servers_host = $resource['input']['glance_api_servers_host'] +$glance_api_servers_port = $resource['input']['glance_api_servers_port'] class {'cinder::glance': glance_api_servers => "${glance_api_servers_host}:${glance_api_servers_port}", diff --git a/resources/cinder_puppet/actions/run.pp b/resources/cinder_puppet/actions/run.pp index d8daffd9..cb456062 100644 --- a/resources/cinder_puppet/actions/run.pp +++ b/resources/cinder_puppet/actions/run.pp @@ -1,65 +1,65 @@ $resource = hiera($::resource_name) -$ip = $resource['input']['ip']['value'] +$ip = $resource['input']['ip'] -$db_user = $resource['input']['db_user']['value'] -$db_password = $resource['input']['db_password']['value'] -$db_name = $resource['input']['db_name']['value'] -$db_host = $resource['input']['db_host']['value'] -$db_port = $resource['input']['db_port']['value'] +$db_user = $resource['input']['db_user'] +$db_password = $resource['input']['db_password'] +$db_name = $resource['input']['db_name'] +$db_host = $resource['input']['db_host'] +$db_port = $resource['input']['db_port'] -$database_connection = $resource['input']['database_connection']['value'] -$database_idle_timeout = $resource['input']['database_idle_timeout']['value'] -$database_min_pool_size = $resource['input']['database_min_pool_size']['value'] -$database_max_pool_size = $resource['input']['database_max_pool_size']['value'] -$database_max_retries = $resource['input']['database_max_retries']['value'] -$database_retry_interval = $resource['input']['database_retry_interval']['value'] -$database_max_overflow = $resource['input']['database_max_overflow']['value'] -$rpc_backend = $resource['input']['rpc_backend']['value'] -$control_exchange = $resource['input']['control_exchange']['value'] -$rabbit_host = $resource['input']['rabbit_host']['value'] -$rabbit_port = $resource['input']['rabbit_port']['value'] -$rabbit_hosts = $resource['input']['rabbit_hosts']['value'] -$rabbit_virtual_host = $resource['input']['rabbit_virtual_host']['value'] -$rabbit_userid = $resource['input']['rabbit_userid']['value'] -$rabbit_password = $resource['input']['rabbit_password']['value'] -$rabbit_use_ssl = $resource['input']['rabbit_use_ssl']['value'] -$kombu_ssl_ca_certs = $resource['input']['kombu_ssl_ca_certs']['value'] -$kombu_ssl_certfile = $resource['input']['kombu_ssl_certfile']['value'] -$kombu_ssl_keyfile = $resource['input']['kombu_ssl_keyfile']['value'] -$kombu_ssl_version = $resource['input']['kombu_ssl_version']['value'] -$amqp_durable_queues = $resource['input']['amqp_durable_queues']['value'] -$qpid_hostname = $resource['input']['qpid_hostname']['value'] -$qpid_port = $resource['input']['qpid_port']['value'] -$qpid_username = $resource['input']['qpid_username']['value'] -$qpid_password = $resource['input']['qpid_password']['value'] -$qpid_sasl_mechanisms = $resource['input']['qpid_sasl_mechanisms']['value'] -$qpid_reconnect = $resource['input']['qpid_reconnect']['value'] -$qpid_reconnect_timeout = $resource['input']['qpid_reconnect_timeout']['value'] -$qpid_reconnect_limit = $resource['input']['qpid_reconnect_limit']['value'] -$qpid_reconnect_interval_min = $resource['input']['qpid_reconnect_interval_min']['value'] -$qpid_reconnect_interval_max = $resource['input']['qpid_reconnect_interval_max']['value'] -$qpid_reconnect_interval = $resource['input']['qpid_reconnect_interval']['value'] -$qpid_heartbeat = $resource['input']['qpid_heartbeat']['value'] -$qpid_protocol = $resource['input']['qpid_protocol']['value'] -$qpid_tcp_nodelay = $resource['input']['qpid_tcp_nodelay']['value'] -$package_ensure = $resource['input']['package_ensure']['value'] -$use_ssl = $resource['input']['use_ssl']['value'] -$ca_file = $resource['input']['ca_file']['value'] -$cert_file = $resource['input']['cert_file']['value'] -$key_file = $resource['input']['key_file']['value'] -$api_paste_config = $resource['input']['api_paste_config']['value'] -$use_syslog = $resource['input']['use_syslog']['value'] -$log_facility = $resource['input']['log_facility']['value'] -$log_dir = $resource['input']['log_dir']['value'] -$verbose = $resource['input']['verbose']['value'] -$debug = $resource['input']['debug']['value'] -$storage_availability_zone = $resource['input']['storage_availability_zone']['value'] -$default_availability_zone = $resource['input']['default_availability_zone']['value'] -$mysql_module = $resource['input']['mysql_module']['value'] +$database_connection = $resource['input']['database_connection'] +$database_idle_timeout = $resource['input']['database_idle_timeout'] +$database_min_pool_size = $resource['input']['database_min_pool_size'] +$database_max_pool_size = $resource['input']['database_max_pool_size'] +$database_max_retries = $resource['input']['database_max_retries'] +$database_retry_interval = $resource['input']['database_retry_interval'] +$database_max_overflow = $resource['input']['database_max_overflow'] +$rpc_backend = $resource['input']['rpc_backend'] +$control_exchange = $resource['input']['control_exchange'] +$rabbit_host = $resource['input']['rabbit_host'] +$rabbit_port = $resource['input']['rabbit_port'] +$rabbit_hosts = $resource['input']['rabbit_hosts'] +$rabbit_virtual_host = $resource['input']['rabbit_virtual_host'] +$rabbit_userid = $resource['input']['rabbit_userid'] +$rabbit_password = $resource['input']['rabbit_password'] +$rabbit_use_ssl = $resource['input']['rabbit_use_ssl'] +$kombu_ssl_ca_certs = $resource['input']['kombu_ssl_ca_certs'] +$kombu_ssl_certfile = $resource['input']['kombu_ssl_certfile'] +$kombu_ssl_keyfile = $resource['input']['kombu_ssl_keyfile'] +$kombu_ssl_version = $resource['input']['kombu_ssl_version'] +$amqp_durable_queues = $resource['input']['amqp_durable_queues'] +$qpid_hostname = $resource['input']['qpid_hostname'] +$qpid_port = $resource['input']['qpid_port'] +$qpid_username = $resource['input']['qpid_username'] +$qpid_password = $resource['input']['qpid_password'] +$qpid_sasl_mechanisms = $resource['input']['qpid_sasl_mechanisms'] +$qpid_reconnect = $resource['input']['qpid_reconnect'] +$qpid_reconnect_timeout = $resource['input']['qpid_reconnect_timeout'] +$qpid_reconnect_limit = $resource['input']['qpid_reconnect_limit'] +$qpid_reconnect_interval_min = $resource['input']['qpid_reconnect_interval_min'] +$qpid_reconnect_interval_max = $resource['input']['qpid_reconnect_interval_max'] +$qpid_reconnect_interval = $resource['input']['qpid_reconnect_interval'] +$qpid_heartbeat = $resource['input']['qpid_heartbeat'] +$qpid_protocol = $resource['input']['qpid_protocol'] +$qpid_tcp_nodelay = $resource['input']['qpid_tcp_nodelay'] +$package_ensure = $resource['input']['package_ensure'] +$use_ssl = $resource['input']['use_ssl'] +$ca_file = $resource['input']['ca_file'] +$cert_file = $resource['input']['cert_file'] +$key_file = $resource['input']['key_file'] +$api_paste_config = $resource['input']['api_paste_config'] +$use_syslog = $resource['input']['use_syslog'] +$log_facility = $resource['input']['log_facility'] +$log_dir = $resource['input']['log_dir'] +$verbose = $resource['input']['verbose'] +$debug = $resource['input']['debug'] +$storage_availability_zone = $resource['input']['storage_availability_zone'] +$default_availability_zone = $resource['input']['default_availability_zone'] +$mysql_module = $resource['input']['mysql_module'] # Do not apply the legacy stuff -#$sql_connection = $resource['input']['sql_connection']['value'] -$sql_idle_timeout = $resource['input']['sql_idle_timeout']['value'] +#$sql_connection = $resource['input']['sql_connection'] +$sql_idle_timeout = $resource['input']['sql_idle_timeout'] class {'cinder': database_connection => "mysql://${db_user}:${db_password}@${db_host}:${db_port}/${db_name}", diff --git a/resources/cinder_scheduler_puppet/actions/run.pp b/resources/cinder_scheduler_puppet/actions/run.pp index 5d963a6d..8a354de1 100644 --- a/resources/cinder_scheduler_puppet/actions/run.pp +++ b/resources/cinder_scheduler_puppet/actions/run.pp @@ -1,7 +1,7 @@ $resource = hiera($::resource_name) -$scheduler_driver = $resource['input']['scheduler_driver']['value'] -$package_ensure = $resource['input']['package_ensure']['value'] +$scheduler_driver = $resource['input']['scheduler_driver'] +$package_ensure = $resource['input']['package_ensure'] include cinder::params diff --git a/resources/cinder_scheduler_puppet/actions/update.pp b/resources/cinder_scheduler_puppet/actions/update.pp index de3c4109..7b67bfd3 100644 --- a/resources/cinder_scheduler_puppet/actions/update.pp +++ b/resources/cinder_scheduler_puppet/actions/update.pp @@ -1,7 +1,7 @@ $resource = hiera($::resource_name) -$scheduler_driver = $resource['input']['scheduler_driver']['value'] -$package_ensure = $resource['input']['package_ensure']['value'] +$scheduler_driver = $resource['input']['scheduler_driver'] +$package_ensure = $resource['input']['package_ensure'] include cinder::params diff --git a/resources/cinder_volume_puppet/actions/run.pp b/resources/cinder_volume_puppet/actions/run.pp index 91e9b5d3..58a7ea4e 100644 --- a/resources/cinder_volume_puppet/actions/run.pp +++ b/resources/cinder_volume_puppet/actions/run.pp @@ -1,12 +1,12 @@ $resource = hiera($::resource_name) -$package_ensure = $resource['input']['package_ensure']['value'] -$use_iscsi_backend = $resource['input']['use_iscsi_backend']['value'] +$package_ensure = $resource['input']['package_ensure'] +$use_iscsi_backend = $resource['input']['use_iscsi_backend'] -$iscsi_ip_address = $resource['input']['iscsi_ip_address']['value'] -$volume_driver = $resource['input']['volume_driver']['value'] -$volume_group = $resource['input']['volume_group']['value'] -$iscsi_helper = $resource['input']['iscsi_helper']['value'] +$iscsi_ip_address = $resource['input']['iscsi_ip_address'] +$volume_driver = $resource['input']['volume_driver'] +$volume_group = $resource['input']['volume_group'] +$iscsi_helper = $resource['input']['iscsi_helper'] include cinder::params diff --git a/resources/cinder_volume_puppet/actions/update.pp b/resources/cinder_volume_puppet/actions/update.pp index 22964e05..b8f23629 100644 --- a/resources/cinder_volume_puppet/actions/update.pp +++ b/resources/cinder_volume_puppet/actions/update.pp @@ -1,12 +1,12 @@ $resource = hiera($::resource_name) -$package_ensure = $resource['input']['package_ensure']['value'] -$use_iscsi_backend = $resource['input']['use_iscsi_backend']['value'] +$package_ensure = $resource['input']['package_ensure'] +$use_iscsi_backend = $resource['input']['use_iscsi_backend'] -$iscsi_ip_address = $resource['input']['iscsi_ip_address']['value'] -$volume_driver = $resource['input']['volume_driver']['value'] -$volume_group = $resource['input']['volume_group']['value'] -$iscsi_helper = $resource['input']['iscsi_helper']['value'] +$iscsi_ip_address = $resource['input']['iscsi_ip_address'] +$volume_driver = $resource['input']['volume_driver'] +$volume_group = $resource['input']['volume_group'] +$iscsi_helper = $resource['input']['iscsi_helper'] include cinder::params diff --git a/resources/glance_puppet/actions/run.pp b/resources/glance_puppet/actions/run.pp index 10b10b19..ed2e3d13 100644 --- a/resources/glance_puppet/actions/run.pp +++ b/resources/glance_puppet/actions/run.pp @@ -1,53 +1,53 @@ $resource = hiera($::resource_name) -$ip = $resource['input']['ip']['value'] +$ip = $resource['input']['ip'] -$db_user = $resource['input']['db_user']['value'] -$db_password = $resource['input']['db_password']['value'] -$db_name = $resource['input']['db_name']['value'] -$db_host = $resource['input']['db_host']['value'] -$db_port = $resource['input']['db_port']['value'] +$db_user = $resource['input']['db_user'] +$db_password = $resource['input']['db_password'] +$db_name = $resource['input']['db_name'] +$db_host = $resource['input']['db_host'] +$db_port = $resource['input']['db_port'] -$filesystem_store_datadir = $resource['input']['filesystem_store_datadir']['value'] +$filesystem_store_datadir = $resource['input']['filesystem_store_datadir'] -$keystone_password = $resource['input']['keystone_password']['value'] -$verbose = $resource['input']['verbose']['value'] -$debug = $resource['input']['debug']['value'] -$bind_host = $resource['input']['bind_host']['value'] -$bind_port = $resource['input']['bind_port']['value'] -$backlog = $resource['input']['backlog']['value'] -$workers = $resource['input']['workers']['value'] -$log_file = $resource['input']['log_file']['value'] -$log_dir = $resource['input']['log_dir']['value'] -$registry_host = $resource['input']['registry_host']['value'] -$registry_port = $resource['input']['registry_port']['value'] -$registry_client_protocol = $resource['input']['registry_client_protocol']['value'] -$auth_type = $resource['input']['auth_type']['value'] -$auth_host = $resource['input']['auth_host']['value'] -$auth_url = $resource['input']['auth_url']['value'] -$auth_port = $resource['input']['auth_port']['value'] -$auth_uri = $resource['input']['auth_uri']['value'] -$auth_admin_prefix = $resource['input']['auth_admin_prefix']['value'] -$auth_protocol = $resource['input']['auth_protocol']['value'] -$pipeline = $resource['input']['pipeline']['value'] -$keystone_tenant = $resource['input']['keystone_tenant']['value'] -$keystone_user = $resource['input']['keystone_user']['value'] -$use_syslog = $resource['input']['use_syslog']['value'] -$log_facility = $resource['input']['log_facility']['value'] -$show_image_direct_url = $resource['input']['show_image_direct_url']['value'] -$purge_config = $resource['input']['purge_config']['value'] -$cert_file = $resource['input']['cert_file']['value'] -$key_file = $resource['input']['key_file']['value'] -$ca_file = $resource['input']['ca_file']['value'] -$known_stores = $resource['input']['known_stores']['value'] -$database_connection = $resource['input']['database_connection']['value'] -$database_idle_timeout = $resource['input']['database_idle_timeout']['value'] -$image_cache_dir = $resource['input']['image_cache_dir']['value'] -$os_region_name = $resource['input']['os_region_name']['value'] -$validate = $resource['input']['validate']['value'] -$validation_options = $resource['input']['validation_options']['value'] -$mysql_module = $resource['input']['mysql_module']['value'] -$sql_idle_timeout = $resource['input']['sql_idle_timeout']['value'] +$keystone_password = $resource['input']['keystone_password'] +$verbose = $resource['input']['verbose'] +$debug = $resource['input']['debug'] +$bind_host = $resource['input']['bind_host'] +$bind_port = $resource['input']['bind_port'] +$backlog = $resource['input']['backlog'] +$workers = $resource['input']['workers'] +$log_file = $resource['input']['log_file'] +$log_dir = $resource['input']['log_dir'] +$registry_host = $resource['input']['registry_host'] +$registry_port = $resource['input']['registry_port'] +$registry_client_protocol = $resource['input']['registry_client_protocol'] +$auth_type = $resource['input']['auth_type'] +$auth_host = $resource['input']['auth_host'] +$auth_url = $resource['input']['auth_url'] +$auth_port = $resource['input']['auth_port'] +$auth_uri = $resource['input']['auth_uri'] +$auth_admin_prefix = $resource['input']['auth_admin_prefix'] +$auth_protocol = $resource['input']['auth_protocol'] +$pipeline = $resource['input']['pipeline'] +$keystone_tenant = $resource['input']['keystone_tenant'] +$keystone_user = $resource['input']['keystone_user'] +$use_syslog = $resource['input']['use_syslog'] +$log_facility = $resource['input']['log_facility'] +$show_image_direct_url = $resource['input']['show_image_direct_url'] +$purge_config = $resource['input']['purge_config'] +$cert_file = $resource['input']['cert_file'] +$key_file = $resource['input']['key_file'] +$ca_file = $resource['input']['ca_file'] +$known_stores = $resource['input']['known_stores'] +$database_connection = $resource['input']['database_connection'] +$database_idle_timeout = $resource['input']['database_idle_timeout'] +$image_cache_dir = $resource['input']['image_cache_dir'] +$os_region_name = $resource['input']['os_region_name'] +$validate = $resource['input']['validate'] +$validation_options = $resource['input']['validation_options'] +$mysql_module = $resource['input']['mysql_module'] +$sql_idle_timeout = $resource['input']['sql_idle_timeout'] class {'glance': package_ensure => 'present', diff --git a/resources/glance_puppet/actions/update.pp b/resources/glance_puppet/actions/update.pp index 10b10b19..ed2e3d13 100644 --- a/resources/glance_puppet/actions/update.pp +++ b/resources/glance_puppet/actions/update.pp @@ -1,53 +1,53 @@ $resource = hiera($::resource_name) -$ip = $resource['input']['ip']['value'] +$ip = $resource['input']['ip'] -$db_user = $resource['input']['db_user']['value'] -$db_password = $resource['input']['db_password']['value'] -$db_name = $resource['input']['db_name']['value'] -$db_host = $resource['input']['db_host']['value'] -$db_port = $resource['input']['db_port']['value'] +$db_user = $resource['input']['db_user'] +$db_password = $resource['input']['db_password'] +$db_name = $resource['input']['db_name'] +$db_host = $resource['input']['db_host'] +$db_port = $resource['input']['db_port'] -$filesystem_store_datadir = $resource['input']['filesystem_store_datadir']['value'] +$filesystem_store_datadir = $resource['input']['filesystem_store_datadir'] -$keystone_password = $resource['input']['keystone_password']['value'] -$verbose = $resource['input']['verbose']['value'] -$debug = $resource['input']['debug']['value'] -$bind_host = $resource['input']['bind_host']['value'] -$bind_port = $resource['input']['bind_port']['value'] -$backlog = $resource['input']['backlog']['value'] -$workers = $resource['input']['workers']['value'] -$log_file = $resource['input']['log_file']['value'] -$log_dir = $resource['input']['log_dir']['value'] -$registry_host = $resource['input']['registry_host']['value'] -$registry_port = $resource['input']['registry_port']['value'] -$registry_client_protocol = $resource['input']['registry_client_protocol']['value'] -$auth_type = $resource['input']['auth_type']['value'] -$auth_host = $resource['input']['auth_host']['value'] -$auth_url = $resource['input']['auth_url']['value'] -$auth_port = $resource['input']['auth_port']['value'] -$auth_uri = $resource['input']['auth_uri']['value'] -$auth_admin_prefix = $resource['input']['auth_admin_prefix']['value'] -$auth_protocol = $resource['input']['auth_protocol']['value'] -$pipeline = $resource['input']['pipeline']['value'] -$keystone_tenant = $resource['input']['keystone_tenant']['value'] -$keystone_user = $resource['input']['keystone_user']['value'] -$use_syslog = $resource['input']['use_syslog']['value'] -$log_facility = $resource['input']['log_facility']['value'] -$show_image_direct_url = $resource['input']['show_image_direct_url']['value'] -$purge_config = $resource['input']['purge_config']['value'] -$cert_file = $resource['input']['cert_file']['value'] -$key_file = $resource['input']['key_file']['value'] -$ca_file = $resource['input']['ca_file']['value'] -$known_stores = $resource['input']['known_stores']['value'] -$database_connection = $resource['input']['database_connection']['value'] -$database_idle_timeout = $resource['input']['database_idle_timeout']['value'] -$image_cache_dir = $resource['input']['image_cache_dir']['value'] -$os_region_name = $resource['input']['os_region_name']['value'] -$validate = $resource['input']['validate']['value'] -$validation_options = $resource['input']['validation_options']['value'] -$mysql_module = $resource['input']['mysql_module']['value'] -$sql_idle_timeout = $resource['input']['sql_idle_timeout']['value'] +$keystone_password = $resource['input']['keystone_password'] +$verbose = $resource['input']['verbose'] +$debug = $resource['input']['debug'] +$bind_host = $resource['input']['bind_host'] +$bind_port = $resource['input']['bind_port'] +$backlog = $resource['input']['backlog'] +$workers = $resource['input']['workers'] +$log_file = $resource['input']['log_file'] +$log_dir = $resource['input']['log_dir'] +$registry_host = $resource['input']['registry_host'] +$registry_port = $resource['input']['registry_port'] +$registry_client_protocol = $resource['input']['registry_client_protocol'] +$auth_type = $resource['input']['auth_type'] +$auth_host = $resource['input']['auth_host'] +$auth_url = $resource['input']['auth_url'] +$auth_port = $resource['input']['auth_port'] +$auth_uri = $resource['input']['auth_uri'] +$auth_admin_prefix = $resource['input']['auth_admin_prefix'] +$auth_protocol = $resource['input']['auth_protocol'] +$pipeline = $resource['input']['pipeline'] +$keystone_tenant = $resource['input']['keystone_tenant'] +$keystone_user = $resource['input']['keystone_user'] +$use_syslog = $resource['input']['use_syslog'] +$log_facility = $resource['input']['log_facility'] +$show_image_direct_url = $resource['input']['show_image_direct_url'] +$purge_config = $resource['input']['purge_config'] +$cert_file = $resource['input']['cert_file'] +$key_file = $resource['input']['key_file'] +$ca_file = $resource['input']['ca_file'] +$known_stores = $resource['input']['known_stores'] +$database_connection = $resource['input']['database_connection'] +$database_idle_timeout = $resource['input']['database_idle_timeout'] +$image_cache_dir = $resource['input']['image_cache_dir'] +$os_region_name = $resource['input']['os_region_name'] +$validate = $resource['input']['validate'] +$validation_options = $resource['input']['validation_options'] +$mysql_module = $resource['input']['mysql_module'] +$sql_idle_timeout = $resource['input']['sql_idle_timeout'] class {'glance': package_ensure => 'present', diff --git a/resources/glance_registry_puppet/actions/run.pp b/resources/glance_registry_puppet/actions/run.pp index 02c34aa7..1bfad2f8 100644 --- a/resources/glance_registry_puppet/actions/run.pp +++ b/resources/glance_registry_puppet/actions/run.pp @@ -1,42 +1,42 @@ $resource = hiera($::resource_name) -$ip = $resource['input']['ip']['value'] +$ip = $resource['input']['ip'] -$db_user = $resource['input']['db_user']['value'] -$db_password = $resource['input']['db_password']['value'] -$db_name = $resource['input']['db_name']['value'] -$db_host = $resource['input']['db_host']['value'] -$db_port = $resource['input']['db_port']['value'] +$db_user = $resource['input']['db_user'] +$db_password = $resource['input']['db_password'] +$db_name = $resource['input']['db_name'] +$db_host = $resource['input']['db_host'] +$db_port = $resource['input']['db_port'] -$keystone_password = $resource['input']['keystone_password']['value'] -$package_ensure = $resource['input']['package_ensure']['value'] -$verbose = $resource['input']['verbose']['value'] -$debug = $resource['input']['debug']['value'] -$bind_host = $resource['input']['bind_host']['value'] -$bind_port = $resource['input']['bind_port']['value'] -$log_file = $resource['input']['log_file']['value'] -$log_dir = $resource['input']['log_dir']['value'] -$database_connection = $resource['input']['database_connection']['value'] -$database_idle_timeout = $resource['input']['database_idle_timeout']['value'] -$auth_type = $resource['input']['auth_type']['value'] -$auth_host = $resource['input']['auth_host']['value'] -$auth_port = $resource['input']['auth_port']['value'] -$auth_admin_prefix = $resource['input']['auth_admin_prefix']['value'] -$auth_uri = $resource['input']['auth_uri']['value'] -$auth_protocol = $resource['input']['auth_protocol']['value'] -$keystone_tenant = $resource['input']['keystone_tenant']['value'] -$keystone_user = $resource['input']['keystone_user']['value'] -$pipeline = $resource['input']['pipeline']['value'] -$use_syslog = $resource['input']['use_syslog']['value'] -$log_facility = $resource['input']['log_facility']['value'] -$purge_config = $resource['input']['purge_config']['value'] -$cert_file = $resource['input']['cert_file']['value'] -$key_file = $resource['input']['key_file']['value'] -$ca_file = $resource['input']['ca_file']['value'] -$sync_db = $resource['input']['sync_db']['value'] -$mysql_module = $resource['input']['mysql_module']['value'] -$sql_idle_timeout = $resource['input']['sql_idle_timeout']['value'] -$sql_connection = $resource['input']['sql_connection']['value'] +$keystone_password = $resource['input']['keystone_password'] +$package_ensure = $resource['input']['package_ensure'] +$verbose = $resource['input']['verbose'] +$debug = $resource['input']['debug'] +$bind_host = $resource['input']['bind_host'] +$bind_port = $resource['input']['bind_port'] +$log_file = $resource['input']['log_file'] +$log_dir = $resource['input']['log_dir'] +$database_connection = $resource['input']['database_connection'] +$database_idle_timeout = $resource['input']['database_idle_timeout'] +$auth_type = $resource['input']['auth_type'] +$auth_host = $resource['input']['auth_host'] +$auth_port = $resource['input']['auth_port'] +$auth_admin_prefix = $resource['input']['auth_admin_prefix'] +$auth_uri = $resource['input']['auth_uri'] +$auth_protocol = $resource['input']['auth_protocol'] +$keystone_tenant = $resource['input']['keystone_tenant'] +$keystone_user = $resource['input']['keystone_user'] +$pipeline = $resource['input']['pipeline'] +$use_syslog = $resource['input']['use_syslog'] +$log_facility = $resource['input']['log_facility'] +$purge_config = $resource['input']['purge_config'] +$cert_file = $resource['input']['cert_file'] +$key_file = $resource['input']['key_file'] +$ca_file = $resource['input']['ca_file'] +$sync_db = $resource['input']['sync_db'] +$mysql_module = $resource['input']['mysql_module'] +$sql_idle_timeout = $resource['input']['sql_idle_timeout'] +$sql_connection = $resource['input']['sql_connection'] include glance::params diff --git a/resources/glance_registry_puppet/actions/update.pp b/resources/glance_registry_puppet/actions/update.pp index 1e21403c..7169a3b5 100644 --- a/resources/glance_registry_puppet/actions/update.pp +++ b/resources/glance_registry_puppet/actions/update.pp @@ -1,42 +1,42 @@ $resource = hiera($::resource_name) -$ip = $resource['input']['ip']['value'] +$ip = $resource['input']['ip'] -$db_user = $resource['input']['db_user']['value'] -$db_password = $resource['input']['db_password']['value'] -$db_name = $resource['input']['db_name']['value'] -$db_host = $resource['input']['db_host']['value'] -$db_port = $resource['input']['db_port']['value'] +$db_user = $resource['input']['db_user'] +$db_password = $resource['input']['db_password'] +$db_name = $resource['input']['db_name'] +$db_host = $resource['input']['db_host'] +$db_port = $resource['input']['db_port'] -$keystone_password = $resource['input']['keystone_password']['value'] -$package_ensure = $resource['input']['package_ensure']['value'] -$verbose = $resource['input']['verbose']['value'] -$debug = $resource['input']['debug']['value'] -$bind_host = $resource['input']['bind_host']['value'] -$bind_port = $resource['input']['bind_port']['value'] -$log_file = $resource['input']['log_file']['value'] -$log_dir = $resource['input']['log_dir']['value'] -$database_connection = $resource['input']['database_connection']['value'] -$database_idle_timeout = $resource['input']['database_idle_timeout']['value'] -$auth_type = $resource['input']['auth_type']['value'] -$auth_host = $resource['input']['auth_host']['value'] -$auth_port = $resource['input']['auth_port']['value'] -$auth_admin_prefix = $resource['input']['auth_admin_prefix']['value'] -$auth_uri = $resource['input']['auth_uri']['value'] -$auth_protocol = $resource['input']['auth_protocol']['value'] -$keystone_tenant = $resource['input']['keystone_tenant']['value'] -$keystone_user = $resource['input']['keystone_user']['value'] -$pipeline = $resource['input']['pipeline']['value'] -$use_syslog = $resource['input']['use_syslog']['value'] -$log_facility = $resource['input']['log_facility']['value'] -$purge_config = $resource['input']['purge_config']['value'] -$cert_file = $resource['input']['cert_file']['value'] -$key_file = $resource['input']['key_file']['value'] -$ca_file = $resource['input']['ca_file']['value'] -$sync_db = $resource['input']['sync_db']['value'] -$mysql_module = $resource['input']['mysql_module']['value'] -$sql_idle_timeout = $resource['input']['sql_idle_timeout']['value'] -$sql_connection = $resource['input']['sql_connection']['value'] +$keystone_password = $resource['input']['keystone_password'] +$package_ensure = $resource['input']['package_ensure'] +$verbose = $resource['input']['verbose'] +$debug = $resource['input']['debug'] +$bind_host = $resource['input']['bind_host'] +$bind_port = $resource['input']['bind_port'] +$log_file = $resource['input']['log_file'] +$log_dir = $resource['input']['log_dir'] +$database_connection = $resource['input']['database_connection'] +$database_idle_timeout = $resource['input']['database_idle_timeout'] +$auth_type = $resource['input']['auth_type'] +$auth_host = $resource['input']['auth_host'] +$auth_port = $resource['input']['auth_port'] +$auth_admin_prefix = $resource['input']['auth_admin_prefix'] +$auth_uri = $resource['input']['auth_uri'] +$auth_protocol = $resource['input']['auth_protocol'] +$keystone_tenant = $resource['input']['keystone_tenant'] +$keystone_user = $resource['input']['keystone_user'] +$pipeline = $resource['input']['pipeline'] +$use_syslog = $resource['input']['use_syslog'] +$log_facility = $resource['input']['log_facility'] +$purge_config = $resource['input']['purge_config'] +$cert_file = $resource['input']['cert_file'] +$key_file = $resource['input']['key_file'] +$ca_file = $resource['input']['ca_file'] +$sync_db = $resource['input']['sync_db'] +$mysql_module = $resource['input']['mysql_module'] +$sql_idle_timeout = $resource['input']['sql_idle_timeout'] +$sql_connection = $resource['input']['sql_connection'] include glance::params diff --git a/resources/keystone_puppet/actions/run.pp b/resources/keystone_puppet/actions/run.pp index 087ad4d7..73c818af 100644 --- a/resources/keystone_puppet/actions/run.pp +++ b/resources/keystone_puppet/actions/run.pp @@ -1,14 +1,14 @@ $resource = hiera($::resource_name) -$ip = $resource['input']['ip']['value'] -$admin_token = $resource['input']['admin_token']['value'] -$db_user = $resource['input']['db_user']['value'] -$db_host = $resource['input']['db_host']['value'] -$db_password = $resource['input']['db_password']['value'] -$db_name = $resource['input']['db_name']['value'] -$db_port = $resource['input']['db_port']['value'] -$admin_port = $resource['input']['admin_port']['value'] -$port = $resource['input']['port']['value'] +$ip = $resource['input']['ip'] +$admin_token = $resource['input']['admin_token'] +$db_user = $resource['input']['db_user'] +$db_host = $resource['input']['db_host'] +$db_password = $resource['input']['db_password'] +$db_name = $resource['input']['db_name'] +$db_port = $resource['input']['db_port'] +$admin_port = $resource['input']['admin_port'] +$port = $resource['input']['port'] class {'keystone': package_ensure => 'present', diff --git a/resources/keystone_puppet/actions/update.pp b/resources/keystone_puppet/actions/update.pp index 5b51a370..c295c3a7 100644 --- a/resources/keystone_puppet/actions/update.pp +++ b/resources/keystone_puppet/actions/update.pp @@ -1,14 +1,14 @@ $resource = hiera($::resource_name) -$ip = $resource['input']['ip']['value'] -$admin_token = $resource['input']['admin_token']['value'] -$db_user = $resource['input']['db_user']['value'] -$db_host = $resource['input']['db_host']['value'] -$db_password = $resource['input']['db_password']['value'] -$db_name = $resource['input']['db_name']['value'] -$db_port = $resource['input']['db_port']['value'] -$admin_port = $resource['input']['admin_port']['value'] -$port = $resource['input']['port']['value'] +$ip = $resource['input']['ip'] +$admin_token = $resource['input']['admin_token'] +$db_user = $resource['input']['db_user'] +$db_host = $resource['input']['db_host'] +$db_password = $resource['input']['db_password'] +$db_name = $resource['input']['db_name'] +$db_port = $resource['input']['db_port'] +$admin_port = $resource['input']['admin_port'] +$port = $resource['input']['port'] class {'keystone': package_ensure => 'present', diff --git a/resources/neutron_agents_dhcp_puppet/actions/run.pp b/resources/neutron_agents_dhcp_puppet/actions/run.pp index c0c9cae1..b33e087d 100644 --- a/resources/neutron_agents_dhcp_puppet/actions/run.pp +++ b/resources/neutron_agents_dhcp_puppet/actions/run.pp @@ -1,19 +1,19 @@ $resource = hiera($::resource_name) -$ip = $resource['input']['ip']['value'] +$ip = $resource['input']['ip'] -$package_ensure = $resource['input']['package_ensure']['value'] -$debug = $resource['input']['debug']['value'] -$state_path = $resource['input']['state_path']['value'] -$resync_interval = $resource['input']['resync_interval']['value'] -$interface_driver = $resource['input']['interface_driver']['value'] -$dhcp_driver = $resource['input']['dhcp_driver']['value'] -$root_helper = $resource['input']['root_helper']['value'] -$use_namespaces = $resource['input']['use_namespaces']['value'] -$dnsmasq_config_file = $resource['input']['dnsmasq_config_file']['value'] -$dhcp_delete_namespaces = $resource['input']['dhcp_delete_namespaces']['value'] -$enable_isolated_metadata = $resource['input']['enable_isolated_metadata']['value'] -$enable_metadata_network = $resource['input']['enable_metadata_network']['value'] +$package_ensure = $resource['input']['package_ensure'] +$debug = $resource['input']['debug'] +$state_path = $resource['input']['state_path'] +$resync_interval = $resource['input']['resync_interval'] +$interface_driver = $resource['input']['interface_driver'] +$dhcp_driver = $resource['input']['dhcp_driver'] +$root_helper = $resource['input']['root_helper'] +$use_namespaces = $resource['input']['use_namespaces'] +$dnsmasq_config_file = $resource['input']['dnsmasq_config_file'] +$dhcp_delete_namespaces = $resource['input']['dhcp_delete_namespaces'] +$enable_isolated_metadata = $resource['input']['enable_isolated_metadata'] +$enable_metadata_network = $resource['input']['enable_metadata_network'] class { 'neutron::agents::dhcp': enabled => true, diff --git a/resources/neutron_agents_l3_puppet/actions/run.pp b/resources/neutron_agents_l3_puppet/actions/run.pp index 66971b1d..0871d88c 100644 --- a/resources/neutron_agents_l3_puppet/actions/run.pp +++ b/resources/neutron_agents_l3_puppet/actions/run.pp @@ -1,28 +1,28 @@ $resource = hiera($::resource_name) -$ip = $resource['input']['ip']['value'] +$ip = $resource['input']['ip'] -$package_ensure = $resource['input']['package_ensure']['value'] -$debug = $resource['input']['debug']['value'] -$external_network_bridge = $resource['input']['external_network_bridge']['value'] -$use_namespaces = $resource['input']['use_namespaces']['value'] -$interface_driver = $resource['input']['interface_driver']['value'] -$router_id = $resource['input']['router_id']['value'] -$gateway_external_network_id = $resource['input']['gateway_external_network_id']['value'] -$handle_internal_only_routers = $resource['input']['handle_internal_only_routers']['value'] -$metadata_port = $resource['input']['metadata_port']['value'] -$send_arp_for_ha = $resource['input']['send_arp_for_ha']['value'] -$periodic_interval = $resource['input']['periodic_interval']['value'] -$periodic_fuzzy_delay = $resource['input']['periodic_fuzzy_delay']['value'] -$enable_metadata_proxy = $resource['input']['enable_metadata_proxy']['value'] -$network_device_mtu = $resource['input']['network_device_mtu']['value'] -$router_delete_namespaces = $resource['input']['router_delete_namespaces']['value'] -$ha_enabled = $resource['input']['ha_enabled']['value'] -$ha_vrrp_auth_type = $resource['input']['ha_vrrp_auth_type']['value'] -$ha_vrrp_auth_password = $resource['input']['ha_vrrp_auth_password']['value'] -$ha_vrrp_advert_int = $resource['input']['ha_vrrp_advert_int']['value'] -$agent_mode = $resource['input']['agent_mode']['value'] -$allow_automatic_l3agent_failover = $resource['input']['allow_automatic_l3agent_failover']['value'] +$package_ensure = $resource['input']['package_ensure'] +$debug = $resource['input']['debug'] +$external_network_bridge = $resource['input']['external_network_bridge'] +$use_namespaces = $resource['input']['use_namespaces'] +$interface_driver = $resource['input']['interface_driver'] +$router_id = $resource['input']['router_id'] +$gateway_external_network_id = $resource['input']['gateway_external_network_id'] +$handle_internal_only_routers = $resource['input']['handle_internal_only_routers'] +$metadata_port = $resource['input']['metadata_port'] +$send_arp_for_ha = $resource['input']['send_arp_for_ha'] +$periodic_interval = $resource['input']['periodic_interval'] +$periodic_fuzzy_delay = $resource['input']['periodic_fuzzy_delay'] +$enable_metadata_proxy = $resource['input']['enable_metadata_proxy'] +$network_device_mtu = $resource['input']['network_device_mtu'] +$router_delete_namespaces = $resource['input']['router_delete_namespaces'] +$ha_enabled = $resource['input']['ha_enabled'] +$ha_vrrp_auth_type = $resource['input']['ha_vrrp_auth_type'] +$ha_vrrp_auth_password = $resource['input']['ha_vrrp_auth_password'] +$ha_vrrp_advert_int = $resource['input']['ha_vrrp_advert_int'] +$agent_mode = $resource['input']['agent_mode'] +$allow_automatic_l3agent_failover = $resource['input']['allow_automatic_l3agent_failover'] class { 'neutron::agents::l3': enabled => true, diff --git a/resources/neutron_agents_metadata_puppet/actions/run.pp b/resources/neutron_agents_metadata_puppet/actions/run.pp index ab99d768..d96955e0 100644 --- a/resources/neutron_agents_metadata_puppet/actions/run.pp +++ b/resources/neutron_agents_metadata_puppet/actions/run.pp @@ -1,24 +1,24 @@ $resource = hiera($::resource_name) -$ip = $resource['input']['ip']['value'] +$ip = $resource['input']['ip'] -$auth_host = $resource['input']['auth_host']['value'] -$auth_port = $resource['input']['auth_port']['value'] +$auth_host = $resource['input']['auth_host'] +$auth_port = $resource['input']['auth_port'] -$auth_password = $resource['input']['auth_password']['value'] -$shared_secret = $resource['input']['shared_secret']['value'] -$package_ensure = $resource['input']['package_ensure']['value'] -$debug = $resource['input']['debug']['value'] -$auth_tenant = $resource['input']['auth_tenant']['value'] -$auth_user = $resource['input']['auth_user']['value'] -$auth_insecure = $resource['input']['auth_insecure']['value'] -$auth_ca_cert = $resource['input']['auth_ca_cert']['value'] -$auth_region = $resource['input']['auth_region']['value'] -$metadata_ip = $resource['input']['metadata_ip']['value'] -$metadata_port = $resource['input']['metadata_port']['value'] -$metadata_workers = $resource['input']['metadata_workers']['value'] -$metadata_backlog = $resource['input']['metadata_backlog']['value'] -$metadata_memory_cache_ttl = $resource['input']['metadata_memory_cache_ttl']['value'] +$auth_password = $resource['input']['auth_password'] +$shared_secret = $resource['input']['shared_secret'] +$package_ensure = $resource['input']['package_ensure'] +$debug = $resource['input']['debug'] +$auth_tenant = $resource['input']['auth_tenant'] +$auth_user = $resource['input']['auth_user'] +$auth_insecure = $resource['input']['auth_insecure'] +$auth_ca_cert = $resource['input']['auth_ca_cert'] +$auth_region = $resource['input']['auth_region'] +$metadata_ip = $resource['input']['metadata_ip'] +$metadata_port = $resource['input']['metadata_port'] +$metadata_workers = $resource['input']['metadata_workers'] +$metadata_backlog = $resource['input']['metadata_backlog'] +$metadata_memory_cache_ttl = $resource['input']['metadata_memory_cache_ttl'] class { 'neutron::agents::metadata': enabled => true, diff --git a/resources/neutron_agents_ml2_ovs_puppet/actions/run.pp b/resources/neutron_agents_ml2_ovs_puppet/actions/run.pp index f9941be7..115e1ce8 100644 --- a/resources/neutron_agents_ml2_ovs_puppet/actions/run.pp +++ b/resources/neutron_agents_ml2_ovs_puppet/actions/run.pp @@ -1,22 +1,22 @@ $resource = hiera($::resource_name) -$ip = $resource['input']['ip']['value'] +$ip = $resource['input']['ip'] -$package_ensure = $resource['input']['package_ensure']['value'] -$enabled = $resource['input']['enabled']['value'] -$bridge_uplinks = $resource['input']['bridge_uplinks']['value'] -$bridge_mappings = $resource['input']['bridge_mappings']['value'] -$integration_bridge = $resource['input']['integration_bridge']['value'] -$enable_tunneling = $resource['input']['enable_tunneling']['value'] -$tunnel_types = $resource['input']['tunnel_types']['value'] -$local_ip = $resource['input']['local_ip']['value'] -$tunnel_bridge = $resource['input']['tunnel_bridge']['value'] -$vxlan_udp_port = $resource['input']['vxlan_udp_port']['value'] -$polling_interval = $resource['input']['polling_interval']['value'] -$l2_population = $resource['input']['l2_population']['value'] -$arp_responder = $resource['input']['arp_responder']['value'] -$firewall_driver = $resource['input']['firewall_driver']['value'] -$enable_distributed_routing = $resource['input']['enable_distributed_routing']['value'] +$package_ensure = $resource['input']['package_ensure'] +$enabled = $resource['input']['enabled'] +$bridge_uplinks = $resource['input']['bridge_uplinks'] +$bridge_mappings = $resource['input']['bridge_mappings'] +$integration_bridge = $resource['input']['integration_bridge'] +$enable_tunneling = $resource['input']['enable_tunneling'] +$tunnel_types = $resource['input']['tunnel_types'] +$local_ip = $resource['input']['local_ip'] +$tunnel_bridge = $resource['input']['tunnel_bridge'] +$vxlan_udp_port = $resource['input']['vxlan_udp_port'] +$polling_interval = $resource['input']['polling_interval'] +$l2_population = $resource['input']['l2_population'] +$arp_responder = $resource['input']['arp_responder'] +$firewall_driver = $resource['input']['firewall_driver'] +$enable_distributed_routing = $resource['input']['enable_distributed_routing'] class { 'neutron::agents::ml2::ovs': enabled => true, diff --git a/resources/neutron_plugins_ml2_puppet/actions/run.pp b/resources/neutron_plugins_ml2_puppet/actions/run.pp index 33478a37..347c0623 100644 --- a/resources/neutron_plugins_ml2_puppet/actions/run.pp +++ b/resources/neutron_plugins_ml2_puppet/actions/run.pp @@ -1,19 +1,19 @@ $resource = hiera($::resource_name) -$ip = $resource['input']['ip']['value'] +$ip = $resource['input']['ip'] -$type_drivers = $resource['input']['type_drivers']['value'] -$tenant_network_types = $resource['input']['tenant_network_types']['value'] -$mechanism_drivers = $resource['input']['mechanism_drivers']['value'] -$flat_networks = $resource['input']['flat_networks']['value'] -$network_vlan_ranges = $resource['input']['network_vlan_ranges']['value'] -$tunnel_id_ranges = $resource['input']['tunnel_id_ranges']['value'] -$vxlan_group = $resource['input']['vxlan_group']['value'] -$vni_ranges = $resource['input']['vni_ranges']['value'] -$enable_security_group = $resource['input']['enable_security_group']['value'] -$package_ensure = $resource['input']['package_ensure']['value'] -$supported_pci_vendor_devs = $resource['input']['supported_pci_vendor_devs']['value'] -$sriov_agent_required = $resource['input']['sriov_agent_required']['value'] +$type_drivers = $resource['input']['type_drivers'] +$tenant_network_types = $resource['input']['tenant_network_types'] +$mechanism_drivers = $resource['input']['mechanism_drivers'] +$flat_networks = $resource['input']['flat_networks'] +$network_vlan_ranges = $resource['input']['network_vlan_ranges'] +$tunnel_id_ranges = $resource['input']['tunnel_id_ranges'] +$vxlan_group = $resource['input']['vxlan_group'] +$vni_ranges = $resource['input']['vni_ranges'] +$enable_security_group = $resource['input']['enable_security_group'] +$package_ensure = $resource['input']['package_ensure'] +$supported_pci_vendor_devs = $resource['input']['supported_pci_vendor_devs'] +$sriov_agent_required = $resource['input']['sriov_agent_required'] # LP1490438 file {'/etc/default/neutron-server': diff --git a/resources/neutron_puppet/actions/run.pp b/resources/neutron_puppet/actions/run.pp index a0ee911d..84a009bc 100644 --- a/resources/neutron_puppet/actions/run.pp +++ b/resources/neutron_puppet/actions/run.pp @@ -1,63 +1,63 @@ $resource = hiera($::resource_name) -$ip = $resource['input']['ip']['value'] +$ip = $resource['input']['ip'] -$package_ensure = $resource['input']['package_ensure']['value'] -$verbose = $resource['input']['verbose']['value'] -$debug = $resource['input']['debug']['value'] -$bind_host = $resource['input']['bind_host']['value'] -$bind_port = $resource['input']['bind_port']['value'] -$core_plugin = $resource['input']['core_plugin']['value'] -$service_plugins = $resource['input']['service_plugins']['value'] -$auth_strategy = $resource['input']['auth_strategy']['value'] -$base_mac = $resource['input']['base_mac']['value'] -$mac_generation_retries = $resource['input']['mac_generation_retries']['value'] -$dhcp_lease_duration = $resource['input']['dhcp_lease_duration']['value'] -$dhcp_agents_per_network = $resource['input']['dhcp_agents_per_network']['value'] -$network_device_mtu = $resource['input']['network_device_mtu']['value'] -$dhcp_agent_notification = $resource['input']['dhcp_agent_notification']['value'] -$allow_bulk = $resource['input']['allow_bulk']['value'] -$allow_pagination = $resource['input']['allow_pagination']['value'] -$allow_sorting = $resource['input']['allow_sorting']['value'] -$allow_overlapping_ips = $resource['input']['allow_overlapping_ips']['value'] -$api_extensions_path = $resource['input']['api_extensions_path']['value'] -$root_helper = $resource['input']['root_helper']['value'] -$report_interval = $resource['input']['report_interval']['value'] -$control_exchange = $resource['input']['control_exchange']['value'] -$rpc_backend = $resource['input']['rpc_backend']['value'] -$rabbit_password = $resource['input']['rabbit_password']['value'] -$rabbit_host = $resource['input']['rabbit_host']['value'] -$rabbit_hosts = $resource['input']['rabbit_hosts']['value'] -$rabbit_port = $resource['input']['rabbit_port']['value'] -$rabbit_user = $resource['input']['rabbit_user']['value'] -$rabbit_virtual_host = $resource['input']['rabbit_virtual_host']['value'] -$rabbit_use_ssl = $resource['input']['rabbit_use_ssl']['value'] -$kombu_ssl_ca_certs = $resource['input']['kombu_ssl_ca_certs']['value'] -$kombu_ssl_certfile = $resource['input']['kombu_ssl_certfile']['value'] -$kombu_ssl_keyfile = $resource['input']['kombu_ssl_keyfile']['value'] -$kombu_ssl_version = $resource['input']['kombu_ssl_version']['value'] -$kombu_reconnect_delay = $resource['input']['kombu_reconnect_delay']['value'] -$qpid_hostname = $resource['input']['qpid_hostname']['value'] -$qpid_port = $resource['input']['qpid_port']['value'] -$qpid_username = $resource['input']['qpid_username']['value'] -$qpid_password = $resource['input']['qpid_password']['value'] -$qpid_heartbeat = $resource['input']['qpid_heartbeat']['value'] -$qpid_protocol = $resource['input']['qpid_protocol']['value'] -$qpid_tcp_nodelay = $resource['input']['qpid_tcp_nodelay']['value'] -$qpid_reconnect = $resource['input']['qpid_reconnect']['value'] -$qpid_reconnect_timeout = $resource['input']['qpid_reconnect_timeout']['value'] -$qpid_reconnect_limit = $resource['input']['qpid_reconnect_limit']['value'] -$qpid_reconnect_interval_min = $resource['input']['qpid_reconnect_interval_min']['value'] -$qpid_reconnect_interval_max = $resource['input']['qpid_reconnect_interval_max']['value'] -$qpid_reconnect_interval = $resource['input']['qpid_reconnect_interval']['value'] -$use_ssl = $resource['input']['use_ssl']['value'] -$cert_file = $resource['input']['cert_file']['value'] -$key_file = $resource['input']['key_file']['value'] -$ca_file = $resource['input']['ca_file']['value'] -$use_syslog = $resource['input']['use_syslog']['value'] -$log_facility = $resource['input']['log_facility']['value'] -$log_file = $resource['input']['log_file']['value'] -$log_dir = $resource['input']['log_dir']['value'] +$package_ensure = $resource['input']['package_ensure'] +$verbose = $resource['input']['verbose'] +$debug = $resource['input']['debug'] +$bind_host = $resource['input']['bind_host'] +$bind_port = $resource['input']['bind_port'] +$core_plugin = $resource['input']['core_plugin'] +$service_plugins = $resource['input']['service_plugins'] +$auth_strategy = $resource['input']['auth_strategy'] +$base_mac = $resource['input']['base_mac'] +$mac_generation_retries = $resource['input']['mac_generation_retries'] +$dhcp_lease_duration = $resource['input']['dhcp_lease_duration'] +$dhcp_agents_per_network = $resource['input']['dhcp_agents_per_network'] +$network_device_mtu = $resource['input']['network_device_mtu'] +$dhcp_agent_notification = $resource['input']['dhcp_agent_notification'] +$allow_bulk = $resource['input']['allow_bulk'] +$allow_pagination = $resource['input']['allow_pagination'] +$allow_sorting = $resource['input']['allow_sorting'] +$allow_overlapping_ips = $resource['input']['allow_overlapping_ips'] +$api_extensions_path = $resource['input']['api_extensions_path'] +$root_helper = $resource['input']['root_helper'] +$report_interval = $resource['input']['report_interval'] +$control_exchange = $resource['input']['control_exchange'] +$rpc_backend = $resource['input']['rpc_backend'] +$rabbit_password = $resource['input']['rabbit_password'] +$rabbit_host = $resource['input']['rabbit_host'] +$rabbit_hosts = $resource['input']['rabbit_hosts'] +$rabbit_port = $resource['input']['rabbit_port'] +$rabbit_user = $resource['input']['rabbit_user'] +$rabbit_virtual_host = $resource['input']['rabbit_virtual_host'] +$rabbit_use_ssl = $resource['input']['rabbit_use_ssl'] +$kombu_ssl_ca_certs = $resource['input']['kombu_ssl_ca_certs'] +$kombu_ssl_certfile = $resource['input']['kombu_ssl_certfile'] +$kombu_ssl_keyfile = $resource['input']['kombu_ssl_keyfile'] +$kombu_ssl_version = $resource['input']['kombu_ssl_version'] +$kombu_reconnect_delay = $resource['input']['kombu_reconnect_delay'] +$qpid_hostname = $resource['input']['qpid_hostname'] +$qpid_port = $resource['input']['qpid_port'] +$qpid_username = $resource['input']['qpid_username'] +$qpid_password = $resource['input']['qpid_password'] +$qpid_heartbeat = $resource['input']['qpid_heartbeat'] +$qpid_protocol = $resource['input']['qpid_protocol'] +$qpid_tcp_nodelay = $resource['input']['qpid_tcp_nodelay'] +$qpid_reconnect = $resource['input']['qpid_reconnect'] +$qpid_reconnect_timeout = $resource['input']['qpid_reconnect_timeout'] +$qpid_reconnect_limit = $resource['input']['qpid_reconnect_limit'] +$qpid_reconnect_interval_min = $resource['input']['qpid_reconnect_interval_min'] +$qpid_reconnect_interval_max = $resource['input']['qpid_reconnect_interval_max'] +$qpid_reconnect_interval = $resource['input']['qpid_reconnect_interval'] +$use_ssl = $resource['input']['use_ssl'] +$cert_file = $resource['input']['cert_file'] +$key_file = $resource['input']['key_file'] +$ca_file = $resource['input']['ca_file'] +$use_syslog = $resource['input']['use_syslog'] +$log_facility = $resource['input']['log_facility'] +$log_file = $resource['input']['log_file'] +$log_dir = $resource['input']['log_dir'] class { 'neutron': enabled => true, diff --git a/resources/neutron_server_puppet/actions/run.pp b/resources/neutron_server_puppet/actions/run.pp index 1d7d8315..f47974da 100644 --- a/resources/neutron_server_puppet/actions/run.pp +++ b/resources/neutron_server_puppet/actions/run.pp @@ -1,49 +1,49 @@ $resource = hiera($::resource_name) -$ip = $resource['input']['ip']['value'] +$ip = $resource['input']['ip'] -$db_user = $resource['input']['db_user']['value'] -$db_host = $resource['input']['db_host']['value'] -$db_port = $resource['input']['db_port']['value'] -$db_password = $resource['input']['db_password']['value'] -$db_name = $resource['input']['db_name']['value'] +$db_user = $resource['input']['db_user'] +$db_host = $resource['input']['db_host'] +$db_port = $resource['input']['db_port'] +$db_password = $resource['input']['db_password'] +$db_name = $resource['input']['db_name'] -$package_ensure = $resource['input']['package_ensure']['value'] -$auth_password = $resource['input']['auth_password']['value'] -$auth_type = $resource['input']['auth_type']['value'] -$auth_host = $resource['input']['auth_host']['value'] -$auth_port = $resource['input']['auth_port']['value'] -$auth_admin_prefix = $resource['input']['auth_admin_prefix']['value'] -$auth_tenant = $resource['input']['auth_tenant']['value'] -$auth_user = $resource['input']['auth_user']['value'] -$auth_protocol = $resource['input']['auth_protocol']['value'] -$auth_uri = $resource['input']['auth_uri']['value'] -$database_max_retries = $resource['input']['database_max_retries']['value'] -$database_idle_timeout = $resource['input']['database_idle_timeout']['value'] -$database_retry_interval = $resource['input']['database_retry_interval']['value'] -$database_min_pool_size = $resource['input']['database_min_pool_size']['value'] -$database_max_pool_size = $resource['input']['database_max_pool_size']['value'] -$database_max_overflow = $resource['input']['database_max_overflow']['value'] -$sync_db = $resource['input']['sync_db']['value'] -$api_workers = $resource['input']['api_workers']['value'] -$rpc_workers = $resource['input']['rpc_workers']['value'] -$agent_down_time = $resource['input']['agent_down_time']['value'] -$router_scheduler_driver = $resource['input']['router_scheduler_driver']['value'] -$router_distributed = $resource['input']['router_distributed']['value'] -$l3_ha = $resource['input']['l3_ha']['value'] -$max_l3_agents_per_router = $resource['input']['max_l3_agents_per_router']['value'] -$min_l3_agents_per_router = $resource['input']['min_l3_agents_per_router']['value'] -$l3_ha_net_cidr = $resource['input']['l3_ha_net_cidr']['value'] -$mysql_module = $resource['input']['mysql_module']['value'] -$sql_max_retries = $resource['input']['sql_max_retries']['value'] -$max_retries = $resource['input']['max_retries']['value'] -$sql_idle_timeout = $resource['input']['sql_idle_timeout']['value'] -$idle_timeout = $resource['input']['idle_timeout']['value'] -$sql_reconnect_interval = $resource['input']['sql_reconnect_interval']['value'] -$retry_interval = $resource['input']['retry_interval']['value'] -$log_dir = $resource['input']['log_dir']['value'] -$log_file = $resource['input']['log_file']['value'] -$report_interval = $resource['input']['report_interval']['value'] +$package_ensure = $resource['input']['package_ensure'] +$auth_password = $resource['input']['auth_password'] +$auth_type = $resource['input']['auth_type'] +$auth_host = $resource['input']['auth_host'] +$auth_port = $resource['input']['auth_port'] +$auth_admin_prefix = $resource['input']['auth_admin_prefix'] +$auth_tenant = $resource['input']['auth_tenant'] +$auth_user = $resource['input']['auth_user'] +$auth_protocol = $resource['input']['auth_protocol'] +$auth_uri = $resource['input']['auth_uri'] +$database_max_retries = $resource['input']['database_max_retries'] +$database_idle_timeout = $resource['input']['database_idle_timeout'] +$database_retry_interval = $resource['input']['database_retry_interval'] +$database_min_pool_size = $resource['input']['database_min_pool_size'] +$database_max_pool_size = $resource['input']['database_max_pool_size'] +$database_max_overflow = $resource['input']['database_max_overflow'] +$sync_db = $resource['input']['sync_db'] +$api_workers = $resource['input']['api_workers'] +$rpc_workers = $resource['input']['rpc_workers'] +$agent_down_time = $resource['input']['agent_down_time'] +$router_scheduler_driver = $resource['input']['router_scheduler_driver'] +$router_distributed = $resource['input']['router_distributed'] +$l3_ha = $resource['input']['l3_ha'] +$max_l3_agents_per_router = $resource['input']['max_l3_agents_per_router'] +$min_l3_agents_per_router = $resource['input']['min_l3_agents_per_router'] +$l3_ha_net_cidr = $resource['input']['l3_ha_net_cidr'] +$mysql_module = $resource['input']['mysql_module'] +$sql_max_retries = $resource['input']['sql_max_retries'] +$max_retries = $resource['input']['max_retries'] +$sql_idle_timeout = $resource['input']['sql_idle_timeout'] +$idle_timeout = $resource['input']['idle_timeout'] +$sql_reconnect_interval = $resource['input']['sql_reconnect_interval'] +$retry_interval = $resource['input']['retry_interval'] +$log_dir = $resource['input']['log_dir'] +$log_file = $resource['input']['log_file'] +$report_interval = $resource['input']['report_interval'] class { 'neutron::server': enabled => true, diff --git a/resources/node_network_puppet/actions/run.pp b/resources/node_network_puppet/actions/run.pp index 86d4b483..800605c2 100644 --- a/resources/node_network_puppet/actions/run.pp +++ b/resources/node_network_puppet/actions/run.pp @@ -1,17 +1,17 @@ $resource = hiera($::resource_name) -$ensure_package = $resource['input']['ensure_package']['value'] -$use_lnx = $resource['input']['use_lnx']['value'] -$use_ovs = $resource['input']['use_ovs']['value'] -$install_ovs = $resource['input']['install_ovs']['value'] -$install_brtool = $resource['input']['install_brtool']['value'] -$install_ethtool = $resource['input']['install_ethtool']['value'] -$install_bondtool = $resource['input']['install_bondtool']['value'] -$install_vlantool = $resource['input']['install_vlantool']['value'] -$ovs_modname = $resource['input']['ovs_modname']['value'] -$ovs_datapath_package_name = $resource['input']['ovs_datapath_package_name']['value'] -$ovs_common_package_name = $resource['input']['ovs_common_package_name']['value'] -$network_scheme = $resource['input']['network_scheme']['value'] +$ensure_package = $resource['input']['ensure_package'] +$use_lnx = $resource['input']['use_lnx'] +$use_ovs = $resource['input']['use_ovs'] +$install_ovs = $resource['input']['install_ovs'] +$install_brtool = $resource['input']['install_brtool'] +$install_ethtool = $resource['input']['install_ethtool'] +$install_bondtool = $resource['input']['install_bondtool'] +$install_vlantool = $resource['input']['install_vlantool'] +$ovs_modname = $resource['input']['ovs_modname'] +$ovs_datapath_package_name = $resource['input']['ovs_datapath_package_name'] +$ovs_common_package_name = $resource['input']['ovs_common_package_name'] +$network_scheme = $resource['input']['network_scheme'] class {'l23network': ensure_package => $ensure_package, diff --git a/resources/nova_api_puppet/actions/run.pp b/resources/nova_api_puppet/actions/run.pp index 46a2eb78..95885e81 100644 --- a/resources/nova_api_puppet/actions/run.pp +++ b/resources/nova_api_puppet/actions/run.pp @@ -1,35 +1,35 @@ $resource = hiera($::resource_name) -$ensure_package = $resource['input']['ensure_package']['value'] -$auth_strategy = $resource['input']['auth_strategy']['value'] -$auth_host = $resource['input']['auth_host']['value'] -$auth_port = $resource['input']['auth_port']['value'] -$auth_protocol = $resource['input']['auth_protocol']['value'] -$auth_uri = $resource['input']['auth_uri']['value'] -$auth_admin_prefix = $resource['input']['auth_admin_prefix']['value'] -$auth_version = $resource['input']['auth_version']['value'] -$admin_tenant_name = $resource['input']['admin_tenant_name']['value'] -$admin_user = $resource['input']['admin_user']['value'] -$admin_password = $resource['input']['admin_password']['value'] -$api_bind_address = $resource['input']['api_bind_address']['value'] -$metadata_listen = $resource['input']['metadata_listen']['value'] -$enabled_apis = $resource['input']['enabled_apis']['value'] -$keystone_ec2_url = $resource['input']['keystone_ec2_url']['value'] -$volume_api_class = $resource['input']['volume_api_class']['value'] -$use_forwarded_for = $resource['input']['use_forwarded_for']['value'] -$osapi_compute_workers = $resource['input']['osapi_compute_workers']['value'] -$ec2_workers = $resource['input']['ec2_workers']['value'] -$metadata_workers = $resource['input']['metadata_workers']['value'] -$sync_db = $resource['input']['sync_db']['value'] -$neutron_metadata_proxy_shared_secret = $resource['input']['neutron_metadata_proxy_shared_secret']['value'] -$osapi_v3 = $resource['input']['osapi_v3']['value'] -$pci_alias = $resource['input']['pci_alias']['value'] -$ratelimits = $resource['input']['ratelimits']['value'] -$ratelimits_factory = $resource['input']['ratelimits_factory']['value'] -$validate = $resource['input']['validate']['value'] -$validation_options = $resource['input']['validation_options']['value'] -$workers = $resource['input']['workers']['value'] -$conductor_workers = $resource['input']['conductor_workers']['value'] +$ensure_package = $resource['input']['ensure_package'] +$auth_strategy = $resource['input']['auth_strategy'] +$auth_host = $resource['input']['auth_host'] +$auth_port = $resource['input']['auth_port'] +$auth_protocol = $resource['input']['auth_protocol'] +$auth_uri = $resource['input']['auth_uri'] +$auth_admin_prefix = $resource['input']['auth_admin_prefix'] +$auth_version = $resource['input']['auth_version'] +$admin_tenant_name = $resource['input']['admin_tenant_name'] +$admin_user = $resource['input']['admin_user'] +$admin_password = $resource['input']['admin_password'] +$api_bind_address = $resource['input']['api_bind_address'] +$metadata_listen = $resource['input']['metadata_listen'] +$enabled_apis = $resource['input']['enabled_apis'] +$keystone_ec2_url = $resource['input']['keystone_ec2_url'] +$volume_api_class = $resource['input']['volume_api_class'] +$use_forwarded_for = $resource['input']['use_forwarded_for'] +$osapi_compute_workers = $resource['input']['osapi_compute_workers'] +$ec2_workers = $resource['input']['ec2_workers'] +$metadata_workers = $resource['input']['metadata_workers'] +$sync_db = $resource['input']['sync_db'] +$neutron_metadata_proxy_shared_secret = $resource['input']['neutron_metadata_proxy_shared_secret'] +$osapi_v3 = $resource['input']['osapi_v3'] +$pci_alias = $resource['input']['pci_alias'] +$ratelimits = $resource['input']['ratelimits'] +$ratelimits_factory = $resource['input']['ratelimits_factory'] +$validate = $resource['input']['validate'] +$validation_options = $resource['input']['validation_options'] +$workers = $resource['input']['workers'] +$conductor_workers = $resource['input']['conductor_workers'] exec { 'post-nova_config': command => '/bin/echo "Nova config has changed"', diff --git a/resources/nova_api_puppet/actions/update.pp b/resources/nova_api_puppet/actions/update.pp index 092deb01..90e409e5 100644 --- a/resources/nova_api_puppet/actions/update.pp +++ b/resources/nova_api_puppet/actions/update.pp @@ -1,35 +1,35 @@ $resource = hiera($::resource_name) -$ensure_package = $resource['input']['ensure_package']['value'] -$auth_strategy = $resource['input']['auth_strategy']['value'] -$auth_host = $resource['input']['auth_host']['value'] -$auth_port = $resource['input']['auth_port']['value'] -$auth_protocol = $resource['input']['auth_protocol']['value'] -$auth_uri = $resource['input']['auth_uri']['value'] -$auth_admin_prefix = $resource['input']['auth_admin_prefix']['value'] -$auth_version = $resource['input']['auth_version']['value'] -$admin_tenant_name = $resource['input']['admin_tenant_name']['value'] -$admin_user = $resource['input']['admin_user']['value'] -$admin_password = $resource['input']['admin_password']['value'] -$api_bind_address = $resource['input']['api_bind_address']['value'] -$metadata_listen = $resource['input']['metadata_listen']['value'] -$enabled_apis = $resource['input']['enabled_apis']['value'] -$keystone_ec2_url = $resource['input']['keystone_ec2_url']['value'] -$volume_api_class = $resource['input']['volume_api_class']['value'] -$use_forwarded_for = $resource['input']['use_forwarded_for']['value'] -$osapi_compute_workers = $resource['input']['osapi_compute_workers']['value'] -$ec2_workers = $resource['input']['ec2_workers']['value'] -$metadata_workers = $resource['input']['metadata_workers']['value'] -$sync_db = $resource['input']['sync_db']['value'] -$neutron_metadata_proxy_shared_secret = $resource['input']['neutron_metadata_proxy_shared_secret']['value'] -$osapi_v3 = $resource['input']['osapi_v3']['value'] -$pci_alias = $resource['input']['pci_alias']['value'] -$ratelimits = $resource['input']['ratelimits']['value'] -$ratelimits_factory = $resource['input']['ratelimits_factory']['value'] -$validate = $resource['input']['validate']['value'] -$validation_options = $resource['input']['validation_options']['value'] -$workers = $resource['input']['workers']['value'] -$conductor_workers = $resource['input']['conductor_workers']['value'] +$ensure_package = $resource['input']['ensure_package'] +$auth_strategy = $resource['input']['auth_strategy'] +$auth_host = $resource['input']['auth_host'] +$auth_port = $resource['input']['auth_port'] +$auth_protocol = $resource['input']['auth_protocol'] +$auth_uri = $resource['input']['auth_uri'] +$auth_admin_prefix = $resource['input']['auth_admin_prefix'] +$auth_version = $resource['input']['auth_version'] +$admin_tenant_name = $resource['input']['admin_tenant_name'] +$admin_user = $resource['input']['admin_user'] +$admin_password = $resource['input']['admin_password'] +$api_bind_address = $resource['input']['api_bind_address'] +$metadata_listen = $resource['input']['metadata_listen'] +$enabled_apis = $resource['input']['enabled_apis'] +$keystone_ec2_url = $resource['input']['keystone_ec2_url'] +$volume_api_class = $resource['input']['volume_api_class'] +$use_forwarded_for = $resource['input']['use_forwarded_for'] +$osapi_compute_workers = $resource['input']['osapi_compute_workers'] +$ec2_workers = $resource['input']['ec2_workers'] +$metadata_workers = $resource['input']['metadata_workers'] +$sync_db = $resource['input']['sync_db'] +$neutron_metadata_proxy_shared_secret = $resource['input']['neutron_metadata_proxy_shared_secret'] +$osapi_v3 = $resource['input']['osapi_v3'] +$pci_alias = $resource['input']['pci_alias'] +$ratelimits = $resource['input']['ratelimits'] +$ratelimits_factory = $resource['input']['ratelimits_factory'] +$validate = $resource['input']['validate'] +$validation_options = $resource['input']['validation_options'] +$workers = $resource['input']['workers'] +$conductor_workers = $resource['input']['conductor_workers'] exec { 'post-nova_config': command => '/bin/echo "Nova config has changed"', diff --git a/resources/nova_compute_libvirt_puppet/actions/run.pp b/resources/nova_compute_libvirt_puppet/actions/run.pp index a33a7761..868c4532 100644 --- a/resources/nova_compute_libvirt_puppet/actions/run.pp +++ b/resources/nova_compute_libvirt_puppet/actions/run.pp @@ -1,19 +1,19 @@ $resource = hiera($::resource_name) -$libvirt_virt_type = $resource['input']['libvirt_virt_type']['value'] -$vncserver_listen = $resource['input']['vncserver_listen']['value'] -$migration_support = $resource['input']['migration_support']['value'] -$libvirt_cpu_mode = $resource['input']['libvirt_cpu_mode']['value'] -$libvirt_disk_cachemodes = $resource['input']['libvirt_disk_cachemodes']['value'] -$libvirt_inject_password = $resource['input']['libvirt_inject_password']['value'] -$libvirt_inject_key = $resource['input']['libvirt_inject_key']['value'] -$libvirt_inject_partition = $resource['input']['libvirt_inject_partition']['value'] -$remove_unused_base_images = $resource['input']['remove_unused_base_images']['value'] -$remove_unused_kernels = $resource['input']['remove_unused_kernels']['value'] -$remove_unused_resized_minimum_age_seconds = $resource['input']['remove_unused_resized_minimum_age_seconds']['value'] -$remove_unused_original_minimum_age_seconds = $resource['input']['remove_unused_original_minimum_age_seconds']['value'] -$libvirt_service_name = $resource['input']['libvirt_service_name']['value'] -$libvirt_type = $resource['input']['libvirt_type']['value'] +$libvirt_virt_type = $resource['input']['libvirt_virt_type'] +$vncserver_listen = $resource['input']['vncserver_listen'] +$migration_support = $resource['input']['migration_support'] +$libvirt_cpu_mode = $resource['input']['libvirt_cpu_mode'] +$libvirt_disk_cachemodes = $resource['input']['libvirt_disk_cachemodes'] +$libvirt_inject_password = $resource['input']['libvirt_inject_password'] +$libvirt_inject_key = $resource['input']['libvirt_inject_key'] +$libvirt_inject_partition = $resource['input']['libvirt_inject_partition'] +$remove_unused_base_images = $resource['input']['remove_unused_base_images'] +$remove_unused_kernels = $resource['input']['remove_unused_kernels'] +$remove_unused_resized_minimum_age_seconds = $resource['input']['remove_unused_resized_minimum_age_seconds'] +$remove_unused_original_minimum_age_seconds = $resource['input']['remove_unused_original_minimum_age_seconds'] +$libvirt_service_name = $resource['input']['libvirt_service_name'] +$libvirt_type = $resource['input']['libvirt_type'] class { 'nova::compute::libvirt': libvirt_virt_type => $libvirt_virt_type, diff --git a/resources/nova_compute_libvirt_puppet/actions/update.pp b/resources/nova_compute_libvirt_puppet/actions/update.pp index 9fe8f147..33dbcd88 100644 --- a/resources/nova_compute_libvirt_puppet/actions/update.pp +++ b/resources/nova_compute_libvirt_puppet/actions/update.pp @@ -1,19 +1,19 @@ $resource = hiera($::resource_name) -$libvirt_virt_type = $resource['input']['libvirt_virt_type']['value'] -$vncserver_listen = $resource['input']['vncserver_listen']['value'] -$migration_support = $resource['input']['migration_support']['value'] -$libvirt_cpu_mode = $resource['input']['libvirt_cpu_mode']['value'] -$libvirt_disk_cachemodes = $resource['input']['libvirt_disk_cachemodes']['value'] -$libvirt_inject_password = $resource['input']['libvirt_inject_password']['value'] -$libvirt_inject_key = $resource['input']['libvirt_inject_key']['value'] -$libvirt_inject_partition = $resource['input']['libvirt_inject_partition']['value'] -$remove_unused_base_images = $resource['input']['remove_unused_base_images']['value'] -$remove_unused_kernels = $resource['input']['remove_unused_kernels']['value'] -$remove_unused_resized_minimum_age_seconds = $resource['input']['remove_unused_resized_minimum_age_seconds']['value'] -$remove_unused_original_minimum_age_seconds = $resource['input']['remove_unused_original_minimum_age_seconds']['value'] -$libvirt_service_name = $resource['input']['libvirt_service_name']['value'] -$libvirt_type = $resource['input']['libvirt_type']['value'] +$libvirt_virt_type = $resource['input']['libvirt_virt_type'] +$vncserver_listen = $resource['input']['vncserver_listen'] +$migration_support = $resource['input']['migration_support'] +$libvirt_cpu_mode = $resource['input']['libvirt_cpu_mode'] +$libvirt_disk_cachemodes = $resource['input']['libvirt_disk_cachemodes'] +$libvirt_inject_password = $resource['input']['libvirt_inject_password'] +$libvirt_inject_key = $resource['input']['libvirt_inject_key'] +$libvirt_inject_partition = $resource['input']['libvirt_inject_partition'] +$remove_unused_base_images = $resource['input']['remove_unused_base_images'] +$remove_unused_kernels = $resource['input']['remove_unused_kernels'] +$remove_unused_resized_minimum_age_seconds = $resource['input']['remove_unused_resized_minimum_age_seconds'] +$remove_unused_original_minimum_age_seconds = $resource['input']['remove_unused_original_minimum_age_seconds'] +$libvirt_service_name = $resource['input']['libvirt_service_name'] +$libvirt_type = $resource['input']['libvirt_type'] class { 'nova::compute::libvirt': libvirt_virt_type => $libvirt_virt_type, diff --git a/resources/nova_compute_puppet/actions/run.pp b/resources/nova_compute_puppet/actions/run.pp index 8c33baa1..2a8810be 100644 --- a/resources/nova_compute_puppet/actions/run.pp +++ b/resources/nova_compute_puppet/actions/run.pp @@ -1,26 +1,26 @@ $resource = hiera($::resource_name) -$ensure_package = $resource['input']['ensure_package']['value'] -$vnc_enabled = $resource['input']['vnc_enabled']['value'] -$vncserver_proxyclient_address = $resource['input']['vncserver_proxyclient_address']['value'] -$vncproxy_host = $resource['input']['vncproxy_host']['value'] -$vncproxy_protocol = $resource['input']['vncproxy_protocol']['value'] -$vncproxy_port = $resource['input']['vncproxy_port']['value'] -$vncproxy_path = $resource['input']['vncproxy_path']['value'] -$vnc_keymap = $resource['input']['vnc_keymap']['value'] -$force_config_drive = $resource['input']['force_config_drive']['value'] -$virtio_nic = $resource['input']['virtio_nic']['value'] -$neutron_enabled = $resource['input']['neutron_enabled']['value'] -$network_device_mtu = $resource['input']['network_device_mtu']['value'] -$instance_usage_audit = $resource['input']['instance_usage_audit']['value'] -$instance_usage_audit_period = $resource['input']['instance_usage_audit_period']['value'] -$force_raw_images = $resource['input']['force_raw_images']['value'] -$reserved_host_memory = $resource['input']['reserved_host_memory']['value'] -$compute_manager = $resource['input']['compute_manager']['value'] -$pci_passthrough = $resource['input']['pci_passthrough']['value'] -$default_availability_zone = $resource['input']['default_availability_zone']['value'] -$default_schedule_zone = $resource['input']['default_schedule_zone']['value'] -$internal_service_availability_zone = $resource['input']['internal_service_availability_zone']['value'] +$ensure_package = $resource['input']['ensure_package'] +$vnc_enabled = $resource['input']['vnc_enabled'] +$vncserver_proxyclient_address = $resource['input']['vncserver_proxyclient_address'] +$vncproxy_host = $resource['input']['vncproxy_host'] +$vncproxy_protocol = $resource['input']['vncproxy_protocol'] +$vncproxy_port = $resource['input']['vncproxy_port'] +$vncproxy_path = $resource['input']['vncproxy_path'] +$vnc_keymap = $resource['input']['vnc_keymap'] +$force_config_drive = $resource['input']['force_config_drive'] +$virtio_nic = $resource['input']['virtio_nic'] +$neutron_enabled = $resource['input']['neutron_enabled'] +$network_device_mtu = $resource['input']['network_device_mtu'] +$instance_usage_audit = $resource['input']['instance_usage_audit'] +$instance_usage_audit_period = $resource['input']['instance_usage_audit_period'] +$force_raw_images = $resource['input']['force_raw_images'] +$reserved_host_memory = $resource['input']['reserved_host_memory'] +$compute_manager = $resource['input']['compute_manager'] +$pci_passthrough = $resource['input']['pci_passthrough'] +$default_availability_zone = $resource['input']['default_availability_zone'] +$default_schedule_zone = $resource['input']['default_schedule_zone'] +$internal_service_availability_zone = $resource['input']['internal_service_availability_zone'] class { 'nova::compute': enabled => true, diff --git a/resources/nova_compute_puppet/actions/update.pp b/resources/nova_compute_puppet/actions/update.pp index 7837909f..ba31d806 100644 --- a/resources/nova_compute_puppet/actions/update.pp +++ b/resources/nova_compute_puppet/actions/update.pp @@ -1,26 +1,26 @@ $resource = hiera($::resource_name) -$ensure_package = $resource['input']['ensure_package']['value'] -$vnc_enabled = $resource['input']['vnc_enabled']['value'] -$vncserver_proxyclient_address = $resource['input']['vncserver_proxyclient_address']['value'] -$vncproxy_host = $resource['input']['vncproxy_host']['value'] -$vncproxy_protocol = $resource['input']['vncproxy_protocol']['value'] -$vncproxy_port = $resource['input']['vncproxy_port']['value'] -$vncproxy_path = $resource['input']['vncproxy_path']['value'] -$vnc_keymap = $resource['input']['vnc_keymap']['value'] -$force_config_drive = $resource['input']['force_config_drive']['value'] -$virtio_nic = $resource['input']['virtio_nic']['value'] -$neutron_enabled = $resource['input']['neutron_enabled']['value'] -$network_device_mtu = $resource['input']['network_device_mtu']['value'] -$instance_usage_audit = $resource['input']['instance_usage_audit']['value'] -$instance_usage_audit_period = $resource['input']['instance_usage_audit_period']['value'] -$force_raw_images = $resource['input']['force_raw_images']['value'] -$reserved_host_memory = $resource['input']['reserved_host_memory']['value'] -$compute_manager = $resource['input']['compute_manager']['value'] -$pci_passthrough = $resource['input']['pci_passthrough']['value'] -$default_availability_zone = $resource['input']['default_availability_zone']['value'] -$default_schedule_zone = $resource['input']['default_schedule_zone']['value'] -$internal_service_availability_zone = $resource['input']['internal_service_availability_zone']['value'] +$ensure_package = $resource['input']['ensure_package'] +$vnc_enabled = $resource['input']['vnc_enabled'] +$vncserver_proxyclient_address = $resource['input']['vncserver_proxyclient_address'] +$vncproxy_host = $resource['input']['vncproxy_host'] +$vncproxy_protocol = $resource['input']['vncproxy_protocol'] +$vncproxy_port = $resource['input']['vncproxy_port'] +$vncproxy_path = $resource['input']['vncproxy_path'] +$vnc_keymap = $resource['input']['vnc_keymap'] +$force_config_drive = $resource['input']['force_config_drive'] +$virtio_nic = $resource['input']['virtio_nic'] +$neutron_enabled = $resource['input']['neutron_enabled'] +$network_device_mtu = $resource['input']['network_device_mtu'] +$instance_usage_audit = $resource['input']['instance_usage_audit'] +$instance_usage_audit_period = $resource['input']['instance_usage_audit_period'] +$force_raw_images = $resource['input']['force_raw_images'] +$reserved_host_memory = $resource['input']['reserved_host_memory'] +$compute_manager = $resource['input']['compute_manager'] +$pci_passthrough = $resource['input']['pci_passthrough'] +$default_availability_zone = $resource['input']['default_availability_zone'] +$default_schedule_zone = $resource['input']['default_schedule_zone'] +$internal_service_availability_zone = $resource['input']['internal_service_availability_zone'] class { 'nova::compute': enabled => true, diff --git a/resources/nova_conductor_puppet/actions/run.pp b/resources/nova_conductor_puppet/actions/run.pp index 93daf765..f0aa53e7 100644 --- a/resources/nova_conductor_puppet/actions/run.pp +++ b/resources/nova_conductor_puppet/actions/run.pp @@ -1,7 +1,7 @@ $resource = hiera($::resource_name) -$ensure_package = $resource['input']['ensure_package']['value'] -$workers = $resource['input']['workers']['value'] +$ensure_package = $resource['input']['ensure_package'] +$workers = $resource['input']['workers'] exec { 'post-nova_config': command => '/bin/echo "Nova config has changed"', diff --git a/resources/nova_conductor_puppet/actions/update.pp b/resources/nova_conductor_puppet/actions/update.pp index 9ab0f15b..ed258675 100644 --- a/resources/nova_conductor_puppet/actions/update.pp +++ b/resources/nova_conductor_puppet/actions/update.pp @@ -1,7 +1,7 @@ $resource = hiera($::resource_name) -$ensure_package = $resource['input']['ensure_package']['value'] -$workers = $resource['input']['workers']['value'] +$ensure_package = $resource['input']['ensure_package'] +$workers = $resource['input']['workers'] exec { 'post-nova_config': command => '/bin/echo "Nova config has changed"', diff --git a/resources/nova_generic_service_puppet/actions/remove.pp b/resources/nova_generic_service_puppet/actions/remove.pp index 964f79c9..d848408a 100644 --- a/resources/nova_generic_service_puppet/actions/remove.pp +++ b/resources/nova_generic_service_puppet/actions/remove.pp @@ -1,6 +1,6 @@ -$service_title = $resource['input']['title']['value'] -$package_name = $resource['input']['package_name']['value'] -$service_name = $resource['input']['service_name']['value'] +$service_title = $resource['input']['title'] +$package_name = $resource['input']['package_name'] +$service_name = $resource['input']['service_name'] exec { 'post-nova_config': command => '/bin/echo "Nova config has changed"', diff --git a/resources/nova_generic_service_puppet/actions/run.pp b/resources/nova_generic_service_puppet/actions/run.pp index 9e696f4d..ab47b8cc 100644 --- a/resources/nova_generic_service_puppet/actions/run.pp +++ b/resources/nova_generic_service_puppet/actions/run.pp @@ -1,9 +1,9 @@ $resource = hiera($::resource_name) -$service_title = $resource['input']['title']['value'] -$package_name = $resource['input']['package_name']['value'] -$service_name = $resource['input']['service_name']['value'] -$ensure_package = $resource['input']['ensure_package']['value'] +$service_title = $resource['input']['title'] +$package_name = $resource['input']['package_name'] +$service_name = $resource['input']['service_name'] +$ensure_package = $resource['input']['ensure_package'] exec { 'post-nova_config': command => '/bin/echo "Nova config has changed"', diff --git a/resources/nova_generic_service_puppet/actions/update.pp b/resources/nova_generic_service_puppet/actions/update.pp index 2aa7d142..49301e58 100644 --- a/resources/nova_generic_service_puppet/actions/update.pp +++ b/resources/nova_generic_service_puppet/actions/update.pp @@ -1,9 +1,9 @@ $resource = hiera($::resource_name) -$service_title = $resource['input']['title']['value'] -$package_name = $resource['input']['package_name']['value'] -$service_name = $resource['input']['service_name']['value'] -$ensure_package = $resource['input']['ensure_package']['value'] +$service_title = $resource['input']['title'] +$package_name = $resource['input']['package_name'] +$service_name = $resource['input']['service_name'] +$ensure_package = $resource['input']['ensure_package'] exec { 'post-nova_config': command => '/bin/echo "Nova config has changed"', diff --git a/resources/nova_neutron_puppet/actions/run.pp b/resources/nova_neutron_puppet/actions/run.pp index 4a0db5b8..5589032c 100644 --- a/resources/nova_neutron_puppet/actions/run.pp +++ b/resources/nova_neutron_puppet/actions/run.pp @@ -1,30 +1,30 @@ $resource = hiera($::resource_name) -$auth_host = $resource['input']['auth_host']['value'] -$auth_port = $resource['input']['auth_port']['value'] -$auth_protocol = $resource['input']['auth_protocol']['value'] -$neutron_endpoint_host = $resource['input']['neutron_endpoint_host']['value'] -$neutron_endpoint_port = $resource['input']['neutron_endpoint_port']['value'] -$neutron_endpoint_protocol = $resource['input']['neutron_endpoint_protocol']['value'] +$auth_host = $resource['input']['auth_host'] +$auth_port = $resource['input']['auth_port'] +$auth_protocol = $resource['input']['auth_protocol'] +$neutron_endpoint_host = $resource['input']['neutron_endpoint_host'] +$neutron_endpoint_port = $resource['input']['neutron_endpoint_port'] +$neutron_endpoint_protocol = $resource['input']['neutron_endpoint_protocol'] -$libvirt_vif_driver = $resource['input']['libvirt_vif_driver']['value'] -$force_snat_range = $resource['input']['force_snat_range']['value'] -$neutron_admin_password = $resource['input']['neutron_admin_password']['value'] -$neutron_auth_strategy = $resource['input']['neutron_auth_strategy']['value'] -$neutron_url_timeout = $resource['input']['neutron_url_timeout']['value'] -$neutron_admin_tenant_name = $resource['input']['neutron_admin_tenant_name']['value'] -$neutron_default_tenant_id = $resource['input']['neutron_default_tenant_id']['value'] -$neutron_region_name = $resource['input']['neutron_region_name']['value'] -$neutron_admin_username = $resource['input']['neutron_admin_username']['value'] -$neutron_ovs_bridge = $resource['input']['neutron_ovs_bridge']['value'] -$neutron_extension_sync_interval = $resource['input']['neutron_extension_sync_interval']['value'] -$neutron_ca_certificates_file = $resource['input']['neutron_ca_certificates_file']['value'] -$network_api_class = $resource['input']['network_api_class']['value'] -$security_group_api = $resource['input']['security_group_api']['value'] -$firewall_driver = $resource['input']['firewall_driver']['value'] -$vif_plugging_is_fatal = $resource['input']['vif_plugging_is_fatal']['value'] -$vif_plugging_timeout = $resource['input']['vif_plugging_timeout']['value'] -$dhcp_domain = $resource['input']['dhcp_domain']['value'] +$libvirt_vif_driver = $resource['input']['libvirt_vif_driver'] +$force_snat_range = $resource['input']['force_snat_range'] +$neutron_admin_password = $resource['input']['neutron_admin_password'] +$neutron_auth_strategy = $resource['input']['neutron_auth_strategy'] +$neutron_url_timeout = $resource['input']['neutron_url_timeout'] +$neutron_admin_tenant_name = $resource['input']['neutron_admin_tenant_name'] +$neutron_default_tenant_id = $resource['input']['neutron_default_tenant_id'] +$neutron_region_name = $resource['input']['neutron_region_name'] +$neutron_admin_username = $resource['input']['neutron_admin_username'] +$neutron_ovs_bridge = $resource['input']['neutron_ovs_bridge'] +$neutron_extension_sync_interval = $resource['input']['neutron_extension_sync_interval'] +$neutron_ca_certificates_file = $resource['input']['neutron_ca_certificates_file'] +$network_api_class = $resource['input']['network_api_class'] +$security_group_api = $resource['input']['security_group_api'] +$firewall_driver = $resource['input']['firewall_driver'] +$vif_plugging_is_fatal = $resource['input']['vif_plugging_is_fatal'] +$vif_plugging_timeout = $resource['input']['vif_plugging_timeout'] +$dhcp_domain = $resource['input']['dhcp_domain'] class { 'nova::compute::neutron': diff --git a/resources/nova_puppet/actions/run.pp b/resources/nova_puppet/actions/run.pp index 46bf2b42..34003538 100644 --- a/resources/nova_puppet/actions/run.pp +++ b/resources/nova_puppet/actions/run.pp @@ -1,76 +1,76 @@ $resource = hiera($::resource_name) -$db_user = $resource['input']['db_user']['value'] -$db_password = $resource['input']['db_password']['value'] -$db_name = $resource['input']['db_name']['value'] -$db_host = $resource['input']['db_host']['value'] -$db_port = $resource['input']['db_port']['value'] -$glance_api_servers_host = $resource['input']['glance_api_servers_host']['value'] -$glance_api_servers_port = $resource['input']['glance_api_servers_port']['value'] +$db_user = $resource['input']['db_user'] +$db_password = $resource['input']['db_password'] +$db_name = $resource['input']['db_name'] +$db_host = $resource['input']['db_host'] +$db_port = $resource['input']['db_port'] +$glance_api_servers_host = $resource['input']['glance_api_servers_host'] +$glance_api_servers_port = $resource['input']['glance_api_servers_port'] -$ensure_package = $resource['input']['ensure_package']['value'] -$database_connection = $resource['input']['database_connection']['value'] -$slave_connection = $resource['input']['slave_connection']['value'] -$database_idle_timeout = $resource['input']['database_idle_timeout']['value'] -$rpc_backend = $resource['input']['rpc_backend']['value'] -$image_service = $resource['input']['image_service']['value'] -$glance_api_servers = $resource['input']['glance_api_servers']['value'] -$memcached_servers = $resource['input']['memcached_servers']['value'] -$rabbit_host = $resource['input']['rabbit_host']['value'] -$rabbit_hosts = $resource['input']['rabbit_hosts']['value'] -$rabbit_password = $resource['input']['rabbit_password']['value'] -$rabbit_port = $resource['input']['rabbit_port']['value'] -$rabbit_userid = $resource['input']['rabbit_userid']['value'] -$rabbit_virtual_host = $resource['input']['rabbit_virtual_host']['value'] -$rabbit_use_ssl = $resource['input']['rabbit_use_ssl']['value'] -$rabbit_ha_queues = $resource['input']['rabbit_ha_queues']['value'] -$kombu_ssl_ca_certs = $resource['input']['kombu_ssl_ca_certs']['value'] -$kombu_ssl_certfile = $resource['input']['kombu_ssl_certfile']['value'] -$kombu_ssl_keyfile = $resource['input']['kombu_ssl_keyfile']['value'] -$kombu_ssl_version = $resource['input']['kombu_ssl_version']['value'] -$amqp_durable_queues = $resource['input']['amqp_durable_queues']['value'] -$qpid_hostname = $resource['input']['qpid_hostname']['value'] -$qpid_port = $resource['input']['qpid_port']['value'] -$qpid_username = $resource['input']['qpid_username']['value'] -$qpid_password = $resource['input']['qpid_password']['value'] -$qpid_sasl_mechanisms = $resource['input']['qpid_sasl_mechanisms']['value'] -$qpid_heartbeat = $resource['input']['qpid_heartbeat']['value'] -$qpid_protocol = $resource['input']['qpid_protocol']['value'] -$qpid_tcp_nodelay = $resource['input']['qpid_tcp_nodelay']['value'] -$auth_strategy = $resource['input']['auth_strategy']['value'] -$service_down_time = $resource['input']['service_down_time']['value'] -$log_dir = $resource['input']['log_dir']['value'] -$state_path = $resource['input']['state_path']['value'] -$lock_path = $resource['input']['lock_path']['value'] -$verbose = $resource['input']['verbose']['value'] -$debug = $resource['input']['debug']['value'] -$periodic_interval = $resource['input']['periodic_interval']['value'] -$report_interval = $resource['input']['report_interval']['value'] -$rootwrap_config = $resource['input']['rootwrap_config']['value'] -$use_ssl = $resource['input']['use_ssl']['value'] -$enabled_ssl_apis = $resource['input']['enabled_ssl_apis']['value'] -$ca_file = $resource['input']['ca_file']['value'] -$cert_file = $resource['input']['cert_file']['value'] -$key_file = $resource['input']['key_file']['value'] -$nova_user_id = $resource['input']['nova_user_id']['value'] -$nova_group_id = $resource['input']['nova_group_id']['value'] -$nova_public_key = $resource['input']['nova_public_key']['value'] -$nova_private_key = $resource['input']['nova_private_key']['value'] -$nova_shell = $resource['input']['nova_shell']['value'] -$monitoring_notifications = $resource['input']['monitoring_notifications']['value'] -$use_syslog = $resource['input']['use_syslog']['value'] -$log_facility = $resource['input']['log_facility']['value'] -$install_utilities = $resource['input']['install_utilities']['value'] -$notification_driver = $resource['input']['notification_driver']['value'] -$notification_topics = $resource['input']['notification_topics']['value'] -$notify_api_faults = $resource['input']['notify_api_faults']['value'] -$notify_on_state_change = $resource['input']['notify_on_state_change']['value'] -$mysql_module = $resource['input']['mysql_module']['value'] -$nova_cluster_id = $resource['input']['nova_cluster_id']['value'] -$sql_connection = $resource['input']['sql_connection']['value'] -$sql_idle_timeout = $resource['input']['sql_idle_timeout']['value'] -$logdir = $resource['input']['logdir']['value'] -$os_region_name = $resource['input']['os_region_name']['value'] +$ensure_package = $resource['input']['ensure_package'] +$database_connection = $resource['input']['database_connection'] +$slave_connection = $resource['input']['slave_connection'] +$database_idle_timeout = $resource['input']['database_idle_timeout'] +$rpc_backend = $resource['input']['rpc_backend'] +$image_service = $resource['input']['image_service'] +$glance_api_servers = $resource['input']['glance_api_servers'] +$memcached_servers = $resource['input']['memcached_servers'] +$rabbit_host = $resource['input']['rabbit_host'] +$rabbit_hosts = $resource['input']['rabbit_hosts'] +$rabbit_password = $resource['input']['rabbit_password'] +$rabbit_port = $resource['input']['rabbit_port'] +$rabbit_userid = $resource['input']['rabbit_userid'] +$rabbit_virtual_host = $resource['input']['rabbit_virtual_host'] +$rabbit_use_ssl = $resource['input']['rabbit_use_ssl'] +$rabbit_ha_queues = $resource['input']['rabbit_ha_queues'] +$kombu_ssl_ca_certs = $resource['input']['kombu_ssl_ca_certs'] +$kombu_ssl_certfile = $resource['input']['kombu_ssl_certfile'] +$kombu_ssl_keyfile = $resource['input']['kombu_ssl_keyfile'] +$kombu_ssl_version = $resource['input']['kombu_ssl_version'] +$amqp_durable_queues = $resource['input']['amqp_durable_queues'] +$qpid_hostname = $resource['input']['qpid_hostname'] +$qpid_port = $resource['input']['qpid_port'] +$qpid_username = $resource['input']['qpid_username'] +$qpid_password = $resource['input']['qpid_password'] +$qpid_sasl_mechanisms = $resource['input']['qpid_sasl_mechanisms'] +$qpid_heartbeat = $resource['input']['qpid_heartbeat'] +$qpid_protocol = $resource['input']['qpid_protocol'] +$qpid_tcp_nodelay = $resource['input']['qpid_tcp_nodelay'] +$auth_strategy = $resource['input']['auth_strategy'] +$service_down_time = $resource['input']['service_down_time'] +$log_dir = $resource['input']['log_dir'] +$state_path = $resource['input']['state_path'] +$lock_path = $resource['input']['lock_path'] +$verbose = $resource['input']['verbose'] +$debug = $resource['input']['debug'] +$periodic_interval = $resource['input']['periodic_interval'] +$report_interval = $resource['input']['report_interval'] +$rootwrap_config = $resource['input']['rootwrap_config'] +$use_ssl = $resource['input']['use_ssl'] +$enabled_ssl_apis = $resource['input']['enabled_ssl_apis'] +$ca_file = $resource['input']['ca_file'] +$cert_file = $resource['input']['cert_file'] +$key_file = $resource['input']['key_file'] +$nova_user_id = $resource['input']['nova_user_id'] +$nova_group_id = $resource['input']['nova_group_id'] +$nova_public_key = $resource['input']['nova_public_key'] +$nova_private_key = $resource['input']['nova_private_key'] +$nova_shell = $resource['input']['nova_shell'] +$monitoring_notifications = $resource['input']['monitoring_notifications'] +$use_syslog = $resource['input']['use_syslog'] +$log_facility = $resource['input']['log_facility'] +$install_utilities = $resource['input']['install_utilities'] +$notification_driver = $resource['input']['notification_driver'] +$notification_topics = $resource['input']['notification_topics'] +$notify_api_faults = $resource['input']['notify_api_faults'] +$notify_on_state_change = $resource['input']['notify_on_state_change'] +$mysql_module = $resource['input']['mysql_module'] +$nova_cluster_id = $resource['input']['nova_cluster_id'] +$sql_connection = $resource['input']['sql_connection'] +$sql_idle_timeout = $resource['input']['sql_idle_timeout'] +$logdir = $resource['input']['logdir'] +$os_region_name = $resource['input']['os_region_name'] class { 'nova': database_connection => "mysql://${db_user}:${db_password}@${db_host}:${db_port}/${db_name}?charset=utf8", diff --git a/resources/rabbitmq_service/actions/run.pp b/resources/rabbitmq_service/actions/run.pp index 2ea22054..02ed9cff 100644 --- a/resources/rabbitmq_service/actions/run.pp +++ b/resources/rabbitmq_service/actions/run.pp @@ -1,7 +1,7 @@ $resource = hiera($::resource_name) -$port = "${resource['input']['port']['value']}" -$management_port = "${resource['input']['management_port']['value']}" +$port = "${resource['input']['port']}" +$management_port = "${resource['input']['management_port']}" class { '::rabbitmq': service_manage => true, diff --git a/solar/solar/core/handlers/puppet.py b/solar/solar/core/handlers/puppet.py index 8ac2fbcb..28f75e23 100644 --- a/solar/solar/core/handlers/puppet.py +++ b/solar/solar/core/handlers/puppet.py @@ -25,7 +25,7 @@ from solar import errors # - puppet is installed class Puppet(TempFileHandler): def action(self, resource, action_name): - log.debug('Executing Puppet manifest %s %s', action_name, resource) + log.debug('Executing Puppet manifest %s %s', action_name, resource.name) action_file = self._compile_action_file(resource, action_name) log.debug('action_file: %s', action_file) @@ -62,7 +62,7 @@ class Puppet(TempFileHandler): return cmd def _make_args(self, resource): - return {resource.name: resource.to_dict()} + return {resource.name: {'input': resource.args}} def upload_hiera_resource(self, resource): src = '/tmp/puppet_{}.yaml'.format(resource.name)