From a3fa784c5dc2c66bc38daed86cd54c7a4e1f9ddb Mon Sep 17 00:00:00 2001
From: Bogdan Dobrelya <bdobrelia@mirantis.com>
Date: Tue, 4 Aug 2015 15:36:58 +0200
Subject: [PATCH] Fix undefined inputs

Do not use defaults like '' as this may
render wrong config parameter value, like
key=

Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
---
 resources/cinder_api_puppet/meta.yaml         |  4 +-
 resources/cinder_puppet/meta.yaml             | 26 +++++------
 resources/cinder_scheduler_puppet/meta.yaml   |  2 +-
 resources/glance_puppet/meta.yaml             | 24 +++++-----
 resources/glance_registry_puppet/meta.yaml    | 22 +++++-----
 resources/neutron_puppet/meta.yaml            | 25 +++++------
 resources/nova_api_puppet/meta.yaml           | 20 ++++-----
 .../nova_compute_libvirt_puppet/meta.yaml     | 10 ++---
 resources/nova_compute_puppet/meta.yaml       |  8 ++--
 resources/nova_neutron_puppet/meta.yaml       |  2 +-
 resources/nova_puppet/meta.yaml               | 44 +++++++++----------
 resources/rabbitmq_service/meta.yaml          |  6 +--
 12 files changed, 96 insertions(+), 97 deletions(-)

diff --git a/resources/cinder_api_puppet/meta.yaml b/resources/cinder_api_puppet/meta.yaml
index 114db75a..3f4ca59e 100644
--- a/resources/cinder_api_puppet/meta.yaml
+++ b/resources/cinder_api_puppet/meta.yaml
@@ -32,7 +32,7 @@ input:
       value: false
     os_region_name:
       schema: str
-      value: ''
+      value:
     service_port:
       schema: int
       value: 5000
@@ -47,7 +47,7 @@ input:
       value: '0.0.0.0'
     ratelimits:
       schema: str
-      value: ''
+      value:
     default_volume_type:
       schema: bool
       value: false
diff --git a/resources/cinder_puppet/meta.yaml b/resources/cinder_puppet/meta.yaml
index fc90d110..925144e8 100644
--- a/resources/cinder_puppet/meta.yaml
+++ b/resources/cinder_puppet/meta.yaml
@@ -14,7 +14,7 @@ input:
       value: 1
     database_max_pool_size:
       schema: str
-      value: ''
+      value:
     database_max_retries:
       schema: int
       value: 10
@@ -23,7 +23,7 @@ input:
       value: 10
     database_max_overflow:
       schema: str
-      value: ''
+      value:
     rpc_backend:
       schema: str
       value: 'cinder.openstack.common.rpc.impl_kombu'
@@ -53,13 +53,13 @@ input:
       value: false
     kombu_ssl_ca_certs:
       schema: str
-      value: ''
+      value:
     kombu_ssl_certfile:
       schema: str
-      value: ''
+      value:
     kombu_ssl_keyfile:
       schema: str
-      value: ''
+      value:
     kombu_ssl_version:
       schema: str
       value: 'TLSv1'
@@ -149,13 +149,13 @@ input:
       value: false
     mysql_module:
       schema: str
-      value: ''
+      value:
     sql_connection:
       schema: str
-      value: ''
+      value:
     sql_idle_timeout:
       schema: str
-      value: ''
+      value:
 
     db_user:
       schema: str!
@@ -180,19 +180,19 @@ input:
 
     keystone_host:
       schema: str!
-      value: ''
+      value:
     keystone_port:
       schema: int!
-      value: ''
+      value:
     keystone_user:
       schema: str!
-      value: ''
+      value:
     keystone_password:
       schema: str!
-      value: ''
+      value:
     keystone_tenant:
       schema: str!
-      value: ''
+      value:
 
 #    forge:
 #      schema: str!
diff --git a/resources/cinder_scheduler_puppet/meta.yaml b/resources/cinder_scheduler_puppet/meta.yaml
index 24c98431..2d105f4d 100644
--- a/resources/cinder_scheduler_puppet/meta.yaml
+++ b/resources/cinder_scheduler_puppet/meta.yaml
@@ -5,7 +5,7 @@ version: 1.0.0
 input:
     scheduler_driver:
       schema: str
