diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-03-10 12:53:30 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-03-13 15:13:57 +0000 |
| commit | 589186276e3ece4073b75eb61a98bd8daae02f42 (patch) | |
| tree | 9170b6b058223853056a7bb5d075e43e7783927c | |
| parent | 127f1f682b972b02df424e0f710bbb85224e781a (diff) | |
| download | infrastructure-589186276e3ece4073b75eb61a98bd8daae02f42.tar.gz | |
gerrit: Update system morph
pygerrit seems to want Paramiko, it says it doesn't need it any more
though -- maybe requirements.txt needs updating.
| -rw-r--r-- | baserock_gerrit/gerrit-system-x86_64.morph | 39 | ||||
| -rw-r--r-- | baserock_gerrit/gerrit-tools.morph | 10 |
2 files changed, 42 insertions, 7 deletions
diff --git a/baserock_gerrit/gerrit-system-x86_64.morph b/baserock_gerrit/gerrit-system-x86_64.morph index 176c8430..0fd2c910 100644 --- a/baserock_gerrit/gerrit-system-x86_64.morph +++ b/baserock_gerrit/gerrit-system-x86_64.morph @@ -8,31 +8,56 @@ description: | are downloaded from the web and installed on first-boot by the configuration management scripts. - So this system is really just a Baserock base system plus Ansible. + So this system is really just a Baserock base system plus + Ansible and some extras. arch: x86_64 strata: - name: build-essential morph: strata/build-essential.morph - name: core morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: lvm - morph: strata/lvm.morph +- name: python-core + morph: strata/python-core.morph - name: bsp-x86_64-generic morph: strata/bsp-x86_64-generic.morph +- name: foundation + morph: strata/foundation.morph - name: cloudinit-support morph: strata/cloudinit-support.morph + +- name: lvm + morph: strata/lvm.morph + +- name: python-common + morph: strata/python-common.morph - name: ansible morph: strata/ansible.morph + +# lighttpd is needed for Lorry Controller. Gerrit uses its own web server. +# +# pcre-utils is a dependency of lighttpd. +# python-cliapp and python-wsgi are needed for lorry-controller. +- name: pcre-utils + morph: strata/pcre-utils.morph +- name: lighttpd-server + morph: strata/lighttpd-server.morph +- name: python-cliapp + morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: lorry morph: strata/lorry.morph - name: lorry-controller morph: strata/lorry-controller.morph -# FIXME: 'tools' is needed purely because mkfs.ext4 resides there. -# Which doesn't make much sense really. + +- name: gerrit-tools + morph: baserock_gerrit/gerrit-tools.morph + +# FIXME: 'tools' is needed mainly because rsync lives there and we need +# rsync for upgrades using system-version-manager. - name: tools morph: strata/tools.morph + configuration-extensions: - set-hostname - add-config-files diff --git a/baserock_gerrit/gerrit-tools.morph b/baserock_gerrit/gerrit-tools.morph new file mode 100644 index 00000000..69aa493b --- /dev/null +++ b/baserock_gerrit/gerrit-tools.morph @@ -0,0 +1,10 @@ +name: gerrit-tools +kind: stratum +description: Tools for use with Gerrit +build-depends: +- morph: strata/python-common.morph +chunks: +- name: pygerrit + repo: github:sonyxperiadev/pygerrit + ref: daad8e23d9bbcd8a2bc565497be50a3cc29dae6b + unpetrify-ref: master |