Merge "Adding OpenStack-Salt formula kubernetes"

This commit is contained in:
Jenkins 2016-08-05 07:59:26 +00:00 committed by Gerrit Code Review
commit bdbdfadb5d
4 changed files with 18 additions and 0 deletions

View File

@ -3934,6 +3934,12 @@
acl-config: /home/gerrit2/acls/openstack/openstack-salt.config
groups:
- openstack-salt
- project: openstack/salt-formula-kubernetes
description: Kubernetes salt formula
acl-config: /home/gerrit2/acls/openstack/openstack-salt.config
upstream: https://github.com/tcpcloud/salt-formula-kubernetes.git
groups:
- openstack-salt
- project: openstack/salt-formula-midonet
description: Midonet salt formula
acl-config: /home/gerrit2/acls/openstack/openstack-salt.config

View File

@ -1658,6 +1658,7 @@ openstack-salt:
- openstack/salt-formula-heat
- openstack/salt-formula-horizon
- openstack/salt-formula-keystone
- openstack/salt-formula-kubernetes
- openstack/salt-formula-midonet
- openstack/salt-formula-neutron
- openstack/salt-formula-nova

View File

@ -10116,6 +10116,12 @@
jobs:
- salt-formula-jobs
- project:
name: salt-formula-kubernetes
jobs:
- salt-formula-jobs
- project:
name: salt-formula-midonet

View File

@ -12958,6 +12958,11 @@ projects:
- name: merge-check
- name: salt-formula-jobs
- name: openstack/salt-formula-kubernetes
template:
- name: merge-check
- name: salt-formula-jobs
- name: openstack/salt-formula-midonet
template:
- name: merge-check