Merge "Add Magpie charm to OpenStack charms"

gerrit/projects.yaml

@@ -1381,6 +1381,10 @@
 - project: openstack/charm-interface-keystone-notifications
   description: Charm Interface - Keystone Notifications
   acl-config: /home/gerrit2/acls/openstack/charm.config
+- project: openstack/charm-interface-magpie
+  description: Charm Interface - Magpie peer relation
+  acl-config: /home/gerrit2/acls/openstack/charm.config
+  upstream: https://github.com/openstack-charmers/charm-interface-magpie.git
 - project: openstack/charm-interface-manila-plugin
   description: Charm Interface - Manila configuration plugin
   acl-config: /home/gerrit2/acls/openstack/charm.config
@@ -1484,6 +1488,12 @@
 - project: openstack/charm-layer-openstack-principle
   description: Charm Layer - OpenStack principle charm layer
   acl-config: /home/gerrit2/acls/openstack/charm.config
+- project: openstack/charm-magpie
+  description: Juju Charm - Magpie infra testing
+  acl-config: /home/gerrit2/acls/openstack/charm.config
+  upstream: https://github.com/openstack-charmers/magpie-layer.git
+  options:
+    - delay-release
 - project: openstack/charm-manila
   description: Juju Charm - Manila fileshare service
   acl-config: /home/gerrit2/acls/openstack/charm.config

zuul/main.yaml

@@ -327,6 +327,7 @@
           - openstack/charm-interface-keystone-domain-backend
           - openstack/charm-interface-keystone-fid-service-provider
           - openstack/charm-interface-keystone-notifications
+          - openstack/charm-interface-magpie
           - openstack/charm-interface-manila-plugin
           - openstack/charm-interface-mysql-innodb-cluster
           - openstack/charm-interface-mysql-router
@@ -356,6 +357,7 @@
           - openstack/charm-layer-openstack
           - openstack/charm-layer-openstack-api
           - openstack/charm-layer-openstack-principle
+          - openstack/charm-magpie
           - openstack/charm-manila
           - openstack/charm-manila-ganesha
           - openstack/charm-manila-generic