From e22f611968e8136c2079bae73d80e7269af733c4 Mon Sep 17 00:00:00 2001
From: Christian Berendt <christian@berendt.io>
Date: Mon, 23 Feb 2015 13:32:30 +0100
Subject: [PATCH] Move openstack-selinux to Packer template

Change-Id: I3878c029cadbf0a3bdcf374506ba04ca1a105788
---
 ansible/initialize.yaml          | 2 --
 packer/centos-packstack-7.0.json | 1 +
 packer/scripts/packstack.sh      | 4 ++++
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 packer/scripts/packstack.sh

diff --git a/ansible/initialize.yaml b/ansible/initialize.yaml
index 48700ec..8a07ac4 100644
--- a/ansible/initialize.yaml
+++ b/ansible/initialize.yaml
@@ -1,8 +1,6 @@
 ---
 - lineinfile: dest=/etc/yum/pluginconf.d/fastestmirror.conf regexp=^enabled= line=enabled=0
-- yum: name=http://rdo.fedorapeople.org/rdo-release.rpm state=present
 - yum: name=* state=latest
-- yum: name=openstack-selinux state=present
 - copy: src=files/id_rsa dest=/home/vagrant/.ssh/id_packstack mode=0600 owner=vagrant group=vagrant
 - copy: src=files/id_rsa.pub dest=/home/vagrant/.ssh/id_packstack.pub mode=0600 owner=vagrant group=vagrant
 - copy: src=files/selinux dest=/etc/selinux/config mode=0644 owner=root group=root
diff --git a/packer/centos-packstack-7.0.json b/packer/centos-packstack-7.0.json
index c1de53d..20aa4f6 100644
--- a/packer/centos-packstack-7.0.json
+++ b/packer/centos-packstack-7.0.json
@@ -32,6 +32,7 @@
       "scripts/vbox.sh",
       "scripts/sshd.sh",
       "scripts/vagrant.sh",
+      "scripts/packstack.sh",
       "scripts/cleanup.sh"
     ]
   }],
diff --git a/packer/scripts/packstack.sh b/packer/scripts/packstack.sh
new file mode 100644
index 0000000..64ea47f
--- /dev/null
+++ b/packer/scripts/packstack.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+yum install -y http://rdo.fedorapeople.org/rdo-release.rpm
+yum install -y openstack-selinux