Skip to content

Package up install-router.sh for inclusion in RPMs #969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sdodson wants to merge 1 commit into from
Closed

Package up install-router.sh for inclusion in RPMs #969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion hack/install-router.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ MASTER_URL="${2}"
OPENSHIFT="${3}"

OS_ROOT=$(dirname "${BASH_SOURCE}")/..
if [[ -f /usr/share/openshift/examples/router.json ]]; then
ROUTER_JSON="/usr/share/openshift/examples/router.json"
else
ROUTER_JSON="${OS_ROOT}/images/router/haproxy/pod.json"
fi

if [[ "${ROUTER_ID}" == "" ]]; then
echo "No router id provided, cannot create router..."
Expand All @@ -32,6 +37,10 @@ fi

OPENSHIFT_INSECURE="${OPENSHIFT_INSECURE:-false}"
OPENSHIFT_CA_DATA="${OPENSHIFT_CA_DATA:-}"
if [[ "${OPENSHIFT_CA_DATA}" == "" ]] && \
[ -f /var/lib/openshift/openshift.local.certificates/master/root.crt ]; then
OPENSHIFT_CA_DATA=$(</var/lib/openshift/openshift.local.certificates/master/root.crt)
fi

if [[ "${MASTER_URL}" == "https"* ]]; then
if [[ "$OPENSHIFT_CA_DATA" == "" ]]; then
Expand All @@ -51,7 +60,7 @@ fi

# update the template file
echo "Creating router file and starting pod..."
cp "${OS_ROOT}/images/router/haproxy/pod.json" /tmp/router.json
cp ${ROUTER_JSON} /tmp/router.json
sed -i "s|ROUTER_ID|${ROUTER_ID}|g" /tmp/router.json
sed -i "s|\${OPENSHIFT_MASTER}|${MASTER_URL}|" /tmp/router.json
sed -i "s|\${OPENSHIFT_INSECURE}|${OPENSHIFT_INSECURE}|" /tmp/router.json
Expand Down
6 changes: 6 additions & 0 deletions openshift.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,18 @@ ln -s %{_bindir}/openshift %{buildroot}%{_bindir}/osc
mkdir -p %{buildroot}/usr/lib/tuned/openshift-node
install -m 0644 -t %{buildroot}/usr/lib/tuned/openshift-node tuned/openshift-node/tuned.conf

mkdir -p %{buildroot}%{_datarootdir}/openshift/examples
install -m 0644 -T images/router/haproxy/pod.json %{buildroot}%{_datarootdir}/openshift/examples/router.json
install -m 0755 -t %{buildroot}%{_bindir}/ hack/install-router.sh

%files
%defattr(-,root,root,-)
%doc README.md LICENSE
%{_bindir}/openshift
%{_bindir}/osc
%{_bindir}/install-router.sh
%{_sharedstatedir}/openshift
%{_datarootdir}/openshift/examples/router.json

%files master
%defattr(-,root,root,-)
Expand Down