summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Smith <mike.smith@codethink.co.uk>2015-02-23 13:21:09 (GMT)
committerMike Smith <mike.smith@codethink.co.uk>2015-02-23 13:21:09 (GMT)
commit2ba1cd85fc8256ae0e2d8352d8d16911b6895db5 (patch)
treef202a1afdafded11a2cdac05306360d2aa955aa2
parent6ca9e7fa5f6fc0f2cd51b9f8158523da4c04dce9 (diff)
downloaddefinitions-baserock/franred/openstack-v2-pytz.tar.gz
updated to latest pytz. now using .tarbaserock/franred/openstack-v2-pytz
-rw-r--r--clusters/openstack-cluster.morph10
-rw-r--r--strata/openstack-clients-full/pytz.morph1
-rw-r--r--strata/openstack-clients.morph4
-rw-r--r--strata/openstack-clients/pytz.morph4
-rw-r--r--strata/openstack-common.morph7
5 files changed, 13 insertions, 13 deletions
diff --git a/clusters/openstack-cluster.morph b/clusters/openstack-cluster.morph
index df2d994..964eb55 100644
--- a/clusters/openstack-cluster.morph
+++ b/clusters/openstack-cluster.morph
@@ -6,11 +6,11 @@ systems:
release:
type: rawdisk
location: baserock-xx-openstack-system-x86_64.img
- # type: kvm
- # location: kvm+ssh://franred@refinery.ducie.codethink.co.uk/franred-openstack-test/home/franred/openstack.img
- DISK_SIZE: 5G
- RAM_SIZE: 1G
- VCPUS: 1
+ #type: kvm
+ #location: kvm+ssh://mikesmith@10.24.1.198/openstackTest2/home/mikesmith/Workspace/CT183/BaserockOpenstack2.img
+ DISK_SIZE: 6G
+ RAM_SIZE: 3G
+ VCPUS: 2
INSTALL_FILES: openstack/manifest
HOSTNAME: onenode
RABBITMQ_HOST: onenode
diff --git a/strata/openstack-clients-full/pytz.morph b/strata/openstack-clients-full/pytz.morph
index f555794..56e9da1 100644
--- a/strata/openstack-clients-full/pytz.morph
+++ b/strata/openstack-clients-full/pytz.morph
@@ -1,6 +1,7 @@
name: pytz
kind: chunk
build-commands:
+- make dist
- cd src && python setup.py build
install-commands:
- cd src && python setup.py install --prefix "$PREFIX" --root "$DESTDIR"
diff --git a/strata/openstack-clients.morph b/strata/openstack-clients.morph
index 1b34863..2de645d 100644
--- a/strata/openstack-clients.morph
+++ b/strata/openstack-clients.morph
@@ -62,8 +62,8 @@ chunks:
- name: pytz
morph: strata/openstack-clients/pytz.morph
repo: upstream:pytz
- ref: 384207f01fd5b8bf1eb20cb64c17679084731944
- unpetrify-ref: baserock/morph
+ ref: 28a0d0bf56d35eeb1bb22a41755e029c7714f016
+ unpetrify-ref: 28a0d0bf56d35eeb1bb22a41755e029c7714f016
build-depends: []
- name: babel
repo: upstream:babel
diff --git a/strata/openstack-clients/pytz.morph b/strata/openstack-clients/pytz.morph
index f555794..b8f3e7a 100644
--- a/strata/openstack-clients/pytz.morph
+++ b/strata/openstack-clients/pytz.morph
@@ -1,6 +1,6 @@
name: pytz
kind: chunk
build-commands:
-- cd src && python setup.py build
+- python setup.py build
install-commands:
-- cd src && python setup.py install --prefix "$PREFIX" --root "$DESTDIR"
+- python setup.py install --prefix "$PREFIX" --root "$DESTDIR"
diff --git a/strata/openstack-common.morph b/strata/openstack-common.morph
index 494a9ca..4fb63e2 100644
--- a/strata/openstack-common.morph
+++ b/strata/openstack-common.morph
@@ -6,6 +6,7 @@ description: |
build-depends:
- morph: strata/foundation.morph
- morph: strata/python-core.morph
+- morph: strata/tools.morph
chunks:
- name: pycparser
repo: upstream:python-packages/pycparser
@@ -19,12 +20,10 @@ chunks:
build-depends:
- pycparser
- name: pytz
-# TODO: Rebase baserock/morph with the latest stable
-# tag.
morph: strata/openstack-clients/pytz.morph
repo: upstream:pytz
- ref: 384207f01fd5b8bf1eb20cb64c17679084731944
- unpetrify-ref: baserock/morph
+ ref: 28a0d0bf56d35eeb1bb22a41755e029c7714f016
+ unpetrify-ref: 28a0d0bf56d35eeb1bb22a41755e029c7714f016
build-depends: []
- name: python-requests
repo: upstream:python-requests