From 4c179a5a05d0ab84a68df256bf19b8d3d29cb453 Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Tue, 4 Aug 2015 15:45:05 +0200 Subject: [PATCH] Fix undef inputs for neutron Signed-off-by: Bogdan Dobrelya --- .../neutron_plugins_ovs_puppet/meta.yaml | 16 ++++----- resources/neutron_puppet/meta.yaml | 6 ++-- resources/neutron_server_puppet/meta.yaml | 36 +++++++++---------- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/resources/neutron_plugins_ovs_puppet/meta.yaml b/resources/neutron_plugins_ovs_puppet/meta.yaml index ece3fdf5..3198ad90 100644 --- a/resources/neutron_plugins_ovs_puppet/meta.yaml +++ b/resources/neutron_plugins_ovs_puppet/meta.yaml @@ -3,35 +3,35 @@ id: 'neutron_plugins_ovs_puppet' input: ip: schema: str! - value: '' + value: ssh_key: schema: str! - value: '' + value: ssh_user: schema: str! - value: '' + value: package_ensure: schema: str value: 'present' sql_connection: schema: str - value: '' + value: sql_max_retries: schema: str - value: '' + value: sql_idle_timeout: schema: str - value: '' + value: reconnect_interval: schema: str - value: '' + value: tenant_network_type: schema: str value: 'vlan' network_vlan_ranges: schema: str - value: '' + value: tunnel_id_ranges: schema: str value: '1:1000' diff --git a/resources/neutron_puppet/meta.yaml b/resources/neutron_puppet/meta.yaml index 79d3b0ad..fb0cc902 100644 --- a/resources/neutron_puppet/meta.yaml +++ b/resources/neutron_puppet/meta.yaml @@ -31,7 +31,7 @@ input: value: 'openvswitch' service_plugins: schema: str - value: '' + value: auth_strategy: schema: str value: 'keystone' @@ -103,7 +103,7 @@ input: value: false kombu_ssl_ca_certs: schema: str - value: '' + value: kombu_ssl_certfile: schema: str value: @@ -175,7 +175,7 @@ input: value: 'LOG_USER' log_file: schema: str - value: '' + value: log_dir: schema: str value: '/var/log/neutron' diff --git a/resources/neutron_server_puppet/meta.yaml b/resources/neutron_server_puppet/meta.yaml index 29cc844c..b32e0b2e 100644 --- a/resources/neutron_server_puppet/meta.yaml +++ b/resources/neutron_server_puppet/meta.yaml @@ -3,13 +3,13 @@ id: 'neutron_server_puppet' input: ip: schema: str! - value: '' + value: ssh_key: schema: str! - value: '' + value: ssh_user: schema: str! - value: '' + value: db_user: schema: str! @@ -29,7 +29,7 @@ input: value: 'present' auth_password: schema: str! - value: '' + value: auth_type: schema: str value: 'keystone' @@ -41,7 +41,7 @@ input: value: 35357 auth_admin_prefix: schema: str - value: '' + value: auth_tenant: schema: str value: 'services' @@ -53,7 +53,7 @@ input: value: 'http' auth_uri: schema: str - value: '' + value: database_connection: schema: str value: 'sqlite:////var/lib/neutron/ovs.sqlite' @@ -107,40 +107,40 @@ input: value: '169.254.192.0/18' mysql_module: schema: str - value: '' + value: sql_connection: schema: str - value: '' + value: connection: schema: str - value: '' + value: sql_max_retries: schema: str - value: '' + value: max_retries: schema: str - value: '' + value: sql_idle_timeout: schema: str - value: '' + value: idle_timeout: schema: str - value: '' + value: sql_reconnect_interval: schema: str - value: '' + value: retry_interval: schema: str - value: '' + value: log_dir: schema: str - value: '' + value: log_file: schema: str - value: '' + value: report_interval: schema: str - value: '' + value: git: schema: {repository: str!, branch: str!}