From ed81cd2e67a69b14a5440f90c0bda60a2748ec86 Mon Sep 17 00:00:00 2001
From: Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org>
Date: Tue, 13 Nov 2018 12:19:35 -0600
Subject: Configure common-packer CentOS 7

Configuring CentOS 7 image
Removing non common-packer .json files to force verify job to use
centos-7.json

Change-Id: I74898324aeeaf9a057958c4645f627327b6ca4bc
Signed-off-by: Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org>
---
 packer/templates/basebuild.json | 53 -----------------------------------------
 packer/vars/centos-7.json       |  6 +++++
 packer/vars/centos.json         |  7 ------
 packer/vars/opensuse.json       |  7 ------
 packer/vars/ubuntu-14.04.json   |  7 ------
 packer/vars/ubuntu-16.04.json   |  7 ------
 6 files changed, 6 insertions(+), 81 deletions(-)
 delete mode 100644 packer/templates/basebuild.json
 create mode 100644 packer/vars/centos-7.json
 delete mode 100644 packer/vars/centos.json
 delete mode 100644 packer/vars/opensuse.json
 delete mode 100644 packer/vars/ubuntu-14.04.json
 delete mode 100644 packer/vars/ubuntu-16.04.json

(limited to 'packer')

diff --git a/packer/templates/basebuild.json b/packer/templates/basebuild.json
deleted file mode 100644
index bcb6f0ae7..000000000
--- a/packer/templates/basebuild.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "variables": {
-    "stack_tenant": null,
-    "stack_user": null,
-    "stack_pass": null,
-    "stack_network": null,
-
-    "base_image": null,
-    "cloud_user": null,
-    "distro": null,
-    "cloud_user_data": null
-  },
-  "builders": [
-    {
-      "type": "openstack",
-      "identity_endpoint": "https://auth.vexxhost.net/v2.0/",
-      "tenant_name": "{{user `stack_tenant`}}",
-      "username": "{{user `stack_user`}}",
-      "password": "{{user `stack_pass`}}",
-      "region": "ca-ymq-1",
-      "ssh_username": "{{user `cloud_user`}}",
-      "image_name": "{{user `distro`}} - basebuild - {{isotime \"20060102-150405.000\"}}",
-      "instance_name": "{{user `distro`}}-basebuild-{{uuid}}",
-      "source_image_name": "{{user `base_image`}}",
-      "flavor": "v1-standard-1",
-      "availability_zone": "ca-ymq-2",
-      "networks": [
-        "{{user `stack_network`}}"
-      ],
-      "user_data_file": "{{user `cloud_user_data`}}"
-    }
-  ],
-  "provisioners": [
-    {
-      "type": "shell",
-      "inline": ["mkdir -p /tmp/packer"]
-    },
-    {
-      "type": "file",
-      "source": "provision/basebuild/",
-      "destination": "/tmp/packer"
-    },
-    {
-      "type": "shell",
-      "scripts": [
-        "provision/baseline.sh",
-        "provision/basebuild.sh",
-        "provision/system_reseal.sh"
-      ],
-      "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
-    }
-  ]
-}
diff --git a/packer/vars/centos-7.json b/packer/vars/centos-7.json
new file mode 100644
index 000000000..ea527b78e
--- /dev/null
+++ b/packer/vars/centos-7.json
@@ -0,0 +1,6 @@
+{
+  "base_image": "LF - CentOS 7.1808 (2018-09-06)",
+  "distro": "CentOS 7",
+  "ssh_user": "centos",
+  "cloud_user_data": "common-packer/provision/rh-user_data.sh"
+}
diff --git a/packer/vars/centos.json b/packer/vars/centos.json
deleted file mode 100644
index 74d573099..000000000
--- a/packer/vars/centos.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "base_image": "CentOS 7 (20160518T212648) - LF upload",
-  "cloud_user": "centos",
-
-  "distro": "CentOS 7",
-  "cloud_user_data": "provision/rh-user_data.sh"
-}
diff --git a/packer/vars/opensuse.json b/packer/vars/opensuse.json
deleted file mode 100644
index d8ba547fc..000000000
--- a/packer/vars/opensuse.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "base_image": "openSuSE LEAP 42.3 (2017-05-17) - LF upload",
-  "cloud_user": "root",
-
-  "distro": "openSuSE LEAP 42.3",
-  "cloud_user_data": "provision/null_data.sh"
-}
diff --git a/packer/vars/ubuntu-14.04.json b/packer/vars/ubuntu-14.04.json
deleted file mode 100644
index 6c58edb78..000000000
--- a/packer/vars/ubuntu-14.04.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "base_image": "Ubuntu 14.04 (20160518T212648) - LF upload",
-  "cloud_user": "ubuntu",
-
-  "distro": "Ubuntu 14.04",
-  "cloud_user_data": "provision/null_data.sh"
-}
diff --git a/packer/vars/ubuntu-16.04.json b/packer/vars/ubuntu-16.04.json
deleted file mode 100644
index ceced39ff..000000000
--- a/packer/vars/ubuntu-16.04.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "base_image": "Ubuntu 16.04 (20160518T212648) - LF upload",
-  "cloud_user": "ubuntu",
-
-  "distro": "Ubuntu 16.04",
-  "cloud_user_data": "provision/null_data.sh"
-}
-- 
cgit 1.2.3-korg