From bfc9c73331d0a359d220f2a28b8cc956392999b7 Mon Sep 17 00:00:00 2001 From: "Elizabeth K. Joseph" Date: Wed, 28 Jan 2015 10:57:27 -0800 Subject: [PATCH] Split out releasestatus module Change-Id: I234465d11bd132c3eb597ef73655fcae549c7dfd --- modules.env | 1 + modules/releasestatus/files/integrated.yaml | 36 ------ modules/releasestatus/files/ssh_config | 2 - modules/releasestatus/manifests/init.pp | 120 -------------------- modules/releasestatus/manifests/site.pp | 46 -------- 5 files changed, 1 insertion(+), 204 deletions(-) delete mode 100644 modules/releasestatus/files/integrated.yaml delete mode 100644 modules/releasestatus/files/ssh_config delete mode 100644 modules/releasestatus/manifests/init.pp delete mode 100644 modules/releasestatus/manifests/site.pp diff --git a/modules.env b/modules.env index 77c00b1e33..34b20bba44 100644 --- a/modules.env +++ b/modules.env @@ -86,6 +86,7 @@ INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-openstacki INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-planet"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-redis"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-ssh"]="origin/master" +INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-releasestatus"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-reviewday"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-drupal"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-mediawiki"]="origin/master" diff --git a/modules/releasestatus/files/integrated.yaml b/modules/releasestatus/files/integrated.yaml deleted file mode 100644 index 0e73bf9aeb..0000000000 --- a/modules/releasestatus/files/integrated.yaml +++ /dev/null @@ -1,36 +0,0 @@ -# Name of the series -series: kilo - -# Final release date -releasedate: 2015-04-30 - -# Short milestone codes, with number of weeks leading to them, not including -# the milestone week. The last one should be the release date. -# -# For example, Juno cycle schedule: -# https://wiki.openstack.org/wiki/Juno_Release_Schedule -# [6, j1] - taking in account pre-summit weeks (not including j1 week) -# [5, j2] - 5 full weeks between j1 and j2 (not including j1 or j2 weeks) -# [5, j3] - 5 full weeks between j2 and j3 (not including j2 or j3 weeks) -# [5, Oct 16] - 5 weeks for rc and release, not including release week -milestones: - - [7, k1] - - [6, k2] - - [5, k3] - - [5, Apr 30] - -# Set of projects to consider in the report -products: - - nova - - glance - - swift - - keystone - - horizon - - neutron - - cinder - - oslo-incubator - - ceilometer - - heat - - trove - - sahara - - ironic diff --git a/modules/releasestatus/files/ssh_config b/modules/releasestatus/files/ssh_config deleted file mode 100644 index 0fe0d75b7d..0000000000 --- a/modules/releasestatus/files/ssh_config +++ /dev/null @@ -1,2 +0,0 @@ -Host review.openstack.org - AddressFamily inet diff --git a/modules/releasestatus/manifests/init.pp b/modules/releasestatus/manifests/init.pp deleted file mode 100644 index 0c68a821b4..0000000000 --- a/modules/releasestatus/manifests/init.pp +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 2013 Thierry Carrez -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# Class: releasestatus -# -class releasestatus ( - $releasestatus_prvkey_contents = '', - $releasestatus_pubkey_contents = '', - $releasestatus_gerrit_ssh_key = '', -) { - if ! defined(Package['python-launchpadlib']) { - package { 'python-launchpadlib': - ensure => present, - } - } - - if ! defined(Package['python-jinja2']) { - package { 'python-jinja2': - ensure => present, - } - } - - if ! defined(Package['python-yaml']) { - package { 'python-yaml': - ensure => present, - } - } - - group { 'releasestatus': - ensure => present, - } - - user { 'releasestatus': - ensure => present, - home => '/var/lib/releasestatus', - shell => '/bin/bash', - gid => 'releasestatus', - managehome => true, - require => Group['releasestatus'], - } - - file { '/var/lib/releasestatus': - ensure => directory, - owner => 'releasestatus', - group => 'releasestatus', - mode => '0755', - require => User['releasestatus'], - } - - file { '/var/lib/releasestatus/.ssh/': - ensure => directory, - owner => 'releasestatus', - group => 'releasestatus', - mode => '0700', - require => File['/var/lib/releasestatus'], - } - - if $releasestatus_prvkey_contents != '' { - file { '/var/lib/releasestatus/.ssh/id_rsa': - owner => 'releasestatus', - group => 'releasestatus', - mode => '0600', - content => $releasestatus_prvkey_contents, - replace => true, - require => File['/var/lib/releasestatus/.ssh/'] - } - } - - if $releasestatus_pubkey_contents != '' { - file { '/var/lib/releasestatus/.ssh/id_rsa.pub': - owner => 'releasestatus', - group => 'releasestatus', - mode => '0600', - content => $releasestatus_pubkey_contents, - replace => true, - require => File['/var/lib/releasestatus/.ssh/'] - } - } - - if $releasestatus_gerrit_ssh_key != '' { - file { '/var/lib/releasestatus/.ssh/known_hosts': - owner => 'releasestatus', - group => 'releasestatus', - mode => '0600', - content => "review.openstack.org ${releasestatus_gerrit_ssh_key}", - replace => true, - require => File['/var/lib/releasestatus/.ssh/'] - } - } - - file { '/var/lib/releasestatus/.ssh/config': - owner => 'releasestatus', - group => 'releasestatus', - mode => '0600', - source => 'puppet:///modules/releasestatus/ssh_config', - replace => true, - require => File['/var/lib/releasestatus/.ssh/'] - } - - vcsrepo { '/var/lib/releasestatus/releasestatus': - ensure => latest, - provider => git, - source => 'https://git.openstack.org/openstack-infra/releasestatus', - revision => 'master', - require => File['/var/lib/releasestatus'], - } -} - -# vim:sw=2:ts=2:expandtab:textwidth=79 diff --git a/modules/releasestatus/manifests/site.pp b/modules/releasestatus/manifests/site.pp deleted file mode 100644 index 1289d40fcd..0000000000 --- a/modules/releasestatus/manifests/site.pp +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 2013 Thierry Carrez -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# == Define: releasestatus -# -define releasestatus::site( - $configfile = '', - $httproot = '', -) { - - file { "/var/lib/releasestatus/${configfile}": - mode => '0444', - source => "puppet:///modules/releasestatus/${configfile}", - require => File['/var/lib/releasestatus'], - } - - file { $httproot: - ensure => directory, - owner => 'releasestatus', - group => 'releasestatus', - mode => '0755', - source => '/var/lib/releasestatus/releasestatus/static', - recurse => remote, - require => Vcsrepo['/var/lib/releasestatus/releasestatus'], - } - - cron { "update releasestatus ${configfile}": - command => "python /var/lib/releasestatus/releasestatus/releasestatus.py /var/lib/releasestatus/${configfile} > ${httproot}/new.html && mv ${httproot}/new.html ${httproot}/index.html", - minute => '*/20', - user => 'releasestatus', - } - -} - -# vim:sw=2:ts=2:expandtab:textwidth=79