From ff3ad498b0d9b3c25d9b8f2593347803aa2a9a9e Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Thu, 28 Mar 2013 04:57:25 +0100
Subject: [PATCH] Add os-config-applier to stackforge.

Change-Id: I6f7a9192b300ba8f2ad7dfc0302f1cf3c73716c5
Reviewed-on: https://review.openstack.org/25588
Approved: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Tested-by: Jenkins
---
 .../files/gerritbot_channel_config.yaml          |  1 +
 .../acls/stackforge/diskimage-builder.config     |  4 ----
 .../acls/stackforge/os-config-applier.config     | 16 ++++++++++++++++
 .../jenkins_job_builder/config/projects.yaml     |  9 +++++++++
 modules/openstack_project/files/zuul/layout.yaml | 13 +++++++++++++
 .../templates/review.projects.yaml.erb           |  3 +++
 6 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 modules/openstack_project/files/gerrit/acls/stackforge/os-config-applier.config

diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index 3fb3bce8ae..ea7e27ade3 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -119,6 +119,7 @@ tripleo:
       - x-vrif-minus-2
     projects:
       - stackforge/diskimage-builder
+      - stackforge/os-config-applier
     branches:
       - master
 
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/diskimage-builder.config b/modules/openstack_project/files/gerrit/acls/stackforge/diskimage-builder.config
index 9f5e800230..5a3792dd4c 100644
--- a/modules/openstack_project/files/gerrit/acls/stackforge/diskimage-builder.config
+++ b/modules/openstack_project/files/gerrit/acls/stackforge/diskimage-builder.config
@@ -1,5 +1,3 @@
-[access "refs/*"]
-   owner = group Administrators
 [receive]
    requireChangeId = true
    requireContributorAgreement = true
@@ -12,5 +10,3 @@
 [access "refs/heads/milestone-proposed"]
    label-Code-Review = -2..+2 group diskimage-builder-core
    label-Approved = +0..+1 group diskimage-builder-core
-[project]
-   state = active
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/os-config-applier.config b/modules/openstack_project/files/gerrit/acls/stackforge/os-config-applier.config
new file mode 100644
index 0000000000..62a8084da9
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/stackforge/os-config-applier.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 f64e5c90b0..71027232b5 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -688,3 +688,12 @@
 
     jobs:
       - python-jobs
+
+- project:
+    name: os-config-applier
+    github-org: stackforge
+    node: quantal
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - python-jobs
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 6fa123a8c0..f9cf116386 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -1323,6 +1323,19 @@ projects:
     post:
       - diskimage-builder-coverage
 
+  - name: stackforge/os-config-applier
+    check:
+      - gate-os-config-applier-pep8:
+        - gate-os-config-applier-python26
+        - gate-os-config-applier-python26-rhel6
+        - gate-os-config-applier-python27
+    gate:
+      - gate-os-config-applier-pep8
+      - gate-os-config-applier-python26
+      - gate-os-config-applier-python27
+    post:
+      - os-config-applier-coverage
+
   - name: stackforge/climate
     check:
       - gate-climate-pep8:
diff --git a/modules/openstack_project/templates/review.projects.yaml.erb b/modules/openstack_project/templates/review.projects.yaml.erb
index 6db157c653..5b6f91153c 100644
--- a/modules/openstack_project/templates/review.projects.yaml.erb
+++ b/modules/openstack_project/templates/review.projects.yaml.erb
@@ -122,3 +122,6 @@
   description: "Savanna aims to provide users with simple means to provision a Hadoop cluster by specifying several parameters like Hadoop version, cluster topology, nodes hardware details and a few more."
   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"