From d397f795ac3061e39dd5f78441a28c150e583a3d Mon Sep 17 00:00:00 2001 From: Mikhail S Medvedev Date: Wed, 28 Jan 2015 20:02:12 -0600 Subject: [PATCH] Split out project_config module The spec: http://specs.openstack.org/openstack-infra/infra-specs/specs/puppet-modules.html Depends-On: I68c016697470bfb776d1674a5fcaee31d2fb7d73 Change-Id: I6dca372430623ee11461feed5c60ce943211c266 --- modules.env | 1 + modules/project_config/manifests/init.pp | 44 ------------------------ 2 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 modules/project_config/manifests/init.pp diff --git a/modules.env b/modules.env index dfaa0fe27c..343555b085 100644 --- a/modules.env +++ b/modules.env @@ -86,6 +86,7 @@ INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-nodepool"] INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-jenkins"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-kerberos"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-pip"]="origin/master" +INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-project_config"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-tmpreaper"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-github"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-httpd"]="origin/master" diff --git a/modules/project_config/manifests/init.pp b/modules/project_config/manifests/init.pp deleted file mode 100644 index 93c477eadc..0000000000 --- a/modules/project_config/manifests/init.pp +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2014 Hewlett-Packard Development Company, L.P. -# -# 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: project_config -# - -class project_config( - $url = '', - $base = '', -) { - - $config_dir = Vcsrepo['/etc/project-config'] - - if (!defined($config_dir)) { - vcsrepo { '/etc/project-config': - ensure => latest, - provider => git, - revision => 'master', - source => $url, - } - } - - $accessbot_channels_yaml = "/etc/project-config/${base}accessbot/channels.yaml" - $gerritbot_channel_file = "/etc/project-config/${base}gerritbot/channels.yaml" - $gerrit_acls_dir = "/etc/project-config/${base}gerrit/acls" - $gerrit_notify_impact_file = "/etc/project-config/${base}gerrit/notify_impact.yaml" - $jeepyb_project_file = "/etc/project-config/${base}gerrit/projects.yaml" - $jenkins_job_builder_config_dir = "/etc/project-config/${base}jenkins/jobs" - $jenkins_scripts_dir = "/etc/project-config/${base}jenkins/scripts" - $nodepool_scripts_dir = "/etc/project-config/${base}nodepool/scripts" - $nodepool_elements_dir = "/etc/project-config/${base}nodepool/elements" - $zuul_layout_dir = "/etc/project-config/${base}zuul" -}