From cdc55a91eaced0cba7faea6e85f77f21471d9791 Mon Sep 17 00:00:00 2001
From: Ben Nemec <openstack@nemebean.com>
Date: Fri, 2 Jun 2017 15:53:29 +0000
Subject: [PATCH] Revert "Add creation of security hardened images"

This is causing us to always build the hardened image, which
is a huge waste of time and disk space.  The hardened image
needs to be added in a separate yaml file so it can be built
as needed.

This reverts commit fc07b696ac2c45c3f914b85b750e471fceb5c390.

Change-Id: I4493c8196dff9b615d75812118082e7d374a7c25
---
 image-yaml/overcloud-images-centos7.yaml | 10 +----
 image-yaml/overcloud-images-rhel7.yaml   |  5 ---
 image-yaml/overcloud-images.yaml         | 49 ------------------------
 3 files changed, 1 insertion(+), 63 deletions(-)

diff --git a/image-yaml/overcloud-images-centos7.yaml b/image-yaml/overcloud-images-centos7.yaml
index 0bc1a29fd..ced72784d 100644
--- a/image-yaml/overcloud-images-centos7.yaml
+++ b/image-yaml/overcloud-images-centos7.yaml
@@ -19,12 +19,4 @@ disk_images:
       - selinux-permissive
     packages:
       - yum-plugin-priorities
-  -
-    imagename: overcloud-security-hardened-full
-    arch: amd64
-    type: qcow2
-    distro: centos7
-    elements:
-      - selinux-permissive
-    packages:
-      - yum-plugin-priorities
+
diff --git a/image-yaml/overcloud-images-rhel7.yaml b/image-yaml/overcloud-images-rhel7.yaml
index c9b1d3691..d5dad3f91 100644
--- a/image-yaml/overcloud-images-rhel7.yaml
+++ b/image-yaml/overcloud-images-rhel7.yaml
@@ -11,8 +11,3 @@ disk_images:
     arch: amd64
     type: qcow2
     distro: rhel7
-  -
-    imagename: overcloud-security-hardened-full
-    arch: amd64
-    type: qcow2
-    distro: rhel7
diff --git a/image-yaml/overcloud-images.yaml b/image-yaml/overcloud-images.yaml
index 1f76362cb..a2e0d689a 100644
--- a/image-yaml/overcloud-images.yaml
+++ b/image-yaml/overcloud-images.yaml
@@ -61,52 +61,3 @@ disk_images:
       - "--min-tmpfs=5"
     environment:
       DIB_PYTHON_VERSION: '2'
-
-  -
-    imagename: overcloud-security-hardened-full
-    arch: amd64
-    type: qcow2
-    elements:
-      - dhcp-all-interfaces
-      - overcloud-agent
-      - overcloud-full
-      - overcloud-controller
-      - overcloud-compute
-      - overcloud-ceph-storage
-      - puppet-modules
-      - hiera
-      - os-net-config
-      - stable-interface-names
-      - bootloader
-      - element-manifest
-      - dynamic-login
-      - iptables
-      - enable-packages-install
-      - pip-and-virtualenv-override
-      - ntp
-      - dracut-regenerate
-      - remove-machine-id
-      - modprobe-blacklist
-      - overcloud-secure
-    packages:
-      - python-psutil
-      - python-debtcollector
-      - plotnetcfg
-      - sos
-      - device-mapper-multipath
-      - python-heat-agent-puppet
-      - python-heat-agent-hiera
-      - python-heat-agent-apply-config
-      - python-heat-agent-ansible
-      - python-heat-agent-docker-cmd
-      - python-heat-agent-json-file
-      - screen
-    options:
-      - "--min-tmpfs 5"
-    environment:
-      DIB_PYTHON_VERSION: '2'
-      DIB_MODPROBE_BLACKLIST: 'usb-storage cramfs freevxfs jffs2 hfs hfsplus squashfs udf vfat bluetooth'
-      DIB_BOOTLOADER_DEFAULT_CMDLINE: 'nofb nomodeset vga=normal console=tty0 console=ttyS0,115200 audit=1 nousb'
-      DIB_IMAGE_SIZE: '20'
-      COMPRESS_IMAGE: '1'
-