Integrate Manila into virtual-mcp-pike-dvr-ssl
Change-Id: I19669b316a944f4aa74f415c10fa38ccfad66dc4
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
index 26d73a4..c441d23 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
@@ -6,6 +6,7 @@
- system.openssh.client.lab
- system.salt.master.pkg
- system.salt.master.api
+- system.salt.master.formula.pkg.manila
- system.reclass.storage.salt
- system.salt.minion.ca.salt_master
- system.sphinx.server.doc.reclass
@@ -14,6 +15,8 @@
- system.keystone.client.service.nova-placement
- system.keystone.client.service.cinder3
- system.keystone.client.service.designate
+- system.keystone.client.service.manila
+- system.keystone.client.service.manila2
- system.reclass.storage.system.openstack_dns_cluster
- system.reclass.storage.system.openstack_control_cluster
- system.reclass.storage.system.openstack_compute_multi
@@ -113,6 +116,14 @@
cluster_param:
openstack_proxy_node01_address:
value_template: <<node_control_ip>>
+ openstack_share:
+ expression: <<node_hostname>>__startswith__share
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.openstack.share
+ node_param:
+ manila_share_address:
+ value_template: <<node_tenant_ip>>
node:
openstack_control_node01:
classes: