Merge branch 'fix-packer-vars-for-cicd' into 'master'

fix-packer-vars-for-cicd

See merge request !5

build-compute.py

@@ -39,8 +39,8 @@ if floating_ip == "":
 # find usable floating ip id
 floating_ip_id = check_output('openstack floating ip list -c ID --sort-column ID --status DOWN -f value', shell=True).split("\n")[0]
 
-var['external-net'] = external_net
-var['internal-net'] = internal_net
+var['external_net'] = external_net
+var['internal_net'] = internal_net
 var['instance_floating_ip_net']= external_net
 var['floating_ip']= floating_ip_id
 var['ssh_host'] = host_prefix.format(floating_ip.split('.')[-1])

build.json

@@ -2,8 +2,8 @@
   "builders": [{
 	  "type": "openstack",
 	  "source_image_name": "{{ user `source_image_name` }}",
-	  "networks": [ "{{ user `external-net` }}","{{ user `internal-net` }}"], 
-	  "instance_floating_ip_net": "{{ user `external-net` }}",
+	  "networks": [ "{{ user `external_net` }}","{{ user `internal_net` }}"], 
+	  "instance_floating_ip_net": "{{ user `instance_floating_ip_net` }}",
 	  "instance_name": "{{ user `build_instance_name` }}",
 	  "image_name": "{{ user `build_instance_name` }}-V{{user `build_version`}}",
 	  "ssh_username": "{{ user `ssh_username` }}",

compute-openstack.json

@@ -6,7 +6,7 @@
          "source_image_name": "{{ user `source_image_name` }}",
          "flavor": "{{ user `flavor` }}",
          "floating_ip": "{{ user `floating_ip` }}",
-         "networks": ["{{ user `external-net` }}"],
+         "networks": ["{{ user `external_net` }}"],
          "ssh_host": "{{ user `ssh_host` }}",
          "ssh_username": "{{ user `ssh_username` }}",
          "ssh_keypair_name": "{{ user `ssh_keypair_name` }}",

gen-vars.py

@@ -37,8 +37,8 @@ if floating_ip == "":
 # find usable floating ip id
 floating_ip_id = check_output('openstack floating ip list -c ID --sort-column ID --status DOWN -f value', shell=True).split("\n")[0]
 
-var['external-net'] = external_net
-var['internal-net'] = internal_net
+var['external_net'] = external_net
+var['internal_net'] = internal_net
 var['instance_floating_ip_net']= external_net
 var['floating_ip']= floating_ip_id
 var['ssh_host'] = host_prefix.format(floating_ip.split('.')[-1])

vars.json

 {
 	"source_image_name": "CentOS-7-x86_64-GenericCloud-1905",
-	"external-net": "",
-	"internal-net": "",
+	"external_net": "",
+	"internal_net": "",
 	"instance_floating_ip_net": "",
 	"build_instance_name": "ohpc",
 	"img_build_version":"",