Add provider specific overlays #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

fnordahl wants to merge 2 commits into master from only-flatten-on-openstack-provider

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

-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ @@
     #       section of the [OpenStack Charms Deployment Guide](https://docs.openstack.org/project-deploy-guide/charm-deployment-guide/latest/)
     #       for more information.
     ---
-    local_overlay_enabled: true
+    local_overlay_enabled: False
     series: bionic
     variables:
       openstack-origin:    &openstack-origin     cloud:bionic-ussuri
@@ Expand Down @@

-Original file line number
+Diff line change
@@ -0,0 +1,10 @@
+    machines:
+      '0':
+        series: bionic
+        constraints: tags=^virtual
+      '1':
+        series: bionic
+        constraints: tags=^virtual
+      '2':
+        series: bionic
+        constraints: tags=^virtual

0 ...dles/overlays/local-charm-overlay.yaml.j2 → ...bundles/overlays/openstack/bundle.yaml.j2

File renamed without changes.

-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ @@
     #       section of the [OpenStack Charms Deployment Guide](https://docs.openstack.org/project-deploy-guide/charm-deployment-guide/latest/)
     #       for more information.
     ---
-    local_overlay_enabled: true
+    local_overlay_enabled: False
     series: eoan
     variables:
       openstack-origin:    &openstack-origin     distro
@@ Expand Down @@

-Original file line number
+Diff line change
@@ -0,0 +1,13 @@
+    machines:
+      '0':
+        series: eoan
+        constraints: tags=^virtual
+      '1':
+        series: eoan
+        constraints: tags=^virtual
+      '2':
+        series: eoan
+        constraints: tags=^virtual
+      '3':
+        series: eoan
+        constraints: tags=^virtual

0 ...dles/overlays/local-charm-overlay.yaml.j2 → ...bundles/overlays/openstack/bundle.yaml.j2

File renamed without changes.

-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ @@
     #       section of the [OpenStack Charms Deployment Guide](https://docs.openstack.org/project-deploy-guide/charm-deployment-guide/latest/)
     #       for more information.
     ---
-    local_overlay_enabled: true
+    local_overlay_enabled: False
     series: eoan
     variables:
       openstack-origin:    &openstack-origin     distro
@@ Expand Down @@

-Original file line number
+Diff line change
@@ -0,0 +1,10 @@
+    machines:
+      '0':
+        series: eoan
+        constraints: tags=^virtual
+      '1':
+        series: eoan
+        constraints: tags=^virtual
+      '2':
+        series: eoan
+        constraints: tags=^virtual

0 ...dles/overlays/local-charm-overlay.yaml.j2 → ...bundles/overlays/openstack/bundle.yaml.j2

File renamed without changes.

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

-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ @@
     #       section of the [OpenStack Charms Deployment Guide](https://docs.openstack.org/project-deploy-guide/charm-deployment-guide/latest/)
     #       for more information.
     ---
-    local_overlay_enabled: true
+    local_overlay_enabled: False
     series: focal
     variables:
       openstack-origin:    &openstack-origin     distro
@@ Expand Down @@

-Original file line number
+Diff line change
@@ -0,0 +1,10 @@
+    machines:
+      '0':
+        series: focal
+        constraints: tags=^virtual
+      '1':
+        series: focal
+        constraints: tags=^virtual
+      '2':
+        series: focal
+        constraints: tags=^virtual

0 ...dles/overlays/local-charm-overlay.yaml.j2 → ...bundles/overlays/openstack/bundle.yaml.j2

File renamed without changes.

development/shared/neutron-ext-net

-Original file line number
+Diff line change
@@ Expand Up / @@ -173,4 +173,4 @@ if __name__ == '__main__': @@
                                 )
             logging.info('Router connected to %s', net_name)
         else:
-            logging.warning('Router already connect to %s', net_name)
+            logging.warning('Router already connected to %s', net_name)

development/shared/neutron-ext-net-ksv3

-Original file line number
+Diff line change
@@ Expand Up / @@ -158,4 +158,4 @@ if __name__ == '__main__': @@
                                 )
             logging.info('Router connected to %s', net_name)
         else:
-            logging.warning('Router already connect to %s', net_name)
+            logging.warning('Router already connected to %s', net_name)

stable/shared/neutron-ext-net

-Original file line number
+Diff line change
@@ Expand Up / @@ -173,4 +173,4 @@ if __name__ == '__main__': @@
                                 )
             logging.info('Router connected to %s', net_name)
         else:
-            logging.warning('Router already connect to %s', net_name)
+            logging.warning('Router already connected to %s', net_name)

Provide feedback