From 7feaaaa57d9955246069e2b370b618274443d1de Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Fri, 12 Apr 2013 13:15:20 +1200 Subject: [PATCH] Add OS-refresh-config. Change-Id: I71105d72dc7a4d8b5fcf404cc33f54ce124903bf Reviewed-on: https://review.openstack.org/26810 Reviewed-by: Jeremy Stanley Approved: Monty Taylor Reviewed-by: Monty Taylor Tested-by: Jenkins --- .../files/gerritbot_channel_config.yaml | 1 + .../acls/stackforge/os-refresh-config.config | 16 ++++++++++++++++ .../jenkins_job_builder/config/projects.yaml | 9 +++++++++ modules/openstack_project/files/zuul/layout.yaml | 13 +++++++++++++ .../templates/review.projects.yaml.erb | 4 +++- 5 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 modules/openstack_project/files/gerrit/acls/stackforge/os-refresh-config.config diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml index 1d33aed498..908c29cc62 100644 --- a/modules/gerritbot/files/gerritbot_channel_config.yaml +++ b/modules/gerritbot/files/gerritbot_channel_config.yaml @@ -122,6 +122,7 @@ tripleo: projects: - stackforge/diskimage-builder - stackforge/os-config-applier + - stackforge/os-refresh-config - stackforge/tripleo-image-elements branches: - master diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/os-refresh-config.config b/modules/openstack_project/files/gerrit/acls/stackforge/os-refresh-config.config new file mode 100644 index 0000000000..62a8084da9 --- /dev/null +++ b/modules/openstack_project/files/gerrit/acls/stackforge/os-refresh-config.config @@ -0,0 +1,16 @@ +[access "refs/*"] + owner = group Administrators +[receive] + requireChangeId = true + requireContributorAgreement = true +[submit] + mergeContent = true +[access "refs/heads/*"] + label-Code-Review = -2..+2 group os-config-applier-core + label-Approved = +0..+1 group os-config-applier-core + workInProgress = group os-config-applier-core +[access "refs/heads/milestone-proposed"] + label-Code-Review = -2..+2 group os-config-applier-core + label-Approved = +0..+1 group os-config-applier-core +[project] + state = active diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml index 52955bac30..0fff69a216 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -738,6 +738,15 @@ jobs: - python-jobs +- project: + name: os-refresh-config + github-org: stackforge + node: quantal + tarball-site: tarballs.openstack.org + + jobs: + - python-jobs + - project: name: tripleo-image-elements github-org: stackforge diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 1af447ea16..bd6a140fab 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -1381,6 +1381,19 @@ projects: post: - os-config-applier-coverage + - name: stackforge/os-refresh-config + check: + - gate-os-refresh-config-pep8 + - gate-os-refresh-config-python26 + - gate-os-refresh-config-python26-rhel6 + - gate-os-refresh-config-python27 + gate: + - gate-os-refresh-config-pep8 + - gate-os-refresh-config-python26 + - gate-os-refresh-config-python27 + post: + - os-refresh-config-coverage + - name: stackforge/tripleo-image-elements check: - gate-tripleo-image-elements-pep8 diff --git a/modules/openstack_project/templates/review.projects.yaml.erb b/modules/openstack_project/templates/review.projects.yaml.erb index 036355cf82..b091320f05 100644 --- a/modules/openstack_project/templates/review.projects.yaml.erb +++ b/modules/openstack_project/templates/review.projects.yaml.erb @@ -129,8 +129,10 @@ upstream: git://github.com/Mirantis/savanna.git - project: stackforge/python-savannaclient - project: stackforge/os-config-applier - upstream: git://github.com/tripleo/os-config-applier.git description: "Apply configuration from cloud metadata" +- project: stackforge/os-refresh-config + upstream: git://github.com/tripleo/os-refresh-config.git + description: "Restart services and coordinate data migration on Heat config changes." - project: stackforge/puppet-cinder description: OpenStack Cinder Puppet Module acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config