Replacing SystemD and Sys V on Beaker on Docker

Using System V and SystemD init systems is not ideal. They tend to interfere heavily with host's own init systems - processes are going bad, uses 100% CPU, or just crush. That's because thay are run in privileged mode. This commit tries to fix that be switching over to replacements of those init systems. For System V, that's custom supervisord running SSH, and for SystemD that's gdraheim/docker-systemctl-replacement python script. GitHub issue: #104
coi-gov-pl · Sep 14, 2018 · 31b21bf · 31b21bf
1 parent 951c1d3
commit 31b21bf
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 162 deletions.
diff --git a/lib/puppet_x/coi/jboss/hash.rb b/lib/puppet_x/coi/jboss/hash.rb
@@ -14,16 +14,6 @@ def delete(key)
     super
   end
 
-  def ordered_keys
-    @keys ||= []
-  end
-
-  def each_in_order(&_block)
-    ordered_keys.each do |key|
-      yield(key, self[key])
-    end
-  end
-
   def each_sorted(&_block)
     keys.map(&:to_s).sort.each do |key|
       yield(key, self[key])

diff --git a/manifests/internal/service.pp b/manifests/internal/service.pp
@@ -17,9 +17,10 @@
   anchor { 'jboss::service::begin': }
 
   # TODO: change to $::virtual after dropping support for Puppet 2.x
