Remove ppa:aurelien-lourot/* in some bundles
Also make sure the Arista test fixture doesn't run out of memory. https://github.com/openstack-charmers/charm-arista-virt-test-fixture/issues/3 Change-Id: I2899d97bc65dd24156d9dcd81ce46e3510593992 Partial-Bug: #1889396
This commit is contained in:
parent
b65fd2389c
commit
ad9ea00bd1
|
@ -95,6 +95,7 @@ applications:
|
||||||
arista-virt-test-fixture:
|
arista-virt-test-fixture:
|
||||||
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
||||||
num_units: 1
|
num_units: 1
|
||||||
|
constraints: mem=4G
|
||||||
|
|
||||||
relations:
|
relations:
|
||||||
- - nova-compute:amqp
|
- - nova-compute:amqp
|
||||||
|
|
|
@ -64,7 +64,7 @@ applications:
|
||||||
charm: ../../../neutron-api-plugin-arista
|
charm: ../../../neutron-api-plugin-arista
|
||||||
num_units: 0
|
num_units: 0
|
||||||
options:
|
options:
|
||||||
# Contains fix https://review.opendev.org/743740
|
# Contains fix for lp:1889396
|
||||||
source: ppa:aurelien-lourot/arista-rocky
|
source: ppa:aurelien-lourot/arista-rocky
|
||||||
|
|
||||||
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
||||||
|
@ -98,6 +98,7 @@ applications:
|
||||||
arista-virt-test-fixture:
|
arista-virt-test-fixture:
|
||||||
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
||||||
num_units: 1
|
num_units: 1
|
||||||
|
constraints: mem=4G
|
||||||
|
|
||||||
relations:
|
relations:
|
||||||
- - nova-compute:amqp
|
- - nova-compute:amqp
|
||||||
|
|
|
@ -64,9 +64,6 @@ applications:
|
||||||
charm: ../../../neutron-api-plugin-arista
|
charm: ../../../neutron-api-plugin-arista
|
||||||
num_units: 0
|
num_units: 0
|
||||||
options:
|
options:
|
||||||
# Contains fix https://review.opendev.org/743740
|
|
||||||
source: ppa:aurelien-lourot/arista-stein
|
|
||||||
|
|
||||||
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
||||||
# setup:
|
# setup:
|
||||||
eapi-host: 192.0.2.42
|
eapi-host: 192.0.2.42
|
||||||
|
@ -98,6 +95,7 @@ applications:
|
||||||
arista-virt-test-fixture:
|
arista-virt-test-fixture:
|
||||||
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
||||||
num_units: 1
|
num_units: 1
|
||||||
|
constraints: mem=4G
|
||||||
|
|
||||||
relations:
|
relations:
|
||||||
- - nova-compute:amqp
|
- - nova-compute:amqp
|
||||||
|
|
|
@ -64,9 +64,6 @@ applications:
|
||||||
charm: ../../../neutron-api-plugin-arista
|
charm: ../../../neutron-api-plugin-arista
|
||||||
num_units: 0
|
num_units: 0
|
||||||
options:
|
options:
|
||||||
# Contains fix https://review.opendev.org/743740
|
|
||||||
source: ppa:aurelien-lourot/arista-train
|
|
||||||
|
|
||||||
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
||||||
# setup:
|
# setup:
|
||||||
eapi-host: 192.0.2.42
|
eapi-host: 192.0.2.42
|
||||||
|
@ -104,6 +101,7 @@ applications:
|
||||||
arista-virt-test-fixture:
|
arista-virt-test-fixture:
|
||||||
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
||||||
num_units: 1
|
num_units: 1
|
||||||
|
constraints: mem=4G
|
||||||
|
|
||||||
relations:
|
relations:
|
||||||
- - nova-compute:amqp
|
- - nova-compute:amqp
|
||||||
|
|
|
@ -64,9 +64,6 @@ applications:
|
||||||
charm: ../../../neutron-api-plugin-arista
|
charm: ../../../neutron-api-plugin-arista
|
||||||
num_units: 0
|
num_units: 0
|
||||||
options:
|
options:
|
||||||
# Contains fix https://review.opendev.org/743740
|
|
||||||
source: ppa:aurelien-lourot/arista-ussuri
|
|
||||||
|
|
||||||
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
||||||
# setup:
|
# setup:
|
||||||
eapi-host: 192.0.2.42
|
eapi-host: 192.0.2.42
|
||||||
|
@ -104,6 +101,7 @@ applications:
|
||||||
arista-virt-test-fixture:
|
arista-virt-test-fixture:
|
||||||
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
||||||
num_units: 1
|
num_units: 1
|
||||||
|
constraints: mem=4G
|
||||||
|
|
||||||
relations:
|
relations:
|
||||||
- - nova-compute:amqp
|
- - nova-compute:amqp
|
||||||
|
|
|
@ -77,8 +77,8 @@ applications:
|
||||||
charm: ../../../neutron-api-plugin-arista
|
charm: ../../../neutron-api-plugin-arista
|
||||||
num_units: 0
|
num_units: 0
|
||||||
options:
|
options:
|
||||||
# Contains fix https://review.opendev.org/743740
|
# Contains fix for lp:1889396
|
||||||
source: ppa:aurelien-lourot/arista-ussuri
|
source: focal-proposed
|
||||||
|
|
||||||
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
||||||
# setup:
|
# setup:
|
||||||
|
@ -117,6 +117,7 @@ applications:
|
||||||
arista-virt-test-fixture:
|
arista-virt-test-fixture:
|
||||||
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
||||||
num_units: 1
|
num_units: 1
|
||||||
|
constraints: mem=4G
|
||||||
|
|
||||||
relations:
|
relations:
|
||||||
- - keystone:shared-db
|
- - keystone:shared-db
|
||||||
|
|
|
@ -77,9 +77,8 @@ applications:
|
||||||
charm: ../../../neutron-api-plugin-arista
|
charm: ../../../neutron-api-plugin-arista
|
||||||
num_units: 0
|
num_units: 0
|
||||||
options:
|
options:
|
||||||
# Contains fix https://review.opendev.org/743740
|
# Contains fix for lp:1889396
|
||||||
# There is no `arista-victoria` PPA.
|
source: focal-proposed
|
||||||
source: ppa:aurelien-lourot/arista-ussuri
|
|
||||||
|
|
||||||
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
||||||
# setup:
|
# setup:
|
||||||
|
@ -118,6 +117,7 @@ applications:
|
||||||
arista-virt-test-fixture:
|
arista-virt-test-fixture:
|
||||||
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
||||||
num_units: 1
|
num_units: 1
|
||||||
|
constraints: mem=4G
|
||||||
|
|
||||||
relations:
|
relations:
|
||||||
- - keystone:shared-db
|
- - keystone:shared-db
|
||||||
|
|
|
@ -77,10 +77,6 @@ applications:
|
||||||
charm: ../../../neutron-api-plugin-arista
|
charm: ../../../neutron-api-plugin-arista
|
||||||
num_units: 0
|
num_units: 0
|
||||||
options:
|
options:
|
||||||
# Contains fix https://review.opendev.org/743740
|
|
||||||
# There is no `arista-victoria` PPA.
|
|
||||||
source: ppa:aurelien-lourot/arista-ussuri
|
|
||||||
|
|
||||||
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
# Fake IP, will be set to arista-virt-test-fixture's IP address on test
|
||||||
# setup:
|
# setup:
|
||||||
eapi-host: 192.0.2.42
|
eapi-host: 192.0.2.42
|
||||||
|
@ -118,6 +114,7 @@ applications:
|
||||||
arista-virt-test-fixture:
|
arista-virt-test-fixture:
|
||||||
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
||||||
num_units: 1
|
num_units: 1
|
||||||
|
constraints: mem=4G
|
||||||
|
|
||||||
relations:
|
relations:
|
||||||
- - keystone:shared-db
|
- - keystone:shared-db
|
||||||
|
|
|
@ -95,6 +95,7 @@ applications:
|
||||||
arista-virt-test-fixture:
|
arista-virt-test-fixture:
|
||||||
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
charm: cs:~openstack-charmers-next/arista-virt-test-fixture
|
||||||
num_units: 1
|
num_units: 1
|
||||||
|
constraints: mem=4G
|
||||||
|
|
||||||
relations:
|
relations:
|
||||||
- - nova-compute:amqp
|
- - nova-compute:amqp
|
||||||
|
|
Loading…
Reference in New Issue