Browse Source

openshift_node: install same packages as coreos

Jeremiah Stuever 6 years ago
parent
commit
56b29b7f8b
2 changed files with 80 additions and 16 deletions
  1. 74 11
      roles/openshift_node/defaults/main.yml
  2. 6 5
      roles/openshift_node/tasks/install.yml

+ 74 - 11
roles/openshift_node/defaults/main.yml

@@ -11,16 +11,79 @@ openshift_node_bootstrap_server: "{{ openshift_node_kubeconfig.clusters.0.cluste
 openshift_node_bootstrap_endpoint: "{{ openshift_node_bootstrap_server }}/config/{{ openshift_node_machineconfigpool }}"
 
 openshift_node_install_packages:
-  # Packages from old init/base_packages
-  - iproute
-  - dbus-python
-  - PyYAML
-  - libsemanage-python
-  - yum-utils
-  - python-docker-py
+  # Packages from redhat-coreos.git manifest-base.yaml
+  - kernel
+  - irqbalance
+  - microcode_ctl
+  - systemd
   - systemd-journal-gateway
-  - python-ipaddress
-  # Packages from old roles/container_runtime
-  - cri-o
-  - cri-tools
+  #- rpm-ostree
+  #- nss-altfiles
+  - selinux-policy-targeted
+  - setools-console
+  #- ignition
+  #- ignition-dracut
+  - dracut-network
+  - passwd
+  #- grub2
+  #- grub2-efi
+  #- ostree-grub2
+  #- efibootmgr
+  #- shim
+  - openssh-server
+  - openssh-clients
   - podman
+  - skopeo
+  - runc
+  - containernetworking-plugins
+  #- cri-o
+  - cri-tools
+  #- toolbox
+  - nfs-utils
+  - NetworkManager
+  - dnsmasq
+  - lvm2
+  - iscsi-initiator-utils
+  - sg3_utils
+  - device-mapper-multipath
+  - xfsprogs
+  - e2fsprogs
+  - mdadm
+  - cryptsetup
+  - chrony
+  #- coreos-metadata
+  - logrotate
+  - sssd
+  - shadow-utils
+  - sudo
+  - coreutils
+  - less
+  - tar
+  - xz
+  - gzip
+  - bzip2
+  - rsync
+  - tmux
+  - nmap-ncat
+  - net-tools
+  - bind-utils
+  - strace
+  - bash-completion
+  - vim-minimal
+  - nano
+  #- openshift-hyperkube
+  #- openshift-clients
+  #- pivot
+  #- subscription-manager-rhsm-certificates
+  #
+  # Packages from redhat-coreos.git maipo/manifest.yaml
+  #- redhat-release-coreos
+  - authconfig
+  - policycoreutils-python
+  - iptables-services
+  - bridge-utils
+  - biosdevname
+  - container-storage-setup
+  - cloud-utils-growpart
+  - ceph-common
+  - glusterfs-fuse

+ 6 - 5
roles/openshift_node/tasks/install.yml

@@ -6,11 +6,6 @@
   async: 3600
   poll: 30
 
-- name: Enable the CRI-O service
-  systemd:
-    name: "cri-o"
-    enabled: yes
-
 - name: Install openshift packages
   package:
     name: "{{ l_node_packages | join(',') }}"
@@ -18,5 +13,11 @@
   poll: 30
   vars:
     l_node_packages:
+    - cri-o
     - openshift-clients
     - openshift-hyperkube
+
+- name: Enable the CRI-O service
+  systemd:
+    name: "cri-o"
+    enabled: yes