summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-04-29 10:01:21 (GMT)
committerRichard Ipsum <richard.ipsum@codethink.co.uk>2015-05-05 07:31:20 (GMT)
commit33d16d161c0d3e2921499332594ebe3e8b289fa6 (patch)
tree9f6d4b1750fd051fea637062366dbd215d4eded3
parent1d8121c0a4c746c18a075e699ea3f94db99c21dd (diff)
downloaddefinitions-33d16d161c0d3e2921499332594ebe3e8b289fa6.tar.gz
Add python-tools to Openstack system and stratum
This removes duplicated chunks between these strata. Change-Id: Ibb62709034bb6543615a75d0ba440683292cbbf3
-rw-r--r--strata/openstack-services.morph19
-rw-r--r--strata/python-tools.morph2
-rw-r--r--systems/openstack-system-x86_64.morph2
3 files changed, 4 insertions, 19 deletions
diff --git a/strata/openstack-services.morph b/strata/openstack-services.morph
index 2010a9c..5278990 100644
--- a/strata/openstack-services.morph
+++ b/strata/openstack-services.morph
@@ -7,6 +7,7 @@ build-depends:
- morph: strata/xstatic.morph
- morph: strata/openstack-clients.morph
- morph: strata/test-tools.morph
+- morph: strata/python-tools.morph
chunks:
- name: rabbitmq-codegen
morph: strata/openstack-services/rabbitmq-codegen.morph
@@ -99,23 +100,6 @@ chunks:
- pygments
- docutils
- snowballstemmer
-- name: logilab-common
- repo: upstream:python-packages/logilab-common.git
- ref: d1d8f793af6d015d885b9ea67b5741d5a093e2f4
- unpetrify-ref: logilab-common-version-0.62.0
-- name: astroid
- repo: upstream:python-packages/astroid.git
- ref: 7657331baa162122890aa4327f4f441cde9f5188
- unpetrify-ref: astroid-1.2.1
- build-depends:
- - logilab-common
-- name: pylint
- repo: upstream:python-packages/pylint
- ref: 541466c31aae21c7cfbf30470f0f6a2dc0a948c3
- unpetrify-ref: pylint-1.3.1
- build-depends:
- - logilab-common
- - astroid
- name: python-markdown
repo: upstream:python-markdown
ref: f0c5b71acbc02af60a33d67c59558bb513b25e74
@@ -155,7 +139,6 @@ chunks:
- isort
- pep8
- pyflakes
- - pylint
- name: pycco
repo: upstream:python-packages/pycco
ref: 22e157e525760e843dba391ca85fbe9bd35fdc5b
diff --git a/strata/python-tools.morph b/strata/python-tools.morph
index e84a069..a84697a 100644
--- a/strata/python-tools.morph
+++ b/strata/python-tools.morph
@@ -10,7 +10,7 @@ chunks:
ref: 9205ff46a67130e8835f14bb4f802fd59e7dcf2c
unpetrify-ref: 12.0.5
-## Pylint
+## Pylint - required in openstack-services.morph
- name: astroid
repo: upstream:python-packages/astroid
ref: 194dc114a33b80b4bfbbeb73f36712848f696025
diff --git a/systems/openstack-system-x86_64.morph b/systems/openstack-system-x86_64.morph
index 5dffce9..8ab38be 100644
--- a/systems/openstack-system-x86_64.morph
+++ b/systems/openstack-system-x86_64.morph
@@ -63,6 +63,8 @@ strata:
morph: strata/test-tools.morph
- name: swift
morph: strata/swift.morph
+- name: python-tools
+ morph: strata/python-tools.morph
configuration-extensions:
- set-hostname
- add-config-files