From 332a77e6a97901201ee2a3873ab2a6ad80ccb282 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Ole=C5=9B?= <loles@mirantis.com>
Date: Mon, 19 Oct 2015 23:28:42 +0200
Subject: [PATCH] Adjust modules for librarian

---
 resources/cinder_puppet/meta.yaml | 7 +++----
 resources/glance_puppet/meta.yaml | 4 ++--
 resources/nova_puppet/meta.yaml   | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/resources/cinder_puppet/meta.yaml b/resources/cinder_puppet/meta.yaml
index 66d6e25e..21862b3a 100644
--- a/resources/cinder_puppet/meta.yaml
+++ b/resources/cinder_puppet/meta.yaml
@@ -1,6 +1,5 @@
 id: cinder_puppet
 handler: puppet
-puppet_module: cinder
 version: 1.0.0
 input:
     database_connection:
@@ -174,9 +173,9 @@ input:
       schema: int!
       value: 8776
 
-    git:
-      schema: {repository: str!, branch: str!}
-      value: {repository: 'https://github.com/openstack/puppet-cinder', branch: '5.1.0'}
+    module:
+      schema: {name: str!, type: str, url: str, ref: str}
+      value: {name: 'cinder', type: 'git', url: 'https://github.com/openstack/puppet-cinder', ref: '5.1.0'}
 
     keystone_host:
       schema: str!
diff --git a/resources/glance_puppet/meta.yaml b/resources/glance_puppet/meta.yaml
index 5b9ff74f..1708378c 100644
--- a/resources/glance_puppet/meta.yaml
+++ b/resources/glance_puppet/meta.yaml
@@ -124,9 +124,9 @@ input:
       schema: str
       value:
 
-    git:
+    module:
       schema: {repository: str!, branch: str!}
-      value: {repository: 'https://github.com/openstack/puppet-glance', branch: '5.1.0'}
+      value: {name: 'glance', type: 'git', url: 'https://github.com/openstack/puppet-glance', ref: '5.1.0'}
 
     ip:
       schema: str!
diff --git a/resources/nova_puppet/meta.yaml b/resources/nova_puppet/meta.yaml
index 125f9385..590ea032 100644
--- a/resources/nova_puppet/meta.yaml
+++ b/resources/nova_puppet/meta.yaml
@@ -233,9 +233,9 @@ input:
       schema: int!
       value: 8774
 
-    git:
+    module:
       schema: {repository: str!, branch: str!}
-      value: {repository: 'https://github.com/openstack/puppet-nova', branch: '5.1.0'}
+      value: {name: 'nova', type: 'git', url: 'https://github.com/openstack/puppet-nova', ref: '5.1.0'}
 
     ip:
       schema: str!