adds openshift-os submodule
mods rocky-coreos.yaml to import rhel coreos 9 manifest from openshift-os
This commit is contained in:
kyleishie
parent
70dd5a7d76
commit
6d86c5864a
3
.gitmodules
vendored
Normal file
3
.gitmodules
vendored
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
[submodule "openshift-os-config"]
|
||||||
|
path = os
|
||||||
|
url = git@github.com:openshift/os.git
|
||||||
@ -8,53 +8,78 @@ add-commit-metadata:
|
|||||||
rocky-core.stream: ${stream}
|
rocky-core.stream: ${stream}
|
||||||
|
|
||||||
include:
|
include:
|
||||||
- rocky-coreos-base.yaml
|
- os/manifest-rhel-coreos-9.yaml
|
||||||
|
|
||||||
conditional-include:
|
postprocess:
|
||||||
- if: basearch != "s390x"
|
- |
|
||||||
# And remove some cruft from grub2
|
#!/usr/bin/env bash
|
||||||
include: grub2-removals.yaml
|
set -xeo pipefail
|
||||||
|
|
||||||
ostree-layers:
|
# Tweak /usr/lib/os-release
|
||||||
- overlay/15fcos
|
grep -v "OSTREE_VERSION" /etc/os-release > /usr/lib/os-release.rhel
|
||||||
|
OCP_RELEASE="4.12"
|
||||||
|
(
|
||||||
|
. /etc/os-release
|
||||||
|
cat > /usr/lib/os-release <<EOF
|
||||||
|
NAME="${NAME} CoreOS"
|
||||||
|
ID="rhcos"
|
||||||
|
ID_LIKE="rhel fedora"
|
||||||
|
VERSION="${OSTREE_VERSION}"
|
||||||
|
VERSION_ID="${OCP_RELEASE}"
|
||||||
|
VARIANT="CoreOS"
|
||||||
|
VARIANT_ID=coreos
|
||||||
|
PLATFORM_ID="${PLATFORM_ID}"
|
||||||
|
PRETTY_NAME="${NAME} CoreOS ${OSTREE_VERSION} (Plow)"
|
||||||
|
ANSI_COLOR="${ANSI_COLOR}"
|
||||||
|
CPE_NAME="${CPE_NAME%baseos}coreos"
|
||||||
|
HOME_URL="${HOME_URL}"
|
||||||
|
DOCUMENTATION_URL="https://docs.openshift.com/container-platform/${OCP_RELEASE}/"
|
||||||
|
BUG_REPORT_URL="https://bugzilla.redhat.com/"
|
||||||
|
REDHAT_BUGZILLA_PRODUCT="OpenShift Container Platform"
|
||||||
|
REDHAT_BUGZILLA_PRODUCT_VERSION="${OCP_RELEASE}"
|
||||||
|
REDHAT_SUPPORT_PRODUCT="OpenShift Container Platform"
|
||||||
|
REDHAT_SUPPORT_PRODUCT_VERSION="${OCP_RELEASE}"
|
||||||
|
OPENSHIFT_VERSION="${OCP_RELEASE}"
|
||||||
|
RHEL_VERSION="${VERSION_ID}"
|
||||||
|
OSTREE_VERSION="${OSTREE_VERSION}"
|
||||||
|
EOF
|
||||||
|
)
|
||||||
|
rm -f /etc/os-release
|
||||||
|
ln -s ../usr/lib/os-release /etc/os-release
|
||||||
|
|
||||||
automatic-version-prefix: "${releasever}.<date:%Y%m%d>.dev"
|
# Tweak /etc/system-release, /etc/system-release-cpe & /etc/redhat-release
|
||||||
mutate-os-release: "${releasever}"
|
(
|
||||||
|
. /etc/os-release
|
||||||
|
cat > /usr/lib/system-release-cpe <<EOF
|
||||||
|
${CPE_NAME}
|
||||||
|
EOF
|
||||||
|
cat > /usr/lib/system-release <<EOF
|
||||||
|
${NAME} release ${VERSION_ID}
|
||||||
|
EOF
|
||||||
|
rm -f /etc/system-release-cpe /etc/system-release /etc/redhat-release
|
||||||
|
ln -s /usr/lib/system-release-cpe /etc/system-release-cpe
|
||||||
|
ln -s /usr/lib/system-release /etc/system-release
|
||||||
|
ln -s /usr/lib/system-release /etc/redhat-release
|
||||||
|
)
|
||||||
|
|
||||||
remove-from-packages:
|
# Tweak /usr/lib/issue
|
||||||
# Drop NetworkManager support for ifcfg files, see also corresponding
|
cat > /usr/lib/issue <<EOF
|
||||||
# overlay.d/14NetworkManager-plugins
|
\S \S{VERSION_ID}
|
||||||
- [NetworkManager, /usr/lib64/NetworkManager/.*/libnm-settings-plugin-ifcfg-rh.so]
|
EOF
|
||||||
# Drop some buggy sysusers fragments which do not match static IDs allocation:
|
rm -f /etc/issue /etc/issue.net
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2105177
|
ln -s /usr/lib/issue /etc/issue
|
||||||
# - [dbus-common, /usr/lib/sysusers.d/dbus.conf]
|
ln -s /usr/lib/issue /etc/issue.net
|
||||||
|
|
||||||
remove-files:
|
# Let's have a non-boring motd, just like CL (although theirs is more subdued
|
||||||
# We don't ship man(1) or info(1)
|
# nowadays compared to early versions with ASCII art). One thing we do here
|
||||||
- usr/share/info
|
# is add --- as a "separator"; the idea is that any "dynamic" information should
|
||||||
- usr/share/man
|
# be below that.
|
||||||
# Drop text docs too
|
# See: https://projects.engineering.redhat.com/browse/COREOS-1029
|
||||||
- usr/share/doc
|
. /etc/os-release
|
||||||
|
cat > /etc/motd <<EOF
|
||||||
|
Rocky Linux CoreOS $VERSION
|
||||||
|
|
||||||
# Things we don't expect to ship on the host. We currently
|
WARNING: Direct SSH access to machines is not recommended;
|
||||||
# have recommends: false so these could only come in via
|
|
||||||
# hard requirement, in which case the build will fail.
|
|
||||||
exclude-packages:
|
|
||||||
- python
|
|
||||||
- python2
|
|
||||||
- python2-libs
|
|
||||||
# - python3
|
|
||||||
# - python3-libs
|
|
||||||
- perl
|
|
||||||
- perl-interpreter
|
|
||||||
- nodejs
|
|
||||||
- dnf
|
|
||||||
- grubby
|
|
||||||
- cowsay # Just in case
|
|
||||||
# Let's make sure initscripts doesn't get pulled back in
|
|
||||||
# https://github.com/coreos/fedora-coreos-tracker/issues/220#issuecomment-611566254
|
|
||||||
- initscripts
|
|
||||||
# For (datacenter/cloud oriented) servers, we want to see the details by default.
|
|
||||||
# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/HSMISZ3ETWQ4ETVLWZQJ55ARZT27AAV3/
|
|
||||||
- plymouth
|
|
||||||
|
|
||||||
|
---
|
||||||
|
EOF
|
||||||
1
os
Submodule
1
os
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit de8da2165b6af189df27a493ceeaa806091605eb
|
||||||
Loading…
Reference in New Issue
Block a user