From 2bb0248642b032e3cd3fb71e0a5f293a11a9a120 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Wed, 6 Aug 2014 11:39:58 -0400 Subject: [PATCH] Import os-net-config project under TripleO This imports a new project focussed on helping configure host level networking in TripleO. Change-Id: I3d7439cad84e55b792e06d39fc2e43aacf8e8760 --- .../files/gerritbot_channel_config.yaml | 2 ++ .../jenkins_job_builder/config/projects.yaml | 9 +++++++ .../files/nodepool/scripts/prepare_tripleo.sh | 1 + .../files/review.projects.yaml | 3 +++ .../openstack_project/files/zuul/layout.yaml | 24 +++++++++++++++++++ 5 files changed, 39 insertions(+) diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml index 6be597914a..dfaf4bf18d 100644 --- a/modules/gerritbot/files/gerritbot_channel_config.yaml +++ b/modules/gerritbot/files/gerritbot_channel_config.yaml @@ -143,6 +143,7 @@ tripleo: - openstack/os-apply-config - openstack/os-cloud-config - openstack/os-collect-config + - openstack/os-net-config - openstack/os-refresh-config - openstack/python-tuskarclient - openstack/tripleo-heat-templates @@ -773,6 +774,7 @@ openstack-merges: - openstack/diskimage-builder - openstack/os-apply-config - openstack/os-collect-config + - openstack/os-net-config - openstack/os-refresh-config - openstack/tripleo-heat-templates - openstack/tripleo-image-elements diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml index 07188333ea..adae9de9ff 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -1784,6 +1784,15 @@ - python-jobs - pypi-jobs +- project: + name: os-net-config + node: 'bare-precise || bare-trusty' + tarball-site: tarballs.openstack.org + + jobs: + - python-jobs + - pypi-jobs + - project: name: os-refresh-config node: 'bare-precise || bare-trusty' diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_tripleo.sh b/modules/openstack_project/files/nodepool/scripts/prepare_tripleo.sh index 27b1bfe6be..fdfd962235 100755 --- a/modules/openstack_project/files/nodepool/scripts/prepare_tripleo.sh +++ b/modules/openstack_project/files/nodepool/scripts/prepare_tripleo.sh @@ -87,6 +87,7 @@ git clone https://review.openstack.org/p/openstack/nova git clone https://review.openstack.org/p/openstack/os-apply-config git clone https://review.openstack.org/p/openstack/os-cloud-config git clone https://review.openstack.org/p/openstack/os-collect-config +git clone https://review.openstack.org/p/openstack/os-net-config git clone https://review.openstack.org/p/openstack/os-refresh-config git clone https://review.openstack.org/p/openstack/oslo.config git clone https://review.openstack.org/p/openstack/oslo.messaging diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml index 0427ffa121..2d16790ee6 100644 --- a/modules/openstack_project/files/review.projects.yaml +++ b/modules/openstack_project/files/review.projects.yaml @@ -352,6 +352,9 @@ acl-config: /home/gerrit2/acls/openstack/os-apply-config.config - project: openstack/os-collect-config description: Collect and cache metadata, run hooks on changes. +- project: openstack/os-net-config + upstream: git://github.com/dprince/os-net-config.git + description: Host network configuration tool acl-config: /home/gerrit2/acls/openstack/os-apply-config.config - project: openstack/os-refresh-config description: Restart services and coordinate data migration on Heat config changes. diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 0fb98827a3..6df3278f68 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -2016,6 +2016,30 @@ projects: - os-collect-config-coverage - os-collect-config-branch-tarball +#TODO: add docs + - name: openstack/os-net-config + template: + - name: merge-check + - name: check-requirements + - name: publish-to-pypi + check: + - gate-os-net-config-pep8 + - gate-os-net-config-python26 + - gate-os-net-config-python27 + check-tripleo: + - check-tripleo-novabm-undercloud-precise-nonha + - check-tripleo-ironic-undercloud-precise-nonha + - check-tripleo-novabm-overcloud-f20-nonha + gate: + - gate-os-net-config-pep8 + - gate-os-net-config-python26 + - gate-os-net-config-python27 + experimental-tripleo: + - check-tripleo-novabm-overcloud-precise-nonha + post: + - os-net-config-coverage + - os-net-config-branch-tarball + #TODO: add docs - name: openstack/os-refresh-config template: