Fix CA certificate setup

- initialize variable that stores file name of certificate
- declare $nsx_config_dirs before it gets referenced

Change-Id: I7724c8d576dc99bc0f87c999152190737801bee9
Closes-bug: #1515236

deployment_scripts/puppet/modules/nsxv/manifests/init.pp

@@ -13,9 +13,15 @@ class nsxv (
   $nova_metadata_port = '8775'
   $metadata_shared_secret = $quantum_settings['metadata']['metadata_proxy_shared_secret']
 
+  $nsxv_config_dirs = [ '/etc/neutron', '/etc/neutron/plugins', '/etc/neutron/plugins/vmware' ]
+  file { $nsxv_config_dirs:
+    ensure => directory
+  }
+
   if ! $settings['nsxv_insecure'] {
     $ca_certificate_content = $settings['nsxv_ca_file']['content']
-    $ca_file = "${nsxv_config_dir}/ca.pem"
+    $ca_filename = $settings['nsxv_ca_file']['name']
+    $ca_file = "${nsxv_config_dir}/$ca_filename"
 
     file { $ca_file:
       ensure  => present,
@@ -28,11 +34,6 @@ class nsxv (
     ensure => latest,
   }
 
-  $nsxv_config_dirs = [ '/etc/neutron', '/etc/neutron/plugins', '/etc/neutron/plugins/vmware' ]
-  file { $nsxv_config_dirs:
-    ensure => directory
-  }
-
   file { "${nsxv_config_dir}/nsx.ini":
     ensure  => file,
     content => template("${module_name}/nsx.ini.erb"),