Add EC2 filter defintions for future support

EC2 templates have different requirements for the image base definition
that uses filters. As we can have unused variables defined in our vars
files we can just add these extra parameters without causing problems
with OpenStack builds and still support EC2 builds.

Change-Id: I28c773d16ae4102c53416e957509e9f87e7d802b
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>

diff --git a/vars/centos-7.json b/vars/centos-7.json
index 4d8ea05..5af2b08 100644 (file)
--- a/vars/centos-7.json
+++ b/vars/centos-7.json
@@ -1,4 +1,6 @@
 {
+  "source_ami_filter_name": "*CentOS Linux 7*HVM*",
+  "source_ami_filter_owner": "679593333241",
   "base_image": "LF - CentOS 7.1711 (2017-11-05)",
   "distro": "CentOS 7",
   "ssh_user": "centos",

diff --git a/vars/ubuntu-16.04.json b/vars/ubuntu-16.04.json
index eba1e06..fc3218d 100644 (file)
--- a/vars/ubuntu-16.04.json
+++ b/vars/ubuntu-16.04.json
@@ -1,4 +1,6 @@
 {
+  "source_ami_filter_name": "*ubuntu*16.04*",
+  "source_ami_filter_owner": "099720109477",
   "base_image": "LF - Ubuntu 16.04 LTS (2017-12-01)",
   "distro": "Ubuntu 16.04",
   "ssh_user": "ubuntu",