-  $enable = $::jboss_virtual ? {
-    'docker' => undef,
-    default  => true,
+  if $::jboss_virtual == 'docker' and $jboss::internal::compatibility::initsystem == 'SystemV' {
+    $enable = undef
+  } else {
+    $enable = true
   }
 
   if $jboss::internal::compatibility::initsystem == 'SystemD' {

diff --git a/spec/acceptance/nodesets/centos-6-docker.yml b/spec/acceptance/nodesets/centos-6-docker.yml
@@ -3,14 +3,17 @@ HOSTS:
     platform: el-6-x86_64
     hypervisor: docker
     image: centos:6
-    docker_cmd: '["/sbin/init"]'
+    docker_cmd: '["/usr/local/sbin/supervisord-nodaemon.sh"]'
     docker_preserve_image: true
     docker_image_commands:
-      - 'cp /bin/true /sbin/mingetty' # Fix for getty 100% cpu -> https://github.com/moby/moby/issues/4040
       - "sed -i 's/keepcache=0/keepcache=1/g' /etc/yum.conf"
       - 'yum install -y crontabs wget tar centos-release-scl'
       - 'yum install -y python27-python-pip'
       - 'scl enable python27 "pip install puppeter"'
+      - 'curl -L https://bit.ly/2CPhtbe | bash -e'
+    dockeropts:
+      HostConfig:
+        Privileged: false
     mount_folders:
       wget_cache:
         host_path: /tmp/docker-cache/wget

diff --git a/spec/acceptance/nodesets/centos-6-pe288-docker.yml b/spec/acceptance/nodesets/centos-6-pe288-docker.yml
@@ -3,12 +3,15 @@ HOSTS:
     platform: el-6-x86_64
     hypervisor: docker
     image: centos:6
-    docker_cmd: '["/sbin/init"]'
+    docker_cmd: '["/usr/local/sbin/supervisord-nodaemon.sh"]'
     docker_preserve_image: true
     docker_image_commands:
-      - 'cp /bin/true /sbin/mingetty'
       - "sed -i 's/keepcache=0/keepcache=1/g' /etc/yum.conf"
       - 'yum install -y crontabs wget tar'
+      - 'curl -L https://bit.ly/2CPhtbe | bash -e'
+    dockeropts:
+      HostConfig:
+        Privileged: false
     roles:
       - agent
       - master

diff --git a/spec/acceptance/nodesets/centos-7-docker.yml b/spec/acceptance/nodesets/centos-7-docker.yml
@@ -4,9 +4,14 @@ HOSTS:
     hypervisor : docker
     image: centos:7
     docker_preserve_image: true
-    docker_cmd: ["/sbin/init"]
+    docker_cmd: '["/bin/systemctl"]'
     docker_image_commands:
       - 'yum install -y crontabs tar wget openssl sysvinit-tools iproute which initscripts python-pip'
+      - 'curl -L https://bit.ly/2p44vg4 > /bin/systemctl'
+      - mkdir -p /run/systemd/system
+    dockeropts:
+      HostConfig:
+        Privileged: false
     mount_folders:
       wget_cache:
         host_path: /tmp/docker-cache/wget

diff --git a/spec/acceptance/nodesets/debian-8-docker.yml b/spec/acceptance/nodesets/debian-8-docker.yml
@@ -4,10 +4,14 @@ HOSTS:
     hypervisor: docker
     image: debian:8
     docker_preserve_image: true
-    docker_cmd: ["/bin/systemd"]
+    docker_cmd: '["/bin/systemctl"]'
     docker_image_commands:
       - apt-get install -y wget net-tools python-pip python-dev
-      - rm /lib/systemd/system/getty.target
+      - 'curl -L https://bit.ly/2p44vg4 > /bin/systemctl'
+      - mkdir -p /run/systemd/system
+    dockeropts:
+      HostConfig:
+        Privileged: false
     mount_folders:
       wget_cache:
         host_path: /tmp/wget_cache

diff --git a/spec/acceptance/nodesets/debian-9-docker.yml b/spec/acceptance/nodesets/debian-9-docker.yml
@@ -4,10 +4,14 @@ HOSTS:
     hypervisor: docker
     image: debian:9
     docker_preserve_image: true
-    docker_cmd: ["/bin/systemd"]
+    docker_cmd: '["/bin/systemctl"]'
     docker_image_commands:
       - apt-get install -y wget net-tools python-pip python-dev
-      - rm /lib/systemd/system/getty.target
+      - 'curl -L https://bit.ly/2p44vg4 > /bin/systemctl'
+      - mkdir -p /run/systemd/system
+    dockeropts:
+      HostConfig:
+        Privileged: false
     mount_folders:
       wget_cache:
         host_path: /tmp/wget_cache

diff --git a/spec/acceptance/nodesets/ubuntu-1404-docker.yml b/spec/acceptance/nodesets/ubuntu-1404-docker.yml
@@ -4,12 +4,14 @@ HOSTS:
     hypervisor: docker
     image: ubuntu:14.04
     docker_preserve_image: true
-    docker_cmd: '["/sbin/init"]'
+    docker_cmd: '["/usr/local/sbin/supervisord-nodaemon.sh"]'
     docker_image_commands:
-      - 'rm /usr/sbin/policy-rc.d'
-      - 'rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl'
       - 'apt-get install -y net-tools wget python-pip python-dev'
       - 'locale-gen en_US.UTF-8'
+      - 'curl -L https://bit.ly/2CPhtbe | bash -e'
+    dockeropts:
+      HostConfig:
+        Privileged: false
     mount_folders:
       wget_cache:
         host_path: /tmp/docker-cache/wget

diff --git a/spec/acceptance/nodesets/ubuntu-1604-docker.yml b/spec/acceptance/nodesets/ubuntu-1604-docker.yml
@@ -4,10 +4,15 @@ HOSTS:
     hypervisor: docker
     image: ubuntu:16.04
     docker_preserve_image: true
-    docker_cmd: '["/sbin/init"]'
+    docker_cmd: '["/bin/systemctl"]'
     docker_image_commands:
       - 'apt-get install -y net-tools wget locales python-pip python-dev'
       - 'locale-gen en_US.UTF-8'
+      - 'curl -L https://bit.ly/2p44vg4 > /bin/systemctl'
+      - mkdir -p /run/systemd/system
+    dockeropts:
+      HostConfig:
+        Privileged: false
     mount_folders:
       wget_cache:
         host_path: /tmp/docker-cache/wget

diff --git a/spec/classes/internal/service_spec.rb b/spec/classes/internal/service_spec.rb
@@ -99,140 +99,4 @@
       end
     end
   end
-
-  # describe 'on RedHat os family' do
-  #   describe 'release 6.7' do
-  #     let(:facts) do
-  #       Testing::RspecPuppet::SharedFacts.oraclelinux_facts
-  #     end
-  #     it_behaves_like 'as a invalid Java-JBoss configuration'
-  #   end
-  #   describe 'release 7.4' do
-  #     let(:facts) do
-  #       Testing::RspecPuppet::SharedFacts.oraclelinux_facts(
-  #         :operatingsystemrelease    => '7.4',
-  #         :operatingsystemmajrelease => '7'
-  #       )
-  #     end
-  #     it_behaves_like 'as a valid Java-JBoss configuration'
-  #   end
-  #   describe 'on Docker container' do
-  #     let(:facts) do
-  #       Testing::RspecPuppet::SharedFacts.oraclelinux_facts(
-  #         :jboss_virtual => 'docker'
-  #       )
-  #     end
-  #     it_behaves_like 'containg service anchors'
-  #     it_behaves_like 'containg service restart exec'
-  #     it_behaves_like 'containg class structure'
-  #     it do
-  #       is_expected.to contain_service('wildfly').
-  #         with(
-  #           :ensure     => 'running',
-  #           :enable     => nil,
-  #           :hasstatus  => true,
-  #           :hasrestart => true
-  #         )
-  #     end
-  #     describe 'on SystemD system' do
-  #       let(:facts) do
-  #         Testing::RspecPuppet::SharedFacts.oraclelinux_facts(
-  #           :jboss_virtual          => 'docker',
-  #           :operatingsystemrelease => '7.1'
-  #         )
-  #       end
-  #       it_behaves_like 'containg SystemD execs'
-  #     end
-  #   end
-  #   describe 'on non-Docker machine' do
-  #     let(:facts) do
-  #       Testing::RspecPuppet::SharedFacts.oraclelinux_facts(
-  #         :jboss_virtual => 'phisycal'
-  #       )
-  #     end
-  #     it_behaves_like 'containg service anchors'
-  #     it_behaves_like 'containg service restart exec'
-  #     it_behaves_like 'containg class structure'
-  #     it do
-  #       is_expected.to contain_service('wildfly').
-  #         with(
-  #           :ensure     => 'running',
-  #           :enable     => true,
-  #           :hasstatus  => true,
-  #           :hasrestart => true
-  #         )
-  #     end
-  #     describe 'on SystemD system' do
-  #       let(:facts) do
-  #         Testing::RspecPuppet::SharedFacts.oraclelinux_facts(
-  #           :jboss_virtual          => 'phisycal',
-  #           :operatingsystemrelease => '7.1'
-  #         )
-  #       end
-  #       it_behaves_like 'containg SystemD execs'
-  #     end
-  #   end
-  # end
-
-  # describe 'on Debian os family' do
-  #   let(:facts) { Testing::RspecPuppet::SharedFacts.ubuntu_facts }
-  #   it_behaves_like 'as a valid Java-JBoss configuration'
-  #   describe 'on Docker container' do
-  #     let(:facts) do
-  #       Testing::RspecPuppet::SharedFacts.ubuntu_facts(
-  #         :jboss_virtual => 'docker'
-  #       )
-  #     end
-  #     it_behaves_like 'containg service anchors'
-  #     it_behaves_like 'containg service restart exec'
-  #     it_behaves_like 'containg class structure'
-  #     it do
-  #       is_expected.to contain_service('wildfly').
-  #         with(
-  #           :ensure     => 'running',
-  #           :enable     => nil,
-  #           :hasstatus  => true,
-  #           :hasrestart => true
-  #         )
-  #     end
-  #     describe 'on SystemD system' do
-  #       let(:facts) do
-  #         Testing::RspecPuppet::SharedFacts.ubuntu_facts(
-  #           :jboss_virtual          => 'docker',
-  #           :operatingsystem        => 'Debian',
-  #           :operatingsystemrelease => '8'
-  #         )
-  #       end
-  #       it_behaves_like 'containg SystemD execs'
-  #     end
-  #   end
-  #   describe 'on non-Docker machine' do
-  #     let(:facts) do
-  #       Testing::RspecPuppet::SharedFacts.ubuntu_facts(
-  #         :jboss_virtual => 'vmware'
-  #       )
-  #     end
-  #     it_behaves_like 'containg service anchors'
-  #     it_behaves_like 'containg service restart exec'
-  #     it_behaves_like 'containg class structure'
-  #     it do
-  #       is_expected.to contain_service('wildfly').
-  #         with(
-  #           :ensure     => 'running',
-  #           :enable     => true,
-  #           :hasstatus  => true,
-  #           :hasrestart => true
-  #         )
-  #     end
-  #     describe 'on SystemD system' do
-  #       let(:facts) do
-  #         Testing::RspecPuppet::SharedFacts.ubuntu_facts(
-  #           :jboss_virtual          => 'vmware',
-  #           :operatingsystemrelease => '16.04'
-  #         )
-  #       end
-  #       it_behaves_like 'containg SystemD execs'
-  #     end
-  #   end
-  # end
 end