Skip to content
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.

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

Revert "Merge pull request #39 from stackhpc/fix_smt_on_fedora_coreos" #50

Merged
merged 1 commit into from
Jun 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions doc/source/user/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,13 @@ They are loosely grouped as: mandatory, infrastructure, COE specific.
as appropriate for the cluster driver. For the currently supported
images, the os_distro names are:

========== ==========================
========== =====================
COE os_distro
========== ==========================
Kubernetes fedora-coreos (minimum 34)
========== =====================
Kubernetes fedora-coreos
Swarm fedora-atomic
Mesos ubuntu
========== ==========================
========== =====================

This is a mandatory parameter and there is no default value. Note that the
os_distro attribute is case sensitive.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,7 @@
# [0] https://github.com/coreos/fcct
# [1] https://github.com/coreos/fedora-coreos-docs/blob/master/modules/ROOT/pages/producing-ign.adoc
variant: fcos
version: 1.4.0
kernel_arguments:
should_exist:
- mitigations=off
should_not_exist:
- mitigations=auto,nosmt
version: 1.0.0
passwd:
users:
- name: core
Expand Down Expand Up @@ -48,7 +43,6 @@ storage:
user:
name: root
contents:
compression: null
inline: |
# This file controls the state of SELinux on the system.
# SELINUX= can take one of these three values:
Expand Down Expand Up @@ -116,7 +110,6 @@ storage:
group:
name: root
contents:
compression: null
inline: |
#!/bin/bash

Expand Down
10 changes: 1 addition & 9 deletions magnum/drivers/k8s_fedora_coreos_v1/templates/user_data.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
{
"ignition": {
"version": "3.3.0"
},
"kernelArguments": {
"shouldExist": [
"mitigations=off"
],
"shouldNotExist": [
"mitigations=auto,nosmt"
]
"version": "3.0.0"
},
"passwd": {
"users": [
Expand Down
4 changes: 0 additions & 4 deletions releasenotes/notes/fedora-coreos-34-cb0d281d819e2523.yaml

This file was deleted.