summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wiest <twiest@redhat.com>2015-03-24 13:15:53 -0400
committerThomas Wiest <twiest@redhat.com>2015-03-24 14:55:24 -0400
commit96729907e131f0cef6f37bcca062e9b092e67d29 (patch)
tree4a94cff42ab5aea52d3c7584b80ea0a2efd9a495
parenta7e3b2363935fc090ce7a41853ba27ba0050dc23 (diff)
downloadopenshift-96729907e131f0cef6f37bcca062e9b092e67d29.tar.gz
openshift-96729907e131f0cef6f37bcca062e9b092e67d29.tar.bz2
openshift-96729907e131f0cef6f37bcca062e9b092e67d29.tar.xz
openshift-96729907e131f0cef6f37bcca062e9b092e67d29.zip
Added spec files and tito configs.
-rw-r--r--BUILD.md44
-rw-r--r--README.md3
-rw-r--r--bin/README_BUILD25
-rw-r--r--bin/openshift-ansible-bin.spec14
-rw-r--r--inventory/openshift-ansible-inventory.spec37
5 files changed, 91 insertions, 32 deletions
diff --git a/BUILD.md b/BUILD.md
new file mode 100644
index 000000000..0016c96a5
--- /dev/null
+++ b/BUILD.md
@@ -0,0 +1,44 @@
+# openshift-ansible RPM Build instructions
+We use tito to make building and tracking revisions easy.
+
+For more information on tito, please see the [Tito home page](http://rm-rf.ca/tito "Tito home page").
+
+
+## Build openshift-ansible-bin
+- Change into openshift-ansible/bin
+```
+cd openshift-ansible/bin
+```
+- Build a test package (no tagging needed)
+```
+tito build --test --rpm
+```
+- Tag a new build (bumps version number and adds log entries)
+```
+tito tag
+```
+- Follow the on screen tito instructions to push the tags
+- Build a new package based on the latest tag information
+```
+tito build --rpm
+```
+
+
+## Build openshift-ansible-inventory
+- Change into openshift-ansible/inventory
+```
+cd openshift-ansible/inventory
+```
+- Build a test package (no tagging needed)
+```
+tito build --test --rpm
+```
+- Tag a new build (bumps version number and adds log entries)
+```
+tito tag
+```
+- Follow the on screen tito instructions to push the tags
+- Build a new package based on the latest tag information
+```
+tito build --rpm
+```
diff --git a/README.md b/README.md
index ffdfee6f2..9a08bccd9 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,9 @@ Setup
- [AWS](README_AWS.md)
- [GCE](README_GCE.md)
+- Build
+ - [How to build the openshift-ansible rpms](BUILD.md)
+
- Directory Structure:
- [cloud.rb](cloud.rb) - light wrapper around Ansible
- [cluster.sh](cluster.sh) - easily create OpenShift 3 clusters
diff --git a/bin/README_BUILD b/bin/README_BUILD
deleted file mode 100644
index 50010e562..000000000
--- a/bin/README_BUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# openshift-ansible-bin RPM Build instructions
-We use tito to make building and tracking revisions easy.
-
-For more information on tito, please see the [Tito home page](http://rm-rf.ca/tito "Tito home page").
-
-
-## Build a test package (no tagging needed)
-```
-tito build --test --rpm
-```
-
-
-## Tag a new build (bumps version number and adds log entries)
-```
-tito tag
-```
-
-Follow the on screen tito instructions.
-
-
-
-## Build a new package based on the latest tag information
-```
-tito build --rpm
-```
diff --git a/bin/openshift-ansible-bin.spec b/bin/openshift-ansible-bin.spec
index 2b83a7d0b..7ca0cbe9d 100644
--- a/bin/openshift-ansible-bin.spec
+++ b/bin/openshift-ansible-bin.spec
@@ -1,11 +1,11 @@
-Summary: OpenShift Operations files for mirror
+Summary: OpenShift Ansible Scripts for working with metadata hosts
Name: openshift-ansible-bin
-Version: 0.0.1
+Version: 0.0.0
Release: 1%{?dist}
License: ASL 2.0
URL: https://github.com/openshift/openshift-ansible
Source0: %{name}-%{version}.tar.gz
-Requires: python2
+Requires: python2, openshift-ansible-inventory
BuildRequires: python2-devel
BuildArch: noarch
@@ -18,17 +18,17 @@ Scripts to make it nicer when working with hosts that are defined only by metada
%build
%install
-mkdir -p %{buildroot}/usr/bin
+mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{python_sitelib}/openshift_ansible
mkdir -p %{buildroot}/etc/bash_completion.d
-cp -p ossh oscp opssh %{buildroot}/usr/bin
+cp -p ossh oscp opssh %{buildroot}%{_bindir}
cp -p awsutil.py %{buildroot}%{python_sitelib}/openshift_ansible
cp -p ossh_bash_completion %{buildroot}/etc/bash_completion.d
%files
-/usr/bin/*
-%{python_sitelib}/openshift_ansible/*
+%{_bindir}/*
+%{python_sitelib}/openshift_ansible/
/etc/bash_completion.d/*
%changelog
diff --git a/inventory/openshift-ansible-inventory.spec b/inventory/openshift-ansible-inventory.spec
new file mode 100644
index 000000000..156b81b86
--- /dev/null
+++ b/inventory/openshift-ansible-inventory.spec
@@ -0,0 +1,37 @@
+Summary: OpenShift Ansible Inventories
+Name: openshift-ansible-inventory
+Version: 0.0.0
+Release: 1%{?dist}
+License: ASL 2.0
+URL: https://github.com/openshift/openshift-ansible
+Source0: %{name}-%{version}.tar.gz
+Requires: python2
+BuildRequires: python2-devel
+BuildArch: noarch
+
+%description
+Ansible Inventories used with the openshift-ansible scripts and playbooks.
+
+%prep
+%setup -q
+
+%build
+
+%install
+mkdir -p %{buildroot}/usr/share/ansible/inventory
+mkdir -p %{buildroot}/usr/share/ansible/inventory/aws
+mkdir -p %{buildroot}/usr/share/ansible/inventory/gce
+
+cp -p multi_ec2.py multi_ec2.yaml.example %{buildroot}/usr/share/ansible/inventory
+cp -p aws/ec2.py aws/ec2.ini %{buildroot}/usr/share/ansible/inventory/aws
+cp -p gce/gce.py %{buildroot}/usr/share/ansible/inventory/gce
+
+%files
+%dir /usr/share/ansible/inventory
+/usr/share/ansible/inventory/multi_ec2.py*
+/usr/share/ansible/inventory/multi_ec2.yaml.example
+/usr/share/ansible/inventory/aws/ec2.py*
+%config(noreplace) /usr/share/ansible/inventory/aws/ec2.ini
+/usr/share/ansible/inventory/gce/gce.py*
+
+%changelog