From b381489e90640b6d94da965269b31096712e32a5 Mon Sep 17 00:00:00 2001 From: Serg Melikyan Date: Wed, 17 Jun 2015 17:56:12 +0300 Subject: [PATCH] Move puppet-murano from stackforge to openstack This change moves puppet-murano from stackforge to openstack in order to be included as part of OpenStack Puppet Modules project. This repository will contain the module necessary to configure and manage Murano with Puppet. This change is related to a proposed governance change: Id846941c9002194e76a6ac31c1979d410aa25fb9 Change-Id: Ia7e917b3032ef5ea56b33cf92e6b7c2d62674f6a --- .../puppet-murano.config | 0 gerrit/projects.yaml | 6 +++--- gerritbot/channels.yaml | 1 + jenkins/jobs/projects.yaml | 18 +++++++++--------- zuul/layout.yaml | 12 ++++++------ 5 files changed, 19 insertions(+), 18 deletions(-) rename gerrit/acls/{stackforge => openstack}/puppet-murano.config (100%) diff --git a/gerrit/acls/stackforge/puppet-murano.config b/gerrit/acls/openstack/puppet-murano.config similarity index 100% rename from gerrit/acls/stackforge/puppet-murano.config rename to gerrit/acls/openstack/puppet-murano.config diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml index 59c948e327..25e2fe56fb 100755 --- a/gerrit/projects.yaml +++ b/gerrit/projects.yaml @@ -1299,6 +1299,9 @@ acl-config: /home/gerrit2/acls/openstack/puppet-modules.config - project: openstack/puppet-monasca description: OpenStack Monasca Puppet Module +- project: openstack/puppet-murano + description: OpenStack Murano Puppet Module + acl-config: /home/gerrit2/acls/openstack/puppet-murano.config - project: openstack/puppet-neutron description: OpenStack Neutron Puppet Module acl-config: /home/gerrit2/acls/openstack/puppet-modules.config @@ -2234,9 +2237,6 @@ - project: stackforge/puppet-ceph description: Ceph Puppet Module acl-config: /home/gerrit2/acls/stackforge/puppet-ceph.config -- project: stackforge/puppet-murano - description: StackForge Murano Puppet Module - acl-config: /home/gerrit2/acls/stackforge/puppet-murano.config - project: stackforge/puppet-n1k-vsm description: Foreman Puppet installer for Cisco N1KV Virtual Supervisor Module - project: stackforge/puppet-nslcd diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml index 2bdac29dbc..d3b4e7aeee 100644 --- a/gerritbot/channels.yaml +++ b/gerritbot/channels.yaml @@ -1353,6 +1353,7 @@ puppet-openstack: - openstack/puppet-manila - openstack/puppet-modulesync-configs - openstack/puppet-monasca + - openstack/puppet-murano - openstack/puppet-neutron - openstack/puppet-nova - openstack/puppet-openstack-cookiecutter diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 4f93b1efce..dfcb88916c 100755 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -2432,6 +2432,15 @@ - puppet-check-jobs - puppet-module-unit +- project: + name: puppet-murano + node: 'bare-trusty' + tarball-site: tarballs.openstack.org + + jobs: + - puppet-check-jobs + - puppet-module-unit + - project: name: puppet-neutron node: 'bare-trusty' @@ -5347,15 +5356,6 @@ - puppet-module-unit - puppet-beaker-jobs -- project: - name: puppet-murano - node: 'bare-trusty' - tarball-site: tarballs.openstack.org - - jobs: - - puppet-check-jobs - - puppet-module-unit - - project: name: puppet-n1k-vsm node: 'bare-trusty' diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 91c8331cea..d253940419 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -3988,6 +3988,12 @@ projects: - name: puppet-check-jobs - name: puppet-module-unit-jobs + - name: openstack/puppet-murano + template: + - name: merge-check + - name: puppet-check-jobs + - name: puppet-module-unit-jobs + - name: openstack/puppet-neutron template: - name: merge-check @@ -7315,12 +7321,6 @@ projects: - name: puppet-module-unit-jobs - name: puppet-beaker-jobs - - name: stackforge/puppet-murano - template: - - name: merge-check - - name: puppet-check-jobs - - name: puppet-module-unit-jobs - - name: stackforge/puppet-n1k-vsm template: - name: merge-check