-      value: ''
+      value:
     package_ensure:
       schema: str
       value: 'present'
diff --git a/resources/glance_puppet/meta.yaml b/resources/glance_puppet/meta.yaml
index 589002fe..efb7d0b8 100644
--- a/resources/glance_puppet/meta.yaml
+++ b/resources/glance_puppet/meta.yaml
@@ -56,10 +56,10 @@ input:
       value: 35357
     auth_uri:
       schema: str
-      value: ''
+      value:
     auth_admin_prefix:
       schema: str
-      value: ''
+      value:
     auth_protocol:
       schema: str
       value: 'http'
@@ -86,16 +86,16 @@ input:
       value: false
     cert_file:
       schema: str
-      value: ''
+      value:
     key_file:
       schema: str
-      value: ''
+      value:
     ca_file:
       schema: str
-      value: ''
+      value:
     known_stores:
       schema: str
-      value: ''
+      value:
     database_connection:
       schema: str
       value: 'sqlite:///var/lib/glance/glance.sqlite'
@@ -116,13 +116,13 @@ input:
       value: {}
     mysql_module:
       schema: str
-      value: ''
+      value:
     sql_idle_timeout:
       schema: str
-      value: ''
+      value:
     sql_connection:
       schema: str
-      value: ''
+      value:
 
     git:
       schema: {repository: str!, branch: str!}
@@ -153,12 +153,12 @@ input:
 
     keystone_host:
       schema: str!
-      value: ''
+      value:
     keystone_port:
       schema: int!
-      value: ''
+      value:
     keystone_password:
       schema: str!
-      value: ''
+      value:
 
 tags: [resource/glance_service, resources/glance, resource/glance_api_service]
diff --git a/resources/glance_registry_puppet/meta.yaml b/resources/glance_registry_puppet/meta.yaml
index 8f1da477..d46ad201 100644
--- a/resources/glance_registry_puppet/meta.yaml
+++ b/resources/glance_registry_puppet/meta.yaml
@@ -41,10 +41,10 @@ input:
       value: 35357
     auth_admin_prefix:
       schema: str
-      value: ''
+      value:
     auth_uri:
       schema: str
-      value: ''
+      value:
     auth_protocol:
       schema: str
       value: 'http'
@@ -68,25 +68,25 @@ input:
       value: false
     cert_file:
       schema: str
-      value: ''
+      value:
     key_file:
       schema: str
-      value: ''
+      value:
     ca_file:
       schema: str
-      value: ''
+      value:
     sync_db:
       schema: bool
       value: true
     mysql_module:
       schema: str
-      value: ''
+      value:
     sql_idle_timeout:
       schema: str
-      value: ''
+      value:
     sql_connection:
       schema: str
-      value: ''
+      value:
 
     git:
       schema: {repository: str!, branch: str!}
@@ -117,12 +117,12 @@ input:
 
     keystone_host:
       schema: str!
-      value: ''
+      value:
     keystone_port:
       schema: int!
-      value: ''
+      value:
     keystone_password:
       schema: str!
-      value: ''
+      value:
 
 tags: [resource/glance_registry_service, resources/glance_registry, resource/glance]
diff --git a/resources/neutron_puppet/meta.yaml b/resources/neutron_puppet/meta.yaml
index ca43ceb0..8c39ceee 100644
--- a/resources/neutron_puppet/meta.yaml
+++ b/resources/neutron_puppet/meta.yaml
@@ -3,30 +3,30 @@ id: 'neutron'
 input:
   ip:
     schema: str!
-    value: ''
+    value:
   ssh_key:
     schema: str!
-    value: ''
+    value:
   ssh_user:
     schema: str!
-    value: ''
+    value:
 
   # TODO: add vhost!
   rabbitmq_host:
     schema: str!
-    value: ''
+    value:
   rabbitmq_port:
     schema: int!
-    value: ''
+    value:
   rabbitmq_user:
     schema: str!
-    value: ''
+    value:
   rabbitmq_password:
     schema: str!
-    value: ''
+    value:
   rabbitmq_virtual_host:
     schema: str!
-    value: ''
+    value:
 
   git:
     schema: {repository: str!, branch: str!}
@@ -38,19 +38,18 @@ input:
 
   keystone_host:
     schema: str!
-    value: ''
   keystone_port:
     schema: int!
-    value: ''
+    value:
   keystone_user:
     schema: str!
-    value: ''
+    value:
   keystone_password:
     schema: str!
-    value: ''
+    value:
   keystone_tenant:
     schema: str!
-    value: ''
+    value:
 puppet_module: 'neutron'
 tags: []
 version: 1.0.0
diff --git a/resources/nova_api_puppet/meta.yaml b/resources/nova_api_puppet/meta.yaml
index ca568f8a..287454fd 100644
--- a/resources/nova_api_puppet/meta.yaml
+++ b/resources/nova_api_puppet/meta.yaml
@@ -8,7 +8,7 @@ input:
       value: 'present'
     auth_strategy:
       schema: str
-      value: ''
+      value:
     auth_host:
       schema: str
       value: '127.0.0.1'
@@ -20,13 +20,13 @@ input:
       value: 'http'
     auth_uri:
       schema: str
-      value: ''
+      value:
     auth_admin_prefix:
       schema: str
-      value: ''
+      value:
     auth_version:
       schema: str
-      value: ''
+      value:
     admin_tenant_name:
       schema: str
       value: 'services'
@@ -47,7 +47,7 @@ input:
       value: 'ec2,osapi_compute,metadata'
     keystone_ec2_url:
       schema: str
-      value: ''
+      value:
     volume_api_class:
       schema: str
       value: 'nova.volume.cinder.API'
@@ -68,16 +68,16 @@ input:
       value: true
     neutron_metadata_proxy_shared_secret:
       schema: str
-      value: ''
+      value:
     osapi_v3:
       schema: bool
       value: false
     pci_alias:
       schema: str
-      value: ''
+      value:
     ratelimits:
       schema: str
-      value: ''
+      value:
     ratelimits_factory:
       schema: str
       value: 'nova.api.openstack.compute.limits:RateLimitingMiddleware.factory'
@@ -89,10 +89,10 @@ input:
       value: {}
     workers:
       schema: str
-      value: ''
+      value:
     conductor_workers:
       schema: str
-      value: ''
+      value:
 
     git:
       schema: {repository: str!, branch: str!}
diff --git a/resources/nova_compute_libvirt_puppet/meta.yaml b/resources/nova_compute_libvirt_puppet/meta.yaml
index 632787d8..e8e2cf1e 100644
--- a/resources/nova_compute_libvirt_puppet/meta.yaml
+++ b/resources/nova_compute_libvirt_puppet/meta.yaml
@@ -14,7 +14,7 @@ input:
       value: false
     libvirt_cpu_mode:
       schema: str
-      value: ''
+      value:
     libvirt_disk_cachemodes:
       schema: [str]
       value: []
@@ -29,16 +29,16 @@ input:
       value: '-2'
     remove_unused_base_images:
       schema: str
-      value: ''
+      value:
     remove_unused_kernels:
       schema: str
-      value: ''
+      value:
     remove_unused_resized_minimum_age_seconds:
       schema: str
-      value: ''
+      value:
     remove_unused_original_minimum_age_seconds:
       schema: str
-      value: ''
+      value:
     libvirt_service_name:
       schema: str
       value: 'libvirt-bin'
diff --git a/resources/nova_compute_puppet/meta.yaml b/resources/nova_compute_puppet/meta.yaml
index 0c448e11..4cf66149 100644
--- a/resources/nova_compute_puppet/meta.yaml
+++ b/resources/nova_compute_puppet/meta.yaml
@@ -14,7 +14,7 @@ input:
       value: '127.0.0.1'
     vncproxy_host:
       schema: str
-      value: ''
+      value:
     vncproxy_protocol:
       schema: str
       value: 'http'
@@ -38,7 +38,7 @@ input:
       value: true
     network_device_mtu:
       schema: str
