Merge "Add nova-compute-proxy charm"

This commit is contained in:
Jenkins 2016-11-02 07:37:03 +00:00 committed by Gerrit Code Review
commit 74f03ee697
4 changed files with 21 additions and 0 deletions

View File

@ -1205,6 +1205,14 @@
- nova-compute (Juju Charms Collection)
options:
- delay-release
- project: openstack/charm-nova-compute-proxy
description: Juju Charm - Nova Compute Proxy
acl-config: /home/gerrit2/acls/openstack/charm.config
upstream: https://github.com/openstack-charmers/charm-nova-compute-proxy.git
groups:
- nova-compute-proxy (Juju Charms Collection)
options:
- delay-release
- project: openstack/charm-odl-controller
description: Juju Charm - OpenDayLight Controller
acl-config: /home/gerrit2/acls/openstack/charm.config

View File

@ -430,6 +430,7 @@ openstack-charms:
- openstack/charm-neutron-openvswitch
- openstack/charm-nova-cloud-controller
- openstack/charm-nova-compute
- openstack/charm-nova-compute-proxy
- openstack/charm-odl-controller
- openstack/charm-openstack-dashboard
- openstack/charm-openvswitch-odl

View File

@ -1050,6 +1050,13 @@
jobs:
- python-charm-jobs
- project:
name: charm-nova-compute-proxy
tarball-site: tarballs.openstack.org
jobs:
- python-charm-jobs
- project:
name: charm-odl-controller
tarball-site: tarballs.openstack.org

View File

@ -6048,6 +6048,11 @@ projects:
- name: merge-check
- name: python-charm-jobs
- name: openstack/charm-nova-compute-proxy
template:
- name: merge-check
- name: python-charm-jobs
- name: openstack/charm-odl-controller
template:
- name: merge-check