Get rid of contrib/rel-eng it didn't make sense

Bash completions now in contrib/completions/bash
Systemd services and environment files now contrib/systemd

cmd/genbashcomp/gen_openshift_bash_comp.go

@@ -32,7 +32,7 @@ func OutDir(path string) (string, error) {
 
 func main() {
 	// use os.Args instead of "flags" because "flags" will mess up the man pages!
-	path := "rel-eng/completions/bash/"
+	path := "contrib/completions/bash/"
 	if len(os.Args) == 2 {
 		path = os.Args[1]
 	} else if len(os.Args) > 2 {

hack/update-generated-completions.sh

@@ -31,7 +31,7 @@ if [[ ! "$genbashcomp" ]]; then
 fi
 
 OUTPUT_REL_DIR=${1:-""}
-OUTPUT_DIR_ROOT="${OS_ROOT}/${OUTPUT_REL_DIR}/contrib/rel-eng/completions"
+OUTPUT_DIR_ROOT="${OS_ROOT}/${OUTPUT_REL_DIR}/contrib/completions"
 
 mkdir -p "${OUTPUT_DIR_ROOT}/bash" || echo $? > /dev/null
 

hack/verify-generated-completions.sh

@@ -17,7 +17,7 @@ if [[ "${platform}" != "linux/amd64" ]]; then
   exit 0
 fi
 
-COMPLETION_ROOT_REL="contrib/rel-eng/completions"
+COMPLETION_ROOT_REL="contrib/completions"
 COMPLETION_ROOT="${OS_ROOT}/${COMPLETION_ROOT_REL}"
 TMP_COMPLETION_ROOT_REL="_output/verify-generated-completions/"
 TMP_COMPLETION_ROOT="${OS_ROOT}/${TMP_COMPLETION_ROOT_REL}/${COMPLETION_ROOT_REL}"

origin.spec

@@ -12,7 +12,7 @@
 # openvswitch_version is the version of openvswitch requires by packages
 %global openvswitch_version 2.3.1
 # %commit and %ldflags are intended to be set by tito custom builders provided
-# in the contrib/rel-eng directory. The values in this spec file will not be kept up to date.
+# in the contrib/systemd directory. The values in this spec file will not be kept up to date.
 %{!?commit:
 %global commit 86b5e46426ba828f49195af21c56f7c6674b48f7
 }
@@ -32,7 +32,7 @@
 
 Name:           %{package_name}
 # Version is not kept up to date and is intended to be set by tito custom
-# builders provided in the contrib/rel-eng directory of this project
+# builders provided in the contrib/systemd directory of this project
 Version:        0.0.1
 Release:        0%{?dist}
 Summary:        Open Source Container Management by Red Hat
@@ -197,11 +197,11 @@ ln -s %{_bindir}/oc %{buildroot}%{_bindir}/kubectl
 install -d -m 0755 %{buildroot}%{_sysconfdir}/origin/{master,node}
 
 # different service for origin vs aos
-install -m 0644 contrib/rel-eng/%{name}-master.service %{buildroot}%{_unitdir}/%{name}-master.service
-install -m 0644 contrib/rel-eng/%{name}-node.service %{buildroot}%{_unitdir}/%{name}-node.service
+install -m 0644 contrib/systemd/%{name}-master.service %{buildroot}%{_unitdir}/%{name}-master.service
+install -m 0644 contrib/systemd/%{name}-node.service %{buildroot}%{_unitdir}/%{name}-node.service
 # same sysconfig files for origin vs aos
-install -m 0644 contrib/rel-eng/origin-master.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/%{name}-master
-install -m 0644 contrib/rel-eng/origin-node.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/%{name}-node
+install -m 0644 contrib/systemd/origin-master.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/%{name}-master
+install -m 0644 contrib/systemd/origin-node.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/%{name}-node
 install -d -m 0755 %{buildroot}%{_prefix}/lib/tuned/%{name}-node-{guest,host}
 install -m 0644 contrib/tuned/origin-node-guest/tuned.conf %{buildroot}%{_prefix}/lib/tuned/%{name}-node-guest/tuned.conf
 install -m 0644 contrib/tuned/origin-node-host/tuned.conf %{buildroot}%{_prefix}/lib/tuned/%{name}-node-host/tuned.conf
@@ -214,7 +214,7 @@ mkdir -p %{buildroot}%{_sharedstatedir}/origin
 # Install sdn scripts
 install -d -m 0755 %{buildroot}%{kube_plugin_path}
 install -d -m 0755 %{buildroot}%{_unitdir}/docker.service.d
-install -p -m 0644 contrib/rel-eng/docker-sdn-ovs.conf %{buildroot}%{_unitdir}/docker.service.d/
+install -p -m 0644 contrib/systemd/docker-sdn-ovs.conf %{buildroot}%{_unitdir}/docker.service.d/
 pushd _thirdpartyhacks/src/%{sdn_import_path}/ovssubnet/controller/kube/bin
    install -p -m 755 openshift-ovs-subnet %{buildroot}%{kube_plugin_path}/openshift-ovs-subnet
    install -p -m 755 openshift-sdn-kube-subnet-setup.sh %{buildroot}%{_bindir}/openshift-sdn-kube-subnet-setup.sh
@@ -224,13 +224,13 @@ pushd _thirdpartyhacks/src/%{sdn_import_path}/ovssubnet/controller/multitenant/b
    install -p -m 755 openshift-sdn-multitenant-setup.sh %{buildroot}%{_bindir}/openshift-sdn-multitenant-setup.sh
 popd
 install -d -m 0755 %{buildroot}%{_unitdir}/%{name}-node.service.d
-install -p -m 0644 contrib/rel-eng/openshift-sdn-ovs.conf %{buildroot}%{_unitdir}/%{name}-node.service.d/openshift-sdn-ovs.conf
+install -p -m 0644 contrib/systemd/openshift-sdn-ovs.conf %{buildroot}%{_unitdir}/%{name}-node.service.d/openshift-sdn-ovs.conf
 
 # Install bash completions
 install -d -m 755 %{buildroot}%{_sysconfdir}/bash_completion.d/
-install -p -m 644 contrib/rel-eng/completions/bash/* %{buildroot}%{_sysconfdir}/bash_completion.d/
+install -p -m 644 contrib/completions/bash/* %{buildroot}%{_sysconfdir}/bash_completion.d/
 # Generate atomic-enterprise bash completions
-%{__sed} -e "s|openshift|atomic-enterprise|g" contrib/rel-eng/completions/bash/openshift > %{buildroot}%{_sysconfdir}/bash_completion.d/atomic-enterprise
+%{__sed} -e "s|openshift|atomic-enterprise|g" contrib/completions/bash/openshift > %{buildroot}%{_sysconfdir}/bash_completion.d/atomic-enterprise
 
 %files
 %defattr(-,root,root,-)