Merge "Add virtual_mcp11_aio_manila deploy job."
diff --git a/jenkins/client/job/deploy/lab/cleanup.yml b/jenkins/client/job/deploy/lab/cleanup.yml
index 871bf70..286d091 100644
--- a/jenkins/client/job/deploy/lab/cleanup.yml
+++ b/jenkins/client/job/deploy/lab/cleanup.yml
@@ -36,7 +36,7 @@
default: "openstack-devcloud-credentials"
OPENSTACK_API_PROJECT:
type: string
- default: "mcp-k8s, mcp-maintenance, mcp-mk, mcp-networking, mcp-opencontrail, mcp-oscore, mcp-oscore-ci, mcp-oss, mcp-platform, mcp-scale, mcp-stacklight, mcp-support"
+ default: "mcp-k8s, mcp-maintenance, mcp-mk, mcp-networking, mcp-opencontrail, mcp-oss, mcp-platform, mcp-scale, mcp-stacklight, mcp-support"
OPENSTACK_API_CLIENT:
type: string
default: ""
diff --git a/salt/master/formula/git/manila.yml b/salt/master/formula/git/manila.yml
new file mode 100644
index 0000000..b9cf3e0
--- /dev/null
+++ b/salt/master/formula/git/manila.yml
@@ -0,0 +1,10 @@
+parameters:
+ salt:
+ master:
+ environment:
+ dev:
+ formula:
+ manila:
+ source: git
+ address: '${_param:salt_master_environment_repository}/salt-formula-manila.git'
+ revision: ${_param:salt_master_environment_revision}
diff --git a/salt/master/formula/pkg/manila.yml b/salt/master/formula/pkg/manila.yml
new file mode 100644
index 0000000..4777a36
--- /dev/null
+++ b/salt/master/formula/pkg/manila.yml
@@ -0,0 +1,9 @@
+parameters:
+ salt:
+ master:
+ environment:
+ prd:
+ formula:
+ manila:
+ source: pkg
+ name: salt-formula-manila