Initial work for new packages

StackStorm · May 19, 2016 · da9fbbd · da9fbbd
1 parent 7d76856
commit da9fbbd
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 421 deletions.
diff --git a/manifests/package/debian.pp b/manifests/package/debian.pp
@@ -38,6 +38,22 @@
       $_key        = '8756C4F765C9AC3CB6B85D62379CE192D401AB61'
       $_key_source = 'https://bintray.com/user/downloadSubjectPublicKey?username=bintray'
     }
+    /^https:\/\/packagecloud.io/: {
+      $_repo_suffix = $repo_env ? {
+        'staging' => 'staging-',
+        default   => undef,
+      }
+
+      $_location   = join([
+        $repo_base,
+        'StackStorm',
+        "${_repo_suffix}stable",
+        "${::operatingsystem}",
+      ], '/')
+      $_release    = $_suite
+      $_key        = "418A7F2FB0E1E6E7EABF6FE8C2E73424D59097AB"
+      $_key_source = "${_location}/gpg.key"
+    }
     default: {
       $_location   = "${repo_base}/deb/"
       $_release    = "${::lsbdistcodename}_${_suite}"

diff --git a/manifests/package/install.pp b/manifests/package/install.pp
@@ -73,7 +73,4 @@
     default: { fail("Class[st2::package]: $st2::notice::unsupported_os") }
   }
 
-  package { $name:
-    ensure => $_package_version,
-  }
 }
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -40,25 +40,29 @@
   ]
 
   $component_map = {
-    actionrunner        => 'st2actions',
-    api                 => 'st2api',
-    auth                => 'st2auth',
-    notifier            => 'st2actions',
-    resultstracker      => 'st2actions',
-    rulesengine         => 'st2reactor',
-    sensorcontainer     => 'st2reactor',
-    garbagecollector    => 'st2reactor',
-    web                 => 'st2common',
+    actionrunner        => 'st2',
+    api                 => 'st2',
+    auth                => 'st2',
+    notifier            => 'st2',
+    resultstracker      => 'st2',
+    rulesengine         => 'st2',
+    sensorcontainer     => 'st2',
+    garbagecollector    => 'st2',
+    stream              => 'st2',
+    st2chatops          => 'st2chatops',
+    web                 => 'st2web',
 
-    st2actionrunner     => 'st2actions',
-    st2api              => 'st2api',
-    st2auth             => 'st2auth',
-    st2notifier         => 'st2actions',
-    st2resultstracker   => 'st2actions',
-    st2rulesengine      => 'st2reactor',
-    st2sensorcontainer  => 'st2reactor',
-    st2garbagecollector => 'st2reactor',
-    st2web              => 'st2common',
+    st2actionrunner     => 'st2',
+    st2api              => 'st2',
+    st2auth             => 'st2',
+    st2notifier         => 'st2',
+    st2resultstracker   => 'st2',
+    st2rulesengine      => 'st2',
+    st2sensorcontainer  => 'st2',
+    st2garbagecollector => 'st2',
+    st2stream           => 'st2',
+    st2chatops          => 'st2chatops',
+    st2web              => 'st2web',
   }
   $subsystem_map = {
     actionrunner        => 'st2actionrunner',
@@ -69,6 +73,8 @@
     rulesengine         => 'st2rulesengine',
     sensorcontainer     => 'st2sensorcontainer',
     garbagecollector    => 'st2garbagecollector',
+    stream              => 'st2stream',
+    chatops             => 'st2chatops',
     web                 => 'st2web',
 
     st2actionrunner     => 'st2actionrunner',
@@ -79,10 +85,12 @@
     st2rulesengine      => 'st2rulesengine',
     st2sensorcontainer  => 'st2sensorcontainer',
     st2garbagecollector => 'st2garbagecollector',
+    st2stream           => 'st2stream',
+    st2chatops          => 'st2chatops',
     st2web              => 'st2web',
   }
 
-  $repo_base = 'https://downloads.stackstorm.net'
+  $repo_base = 'https://packagecloud.io'
   $repo_env = 'production'
 
   # Auth settings
@@ -94,12 +102,10 @@
   $conf_dir = '/etc/st2'
 
   $st2_server_packages = [
-    'st2common',
-    'st2reactor',
-    'st2actions',
-    'st2api',
-    'st2auth',
-    'st2debug',
+    'st2',
+    'st2web',
+    'st2chatops',
+    'mistral'
   ]
   case $::osfamily {
     'Debian': {
@@ -132,11 +138,7 @@
     'libxslt1-dev',
     'python-tox',
   ]
-  $debian_client_dependencies = [
-    'python-prettytable',
-    'python-jsonpath-rw',
-    'python-dateutil',
-  ]
+  $debian_client_dependencies = []
   $debian_mongodb_dependencies = [
     'mongodb-dev',
   ]
@@ -151,9 +153,7 @@
     'libxml2-devel',
     'libxslt-devel',
   ]
-  $redhat_client_dependencies = [
-    'python-prettytable',
-  ]
+  $redhat_client_dependencies = []
   ### END RedHat Specific Information ###
 
   # OS Init Type Detection

diff --git a/manifests/profile/fullinstall.pp b/manifests/profile/fullinstall.pp
@@ -18,14 +18,6 @@
     before => Anchor['st2::bootstrap']
   }
 
-  class { '::st2::profile::repos':
-    before => Anchor['st2::bootstrap']
-  }
-
-  class { '::st2::profile::python':
-    before => Anchor['st2::pre_reqs'],
-  }
-
   class { '::st2::profile::rabbitmq':
     before => Anchor['st2::pre_reqs'],
   }
@@ -34,28 +26,17 @@
     before => Anchor['st2::pre_reqs'],
   }
 
-  class { '::st2::profile::mistral':
-    manage_postgresql => true,
-    before => Anchor['st2::pre_reqs'],
-  }
-
   anchor { 'st2::bootstrap': }
   anchor { 'st2::pre_reqs': }
 
   Anchor['st2::bootstrap']
-    -> Class['::st2::profile::python']
     -> Class['::st2::profile::rabbitmq']
     -> Class['::st2::profile::mongodb']
-    -> Class['::st2::profile::mistral']
 
   Anchor['st2::pre_reqs']
-  -> class { '::st2::profile::client': }
   -> class { '::st2::profile::server': }
-  -> class { '::st2::profile::web': }
 
   include ::st2::packs
   include ::st2::kvs
 
-  class { '::st2::auth::pam': }
-  class { '::st2::stanley': }
 }