Skip to content

USHIFT-19: add example config file to rpm #914

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

Merged
openshift-merge-robot merged 1 commit into from
Sep 1, 2022
Merged

USHIFT-19: add example config file to rpm #914

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
40 changes: 40 additions & 0 deletions packaging/microshift/microshift.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# Directory for storing audit logs
#AuditLogDir: ""

# Cluster settings
Cluster:

# IP range for use by the cluster
#ClusterCIDR: 10.42.0.0/16

# DNS server IP
#DNS: 10.43.0.10

# mDNS Domain used by the cluster
#Domain: cluster.local

# IP range for services in the cluster
#ServiceCIDR: 10.43.0.0/16

# Node ports allowed for services
#ServiceNodePortRange: 30000-32767

# URL of the API server for the cluster
#URL: https://127.0.0.1:6443

# Location for data created by MicroShift
#DataDir: /var/lib/microshift

# Log verbosity (0-5)
#LogVLevel: 0

# Locations to scan for manifests to load on startup
#Manifests:
#- /usr/lib/microshift/manifests
#- /etc/microshift/manifests

# The IP of the node (defaults to IP of default route)
#NodeIP: ""

# The name of the node (defaults to hostname)
#NodeName: ""
4 changes: 4 additions & 0 deletions packaging/rpm/microshift.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,9 @@ install -p -m644 packaging/network-manager-conf/microshift-nm.conf %{buildroot}
install -d -m755 %{buildroot}/%{_unitdir}
install -p -m644 packaging/systemd/microshift.service %{buildroot}%{_unitdir}/microshift.service

install -d -m755 %{buildroot}/%{_sysconfdir}/microshift
install -p -m644 packaging/microshift/microshift.yaml %{buildroot}%{_sysconfdir}/microshift/microshift.yaml
Copy link
Copy Markdown
Contributor Author

@dhellmann dhellmann Aug 31, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wasn't sure whether to install the file to the real location or to an "example.yaml" location. I decided to go for the real location, but I'm open to changing that.


# Memory tweaks to the OpenvSwitch services
mkdir -p -m755 %{buildroot}%{_sysconfdir}/systemd/system/ovs-vswitchd.service.d
mkdir -p -m755 %{buildroot}%{_sysconfdir}/systemd/system/ovsdb-server.service.d
Expand Down Expand Up @@ -233,6 +236,7 @@ systemctl enable --now --quiet openvswitch || true
%{_bindir}/cleanup-all-microshift-data
%{_unitdir}/microshift.service
%{_sysconfdir}/crio/crio.conf.d/microshift.conf
%{_sysconfdir}/microshift/microshift.yaml

%files selinux

Expand Down
0 packaging/rpm/example-user-containers.yaml → packaging/rpm/microshift.yaml
View file
Open in desktop
File renamed without changes.