Install pulpcore from RPM packages

Fixes theforeman#9 Fixes theforeman#19 Fixes theforeman#20
cegeka · Dec 6, 2019 · 4a3b784 · 4a3b784
1 parent d5b978c
commit 4a3b784
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 12 deletions.
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -3,14 +3,8 @@
 # @api private
 class pulpcore::install {
 
-  $system_packages = ['gcc', 'postgresql-devel', 'python3-pip', 'python3-devel']
-
-  ensure_packages($system_packages)
-
-  package { 'pulpcore':
-    ensure   => present,
-    provider => 'pip3',
-    require  => Package[$system_packages],
+  package { 'python3-pulpcore':
+    ensure => present,
   }
 
   user { $pulpcore::user:

diff --git a/spec/classes/pulpcore_spec.rb b/spec/classes/pulpcore_spec.rb
@@ -6,6 +6,7 @@
       let(:facts) { os_facts }
 
       it { is_expected.to compile.with_all_deps }
+      it { is_expected.to contain_package('python3-pulpcore') }
     end
   end
 end
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -32,6 +32,8 @@
           host.install_package('epel-release')
           host.install_package('centos-release-scl-rh')
         end
+
+        on host, puppet_resource('yumrepo', 'pulpcore', 'baseurl=https://fedorapeople.org/groups/katello/releases/yum/nightly/pulpcore/el7/x86_64/', 'gpgcheck=0')
       end
     end
   end

diff --git a/templates/pulpcore-api.service.erb b/templates/pulpcore-api.service.erb
@@ -9,7 +9,7 @@ Environment="PULP_SETTINGS=<%= scope['pulpcore::settings_file'] %>"
 User=<%= scope['pulpcore::user'] %>
 PIDFile=/run/pulpcore-api.pid
 RuntimeDirectory=pulpcore-api
-ExecStart=/usr/local/bin/gunicorn pulpcore.app.wsgi:application \
+ExecStart=/usr/bin/gunicorn pulpcore.app.wsgi:application \
           --bind '<%= scope['pulpcore::api_host'] %>:<%= scope['pulpcore::api_port'] %>' \
           --access-logfile -
 ProtectSystem=full

diff --git a/templates/pulpcore-content.service.erb b/templates/pulpcore-content.service.erb
@@ -9,7 +9,7 @@ Environment="PULP_SETTINGS=<%= scope['pulpcore::settings_file'] %>"
 User=<%= scope['pulpcore::user'] %>
 WorkingDirectory=/var/run/pulpcore-content/
 RuntimeDirectory=pulpcore-content
-ExecStart=/usr/local/bin/gunicorn pulpcore.content:server \
+ExecStart=/usr/bin/gunicorn pulpcore.content:server \
           --bind '<%= scope['pulpcore::content_host'] %>:<%= scope['pulpcore::content_port'] %>' \
           --worker-class 'aiohttp.GunicornWebWorker' \
           -w 2 \

diff --git a/templates/pulpcore-resource-manager.service.erb b/templates/pulpcore-resource-manager.service.erb
@@ -9,7 +9,7 @@ Environment="PULP_SETTINGS=<%= scope['pulpcore::settings_file'] %>"
 User=<%= scope['pulpcore::user'] %>
 WorkingDirectory=/var/run/pulpcore-resource-manager/
 RuntimeDirectory=pulpcore-resource-manager
-ExecStart=/usr/local/bin/rq worker \
+ExecStart=/usr/bin/rq worker \
           -w pulpcore.tasking.worker.PulpWorker -n resource-manager@%%h \
           --pid=/var/run/pulpcore-resource-manager/resource-manager.pid \
           -c 'pulpcore.rqconfig' \

diff --git a/templates/pulpcore-worker@.service.erb b/templates/pulpcore-worker@.service.erb
@@ -12,7 +12,7 @@ User=<%= scope['pulpcore::user'] %>
 Group=<%= scope['pulpcore::group'] %>
 WorkingDirectory=/var/run/pulpcore-worker-%i/
 RuntimeDirectory=pulpcore-worker-%i
-ExecStart=/usr/local/bin/rq worker \
+ExecStart=/usr/bin/rq worker \
           -w pulpcore.tasking.worker.PulpWorker \
           -n reserved-resource-worker-%i@%%h \
           --pid=/var/run/pulpcore-worker-%i/reserved-resource-worker-%i.pid \
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,6 +32,8 @@ @@
               host.install_package('epel-release')
               host.install_package('centos-release-scl-rh')
             end
+            on host, puppet_resource('yumrepo', 'pulpcore', 'baseurl=https://fedorapeople.org/groups/katello/releases/yum/nightly/pulpcore/el7/x86_64/', 'gpgcheck=0')
           end
         end
       end
@@ Expand Down @@