summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-05-13 12:14:58 +0100
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-05-13 12:14:58 +0100
commit4754042e7974f8fc5382f99d5b670a5009a669b7 (patch)
treea237dccd593708c706ed5df061c2a99a7cacc02d
parentf67659be982c39961be80d555de5b682d37658e3 (diff)
parent49811cb41dcc392f90e7989123c2440b0eeb2cfa (diff)
downloaddefinitions-4754042e7974f8fc5382f99d5b670a5009a669b7.tar.gz
Merge branch 'baserock/pedroalvarez/nova'
Reviewed-by: Sam Thursfield Reviewed-by: Lars Wirzenius
-rw-r--r--cross-bootstrap.morph2
-rw-r--r--devel-system-ppc64-chroot.morph2
-rw-r--r--devel-system-ppc64-generic.morph2
-rw-r--r--devel-system-x86_32-chroot.morph2
-rw-r--r--devel-system-x86_32-generic.morph2
-rw-r--r--devel-system-x86_64-chroot.morph2
-rw-r--r--devel-system-x86_64-generic.morph2
-rw-r--r--nodejs-system-x86_64.morph2
-rw-r--r--openstack-clients.morph (renamed from glanceclient.morph)16
-rw-r--r--tools.morph2
10 files changed, 23 insertions, 11 deletions
diff --git a/cross-bootstrap.morph b/cross-bootstrap.morph
index 3234befc..eb5374fd 100644
--- a/cross-bootstrap.morph
+++ b/cross-bootstrap.morph
@@ -6,7 +6,7 @@ build-depends:
chunks:
- name: six
repo: upstream:six
- ref: e0841d716953710ab9bca9d1715a710df9c61ca0
+ ref: e66d45c46afc42eb89d7d2515b79f0ededa0e0fa
unpetrify-ref: baserock/morph
build-depends: []
- name: groff
diff --git a/devel-system-ppc64-chroot.morph b/devel-system-ppc64-chroot.morph
index 4b4f6b57..dfb2b7c8 100644
--- a/devel-system-ppc64-chroot.morph
+++ b/devel-system-ppc64-chroot.morph
@@ -14,4 +14,4 @@ strata:
- morph: core
- morph: foundation
- morph: tools
-- morph: glanceclient
+- morph: openstack-clients
diff --git a/devel-system-ppc64-generic.morph b/devel-system-ppc64-generic.morph
index 3dcdce7d..1297acba 100644
--- a/devel-system-ppc64-generic.morph
+++ b/devel-system-ppc64-generic.morph
@@ -23,4 +23,4 @@ strata:
- morph: genivi
- morph: genivi-x-ppc64-generic
- morph: tools
-- morph: glanceclient
+- morph: openstack-clients
diff --git a/devel-system-x86_32-chroot.morph b/devel-system-x86_32-chroot.morph
index 3341b440..e5cc2043 100644
--- a/devel-system-x86_32-chroot.morph
+++ b/devel-system-x86_32-chroot.morph
@@ -14,4 +14,4 @@ strata:
- morph: core
- morph: foundation
- morph: tools
-- morph: glanceclient
+- morph: openstack-clients
diff --git a/devel-system-x86_32-generic.morph b/devel-system-x86_32-generic.morph
index 0a375420..42d363b5 100644
--- a/devel-system-x86_32-generic.morph
+++ b/devel-system-x86_32-generic.morph
@@ -23,4 +23,4 @@ strata:
- morph: genivi
- morph: genivi-x-x86_64-generic
- morph: tools
-- morph: glanceclient
+- morph: openstack-clients
diff --git a/devel-system-x86_64-chroot.morph b/devel-system-x86_64-chroot.morph
index 99ac6272..04ab534c 100644
--- a/devel-system-x86_64-chroot.morph
+++ b/devel-system-x86_64-chroot.morph
@@ -14,4 +14,4 @@ strata:
- morph: core
- morph: foundation
- morph: tools
-- morph: glanceclient
+- morph: openstack-clients
diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph
index aac19b96..7048df53 100644
--- a/devel-system-x86_64-generic.morph
+++ b/devel-system-x86_64-generic.morph
@@ -24,4 +24,4 @@ strata:
- morph: genivi-x-x86_64-generic
- morph: tools
- morph: virtualization
-- morph: glanceclient
+- morph: openstack-clients
diff --git a/nodejs-system-x86_64.morph b/nodejs-system-x86_64.morph
index 876f1432..0018fbdf 100644
--- a/nodejs-system-x86_64.morph
+++ b/nodejs-system-x86_64.morph
@@ -24,5 +24,5 @@ strata:
- morph: genivi-x-x86_64-generic
- morph: tools
- morph: virtualization
-- morph: glanceclient
+- morph: openstack-clients
- morph: nodejs
diff --git a/glanceclient.morph b/openstack-clients.morph
index 5d80a73f..fc130872 100644
--- a/glanceclient.morph
+++ b/openstack-clients.morph
@@ -1,6 +1,6 @@
-name: glanceclient
+name: openstack-clients
kind: stratum
-description: A stratum with glanceclient to let the Openstack deployment.
+description: A stratum with OpenStack clients, for OpenStack deployments.
build-depends:
- morph: tools
chunks:
@@ -101,3 +101,15 @@ chunks:
- pyopenssl
- python-keystoneclient
- warlock
+- name: python-novaclient
+ repo: upstream:python-novaclient
+ ref: 9e4530c79e46d392ed8f3e413bca1acffe022fe6
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - python-prettytable
+ - pbr
+ - argparse
+ - pyiso8601
+ - python-requests
+ - simplejson
+ - babel
diff --git a/tools.morph b/tools.morph
index a78e71a8..c9e07afc 100644
--- a/tools.morph
+++ b/tools.morph
@@ -6,7 +6,7 @@ build-depends:
chunks:
- name: six
repo: upstream:six
- ref: e0841d716953710ab9bca9d1715a710df9c61ca0
+ ref: e66d45c46afc42eb89d7d2515b79f0ededa0e0fa
unpetrify-ref: baserock/morph
build-depends: []
- name: python-ttystatus