Skip to content

Commit 038b904

Browse files
committed
Add provider specific overlays
Only apply flattening overlay when deploying on openstack provider. Add overlay that requests non-virtual machines when deploying on maas.
1 parent 3d9c1e4 commit 038b904

File tree

12 files changed

+47
-4
lines changed

12 files changed

+47
-4
lines changed

development/openstack-base-bionic-ussuri-ovn/bundle.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# section of the [OpenStack Charms Deployment Guide](https://docs.openstack.org/project-deploy-guide/charm-deployment-guide/latest/)
77
# for more information.
88
---
9-
local_overlay_enabled: true
9+
local_overlay_enabled: False
1010
series: bionic
1111
variables:
1212
openstack-origin: &openstack-origin cloud:bionic-ussuri
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
machines:
2+
'0':
3+
series: bionic
4+
constraints: tags=^virtual
5+
'1':
6+
series: bionic
7+
constraints: tags=^virtual
8+
'2':
9+
series: bionic
10+
constraints: tags=^virtual

development/openstack-base-bionic-ussuri-ovn/tests/bundles/overlays/local-charm-overlay.yaml.j2 renamed to development/openstack-base-bionic-ussuri-ovn/tests/bundles/overlays/openstack/bundle.yaml.j2

File renamed without changes.

development/openstack-base-eoan-train-mysql8-migration/bundle.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# section of the [OpenStack Charms Deployment Guide](https://docs.openstack.org/project-deploy-guide/charm-deployment-guide/latest/)
77
# for more information.
88
---
9-
local_overlay_enabled: true
9+
local_overlay_enabled: False
1010
series: eoan
1111
variables:
1212
openstack-origin: &openstack-origin distro
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
machines:
2+
'0':
3+
series: eoan
4+
constraints: tags=^virtual
5+
'1':
6+
series: eoan
7+
constraints: tags=^virtual
8+
'2':
9+
series: eoan
10+
constraints: tags=^virtual
11+
'3':
12+
series: eoan
13+
constraints: tags=^virtual

development/openstack-base-eoan-train-mysql8-migration/tests/bundles/overlays/local-charm-overlay.yaml.j2 renamed to development/openstack-base-eoan-train-mysql8-migration/tests/bundles/overlays/openstack/bundle.yaml.j2

File renamed without changes.

development/openstack-base-eoan-train-mysql8-ovn/bundle.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# section of the [OpenStack Charms Deployment Guide](https://docs.openstack.org/project-deploy-guide/charm-deployment-guide/latest/)
77
# for more information.
88
---
9-
local_overlay_enabled: true
9+
local_overlay_enabled: False
1010
series: eoan
1111
variables:
1212
openstack-origin: &openstack-origin distro
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
machines:
2+
'0':
3+
series: eoan
4+
constraints: tags=^virtual
5+
'1':
6+
series: eoan
7+
constraints: tags=^virtual
8+
'2':
9+
series: eoan
10+
constraints: tags=^virtual

development/openstack-base-eoan-train-mysql8-ovn/tests/bundles/overlays/local-charm-overlay.yaml.j2 renamed to development/openstack-base-eoan-train-mysql8-ovn/tests/bundles/overlays/openstack/bundla.yaml.j2

File renamed without changes.

development/openstack-base-focal-ussuri-ovn/bundle.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# section of the [OpenStack Charms Deployment Guide](https://docs.openstack.org/project-deploy-guide/charm-deployment-guide/latest/)
77
# for more information.
88
---
9-
local_overlay_enabled: true
9+
local_overlay_enabled: False
1010
series: focal
1111
variables:
1212
openstack-origin: &openstack-origin distro

0 commit comments

Comments
 (0)