Merge "Override cache and identity params in Panko reclass"
diff --git a/gnocchi/server/cluster.yml b/gnocchi/server/cluster.yml
index bbae551..062b60e 100644
--- a/gnocchi/server/cluster.yml
+++ b/gnocchi/server/cluster.yml
@@ -5,6 +5,21 @@
- system.haproxy.proxy.listen.openstack.gnocchi
- system.keepalived.cluster.instance.openstack_telemetry_vip
parameters:
+ _param:
+ gnocchi_memcached_node01_address: ${_param:cluster_node01_address}
+ gnocchi_memcached_node02_address: ${_param:cluster_node02_address}
+ gnocchi_memcached_node03_address: ${_param:cluster_node03_address}
gnocchi:
server:
enable_proxy_headers_parsing: true
+ identity:
+ host: ${_param:openstack_control_address}
+ cache:
+ engine: memcached
+ members:
+ - host: ${_param:gnocchi_memcached_node01_address}
+ port: 11211
+ - host: ${_param:gnocchi_memcached_node02_address}
+ port: 11211
+ - host: ${_param:gnocchi_memcached_node03_address}
+ port: 11211
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index 57e15b8..6a80fab 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -273,6 +273,9 @@
RECLASS_MODEL_BRANCH:
type: string
default: master
+ DISTRIB_REVISION:
+ type: string
+ default: 'nightly'
SYSTEM_GIT_URL:
type: string
default: ""
diff --git a/manila/control/cluster.yml b/manila/control/cluster.yml
index 0bf4c69..ff6ca10 100644
--- a/manila/control/cluster.yml
+++ b/manila/control/cluster.yml
@@ -9,5 +9,7 @@
version: ${_param:openstack_version}
api:
enabled: true
+ version: ${_param:openstack_version}
scheduler:
enabled: true
+ version: ${_param:openstack_version}
diff --git a/manila/control/single.yml b/manila/control/single.yml
index 5029c67..3e14e96 100644
--- a/manila/control/single.yml
+++ b/manila/control/single.yml
@@ -8,5 +8,7 @@
version: ${_param:openstack_version}
api:
enabled: true
+ version: ${_param:openstack_version}
scheduler:
enabled: true
+ version: ${_param:openstack_version}
diff --git a/manila/share/backend/lvm.yml b/manila/share/backend/lvm.yml
index 488de4d..4dd589b 100644
--- a/manila/share/backend/lvm.yml
+++ b/manila/share/backend/lvm.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ manila_share_address: ${_param:single_address}
linux:
storage:
lvm:
@@ -14,7 +16,7 @@
type: lvm
enabled: true
lvm_share_export_ips:
- - "${_param:single_address}"
+ - "${_param:manila_share_address}"
dhss: false
share_driver: manila.share.drivers.lvm.LVMShareDriver
lvm_share_volume_group: manila-volume
diff --git a/manila/share/init.yml b/manila/share/init.yml
new file mode 100644
index 0000000..af85c0d
--- /dev/null
+++ b/manila/share/init.yml
@@ -0,0 +1,10 @@
+classes:
+ - system.manila.common.cluster
+parameters:
+ manila:
+ common:
+ dhss: false
+ version: ${_param:openstack_version}
+ share:
+ enabled: true
+ version: ${_param:openstack_version}
diff --git a/reclass/storage/system/openstack_share_multi.yml b/reclass/storage/system/openstack_share_multi.yml
index a347aec..a70af28 100644
--- a/reclass/storage/system/openstack_share_multi.yml
+++ b/reclass/storage/system/openstack_share_multi.yml
@@ -19,7 +19,7 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: ${_param:linux_system_codename}
single_address: ${_param:openstack_share_node01_address}
- share_address: ${_param:openstack_share_node01_share_address}
+ manila_share_address: ${_param:openstack_share_node01_share_address}
openstack_share_node02:
name: ${_param:openstack_share_node02_hostname}
domain: ${_param:cluster_domain}
@@ -29,7 +29,7 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: ${_param:linux_system_codename}
single_address: ${_param:openstack_share_node02_address}
- share_address: ${_param:openstack_share_node02_share_address}
+ manila_share_address: ${_param:openstack_share_node02_share_address}
openstack_share_node03:
name: ${_param:openstack_share_node03_hostname}
domain: ${_param:cluster_domain}
@@ -39,4 +39,4 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: ${_param:linux_system_codename}
single_address: ${_param:openstack_share_node03_address}
- share_address: ${_param:openstack_share_node03_share_address}
+ manila_share_address: ${_param:openstack_share_node03_share_address}
diff --git a/reclass/storage/system/openstack_share_single.yml b/reclass/storage/system/openstack_share_single.yml
index cb33dde..fca56f2 100644
--- a/reclass/storage/system/openstack_share_single.yml
+++ b/reclass/storage/system/openstack_share_single.yml
@@ -13,4 +13,4 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: ${_param:linux_system_codename}
single_address: ${_param:openstack_share_node01_address}
- share_address: ${_param:openstack_share_node01_share_address}
+ manila_share_address: ${_param:openstack_share_node01_share_address}