From 532fbd61dd3e996dbfaa6b0e354f46cbe9f63456 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Wed, 31 Aug 2022 14:18:38 -0400 Subject: [PATCH] USHIFT-19: add example config file to rpm Add /etc/microshift/microshift.yaml with the current defaults, all commented out. Fixes #663 Signed-off-by: Doug Hellmann --- packaging/microshift/microshift.yaml | 40 +++++++++++++++++++ packaging/rpm/microshift.spec | 4 ++ ...e-user-containers.yaml => microshift.yaml} | 0 3 files changed, 44 insertions(+) create mode 100644 packaging/microshift/microshift.yaml rename packaging/rpm/{example-user-containers.yaml => microshift.yaml} (100%) diff --git a/packaging/microshift/microshift.yaml b/packaging/microshift/microshift.yaml new file mode 100644 index 0000000000..327f85d71b --- /dev/null +++ b/packaging/microshift/microshift.yaml @@ -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: "" diff --git a/packaging/rpm/microshift.spec b/packaging/rpm/microshift.spec index 52a44de4cc..a4a3d0ab02 100644 --- a/packaging/rpm/microshift.spec +++ b/packaging/rpm/microshift.spec @@ -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 + # 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 @@ -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 diff --git a/packaging/rpm/example-user-containers.yaml b/packaging/rpm/microshift.yaml similarity index 100% rename from packaging/rpm/example-user-containers.yaml rename to packaging/rpm/microshift.yaml