Merge "Do not test with proposed pockets"

This commit is contained in:
Zuul 2018-05-28 06:20:44 +00:00 committed by Gerrit Code Review
commit eb11f39af9
3 changed files with 5 additions and 10 deletions

View File

@ -22,8 +22,7 @@ applications:
charm: cs:~openstack-charmers-next/bionic/neutron-api
constraints: mem=1G
num_units: 1
options: {dns-domain: mojo.serverstack., enable-ml2-dns: true, flat-network-providers: physnet1,
ipv4-ptr-zone-prefix-size: 24, neutron-security-groups: true, reverse-dns-lookup: true}
options: {flat-network-providers: physnet1, neutron-security-groups: true}
series: bionic
neutron-dynamic-routing:
charm: ../../../neutron-dynamic-routing

View File

@ -23,14 +23,12 @@ applications:
charm: cs:~openstack-charmers-next/xenial/neutron-api
constraints: mem=1G
num_units: 1
options: {dns-domain: mojo.serverstack., enable-ml2-dns: true, flat-network-providers: physnet1,
ipv4-ptr-zone-prefix-size: 24, neutron-security-groups: true, openstack-origin: 'cloud:xenial-pike',
reverse-dns-lookup: true}
options: {flat-network-providers: physnet1, neutron-security-groups: true, openstack-origin: 'cloud:xenial-pike'}
series: xenial
neutron-dynamic-routing:
charm: ../../../neutron-dynamic-routing
num_units: 1
options: {openstack-origin: 'cloud:xenial-pike/proposed'}
options: {openstack-origin: 'cloud:xenial-pike'}
series: xenial
rabbitmq-server:
charm: cs:~openstack-charmers-next/xenial/rabbitmq-server

View File

@ -22,14 +22,12 @@ applications:
charm: cs:~openstack-charmers-next/xenial/neutron-api
constraints: mem=1G
num_units: 1
options: {dns-domain: mojo.serverstack., enable-ml2-dns: true, flat-network-providers: physnet1,
ipv4-ptr-zone-prefix-size: 24, neutron-security-groups: true, openstack-origin: 'cloud:xenial-queens',
reverse-dns-lookup: true}
options: {flat-network-providers: physnet1, neutron-security-groups: true, openstack-origin: 'cloud:xenial-queens'}
series: xenial
neutron-dynamic-routing:
charm: ../../../neutron-dynamic-routing
num_units: 1
options: {openstack-origin: 'cloud:xenial-queens/proposed'}
options: {openstack-origin: 'cloud:xenial-queens'}
series: xenial
rabbitmq-server:
charm: cs:~openstack-charmers-next/xenial/rabbitmq-server