-      value: ''
+      value:
     instance_usage_audit:
       schema: bool
       value: false
@@ -56,13 +56,13 @@ input:
       value: 'nova.compute.manager.ComputeManager'
     pci_passthrough:
       schema: str
-      value: ''
+      value:
     default_availability_zone:
       schema: str
       value: 'nova'
     default_schedule_zone:
       schema: str
-      value: ''
+      value:
     internal_service_availability_zone:
       schema: str
       value: 'internal'
diff --git a/resources/nova_neutron_puppet/meta.yaml b/resources/nova_neutron_puppet/meta.yaml
index 39a44b19..f8afae15 100644
--- a/resources/nova_neutron_puppet/meta.yaml
+++ b/resources/nova_neutron_puppet/meta.yaml
@@ -44,7 +44,7 @@ input:
       value: 600
     neutron_ca_certificates_file:
       schema: str
-      value: ''
+      value:
     network_api_class:
       schema: str
       value: 'nova.network.neutronv2.api.API'
diff --git a/resources/nova_puppet/meta.yaml b/resources/nova_puppet/meta.yaml
index 37f26709..8381061d 100644
--- a/resources/nova_puppet/meta.yaml
+++ b/resources/nova_puppet/meta.yaml
@@ -8,10 +8,10 @@ input:
       value: 'present'
     database_connection:
       schema: str
-      value: ''
+      value:
     slave_connection:
       schema: str
-      value: ''
+      value:
     database_idle_timeout:
       schema: int
       value: 3600
@@ -26,13 +26,13 @@ input:
       value: 'localhost:9292'
     memcached_servers:
       schema: str
-      value: ''
+      value:
     rabbit_host:
       schema: str
       value: 'localhost'
     rabbit_hosts:
       schema: str
-      value: ''
+      value:
     rabbit_password:
       schema: str!
       value: 'guest'
@@ -50,16 +50,16 @@ input:
       value: false
     rabbit_ha_queues:
       schema: str
-      value: ''
+      value:
     kombu_ssl_ca_certs:
       schema: str
-      value: ''
+      value:
     kombu_ssl_certfile:
       schema: str
-      value: ''
+      value:
     kombu_ssl_keyfile:
       schema: str
-      value: ''
+      value:
     kombu_ssl_version:
       schema: str
       value: 'TLSv1'
@@ -128,25 +128,25 @@ input:
       value: ['ec2', 'metadata', 'osapi_compute']
     ca_file:
       schema: str
-      value: ''
+      value:
     cert_file:
       schema: str
-      value: ''
+      value:
     key_file:
       schema: str
-      value: ''
+      value:
     nova_user_id:
       schema: str
-      value: ''
+      value:
     nova_group_id:
       schema: str
-      value: ''
+      value:
     nova_public_key:
       schema: str
-      value: ''
+      value:
     nova_private_key:
       schema: str
-      value: ''
+      value:
     nova_shell:
       schema: str
       value: '/bin/false'
@@ -173,25 +173,25 @@ input:
       value: false
     notify_on_state_change:
       schema: str
-      value: ''
+      value:
     mysql_module:
       schema: str
-      value: ''
+      value:
     nova_cluster_id:
       schema: str
-      value: ''
+      value:
     sql_connection:
       schema: str
-      value: ''
+      value:
     sql_idle_timeout:
       schema: str
-      value: ''
+      value:
     logdir:
       schema: str
-      value: ''
+      value:
     os_region_name:
       schema: str
-      value: ''
+      value:
 
     db_user:
       schema: str!
diff --git a/resources/rabbitmq_service/meta.yaml b/resources/rabbitmq_service/meta.yaml
index 54d97b17..53f60112 100644
--- a/resources/rabbitmq_service/meta.yaml
+++ b/resources/rabbitmq_service/meta.yaml
@@ -3,13 +3,13 @@ id: 'rabbitmq'
 input:
   ip:
     schema: str!
-    value: ''
+    value:
   ssh_key:
     schema: str!
-    value: ''
+    value:
   ssh_user:
     schema: str!
-    value: ''
+    value:
 
   port:
     schema: int!