From 0e2a2d61e2d337c761a6c57e809992d3c9934fc4 Mon Sep 17 00:00:00 2001
From: Shane McDonald <me@shanemcd.com>
Date: Wed, 22 Mar 2017 22:58:11 -0400
Subject: [PATCH] Create a setup subpackage

---
 Makefile                          | 7 ++++++-
 setup.py                          | 3 ++-
 tools/scripts/ansible-tower-setup | 3 +++
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100755 tools/scripts/ansible-tower-setup

diff --git a/Makefile b/Makefile
index 0d933cff61..c45d70324b 100644
--- a/Makefile
+++ b/Makefile
@@ -690,18 +690,23 @@ setup_bundle_tarball: setup-bundle-build setup-bundle-build/$(OFFLINE_TAR_FILE)
 rpm-build:
 	mkdir -p $@
 
-rpm-build/$(SDIST_TAR_FILE): rpm-build dist/$(SDIST_TAR_FILE)
+rpm-build/$(SDIST_TAR_FILE): rpm-build dist/$(SDIST_TAR_FILE) tar-build/$(SETUP_TAR_FILE)
 	cp packaging/rpm/$(NAME).spec rpm-build/
 	cp packaging/rpm/tower.te rpm-build/
 	cp packaging/rpm/tower.fc rpm-build/
 	cp packaging/rpm/$(NAME).sysconfig rpm-build/
 	cp packaging/remove_tower_source.py rpm-build/
 	cp packaging/bytecompile.sh rpm-build/
+	cp tar-build/$(SETUP_TAR_FILE) rpm-build/
 	if [ "$(OFFICIAL)" != "yes" ] ; then \
 	  (cd dist/ && tar zxf $(SDIST_TAR_FILE)) ; \
 	  (cd dist/ && mv $(NAME)-$(VERSION)-$(BUILD) $(NAME)-$(VERSION)) ; \
 	  (cd dist/ && tar czf ../rpm-build/$(SDIST_TAR_FILE) $(NAME)-$(VERSION)) ; \
 	  ln -sf $(SDIST_TAR_FILE) rpm-build/$(NAME)-$(VERSION).tar.gz ; \
+	  (cd tar-build/ && tar zxf $(SETUP_TAR_FILE)) ; \
+	  (cd tar-build/ && mv $(NAME)-setup-$(VERSION)-$(BUILD) $(NAME)-setup-$(VERSION)) ; \
+	  (cd tar-build/ && tar czf ../rpm-build/$(SETUP_TAR_FILE) $(NAME)-setup-$(VERSION)) ; \
+	  ln -sf $(SETUP_TAR_FILE) rpm-build/$(NAME)-setup-$(VERSION).tar.gz ; \
 	else \
 	  cp -a dist/$(SDIST_TAR_FILE) rpm-build/ ; \
 	fi
diff --git a/setup.py b/setup.py
index 334b0e78d5..bd7d5bd19e 100755
--- a/setup.py
+++ b/setup.py
@@ -126,7 +126,8 @@ setup(
         ("%s" % docdir,         ["docs/licenses/*",]),
         ("%s" % bindir, ["tools/scripts/ansible-tower-service",
                          "tools/scripts/failure-event-handler",
-                         "tools/scripts/tower-python"]),
+                         "tools/scripts/tower-python",
+                         "tools/scripts/ansible-tower-setup"]),
         ("%s" % sosconfig, ["tools/sosreport/tower.py"])]),
     options = {
         'egg_info': {
diff --git a/tools/scripts/ansible-tower-setup b/tools/scripts/ansible-tower-setup
new file mode 100755
index 0000000000..074a91f6f7
--- /dev/null
+++ b/tools/scripts/ansible-tower-setup
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec /var/lib/awx/setup/setup.sh "$@"