Remove UUIDs in centos.json

Removed the remaining UUIDs from the centos.json file, making it easier
to reuse this file. This does require a recent version of the packer
tool. Updated the README accordingly and also added the --env option in
the packer alias, so that the OS_CLOUD variable is set when running
packer in the container. Updated rapid.vms with the security group name
used in the centos.json file.

Change-Id: I4f6815a3250811e336c14857e0ec5e7793a77acf
Signed-off-by: Luc Provoost <luc.provoost@intel.com>

diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/README b/VNFs/DPPD-PROX/helper-scripts/rapid/README
index b198c51..b88bd7e 100644 (file)
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/README
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/README
@@ -54,20 +54,20 @@ clouds:
 
 Packer could be run from docker image, you will need to create following alias:
 
-alias packer='docker run -it -v "$PWD":/root/project -w /root/project hashicorp/packer:light $@'
-
+alias packer='docker run -it --env OS_CLOUD=$OS_CLOUD -v "$PWD":/root/project -w /root/project hashicorp/packer:light $@'
+and make sure the OS_CLOUD variable is set to the correct cloud: in the clouds.yaml example above, you would first
+export OS_CLOUD=overcloud
 
 There are 2 files: centos.json and deploycentostools.sh, allowing you to create
 an image automatically. Run
   # packer build centos.json
-Edit centos.json to reflect the settings of your environment: The following fields need to
-be the ID's of your system:
+Edit centos.json to reflect the settings of your environment: The following fields need to populated
+with the values of your system:
   - "source_image_name": Needs to be the name of the Centos cloud image
   - "flavor": Needs to be the ID or name of the flavor existing in your OpenStack environment that will be used
     to start the VM in which we will install all tools
-  - "networks": ID of the network that will be used for the VM
-  - "use_floating_ip": true or false
-  - "floating_ip_network": ID of the floating ip network in case floating ip are being used
+  - "network_discovery_cidrs": Should contain the CIDR of the network you want to use e.g. "10.6.6.0/24"
+  - "floating_ip_network": ID or name of the floating ip network in case floating ip are being used
   - "security_groups": ID or name of the security group being used
 
 Refer to Packer docs for more details:

diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/centos.json b/VNFs/DPPD-PROX/helper-scripts/rapid/centos.json
index 508ae48..066f0ea 100644 (file)
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/centos.json
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/centos.json
@@ -6,12 +6,11 @@
 "type": "openstack",
 "ssh_username": "centos",
 "image_name": "rapidVM",
-"source_image_name": "centos-7-1907",
-"flavor": "m1.medium",
-"networks": "2d2bb4ec-58ae-47a4-8af9-f58f14533337",
-"use_floating_ip": true,
-"floating_ip_network": "ext-net",
-"security_groups": "1da93e77-29c2-42d7-b611-f2ae094aa8df",
+"source_image_name": "CentOS",
+"flavor": "packer_flavor",
+"network_discovery_cidrs":"10.6.6.0/24",
+"floating_ip_network": "admin_floating_net",
+"security_groups": "prox_security_group",
 "ssh_timeout":"1000s",
 "ssh_pty":"true"
    }