Move few openstack _params to defaults
* galera|rabbitmq ssl
* openstack port|ssl
Change-Id: Ibd3b8d4760b9b062c5d7eb7c58049b83c9732973
diff --git a/defaults/galera/init.yml b/defaults/galera/init.yml
new file mode 100644
index 0000000..a99b281
--- /dev/null
+++ b/defaults/galera/init.yml
@@ -0,0 +1,4 @@
+parameters:
+ _param:
+ # SSL
+ galera_ssl_enabled: False
diff --git a/defaults/init.yml b/defaults/init.yml
index 022f44c..3f2e3f8 100644
--- a/defaults/init.yml
+++ b/defaults/init.yml
@@ -1,12 +1,20 @@
+# This is list of all default soft params, across reclass-system lvl.
+# Please always include those 'init.yml', and don't use direct sub-lvls.
+# Some rules approach:
+# - Always use uniq names, which exactly identify key
+# - Avoid any component intersection's
+# - No if\else\whatever logic allowed.
+
classes:
- system.defaults.linux_system_repo
+- system.defaults.openstack
+- system.defaults.galera
+- system.defaults.rabbitmq
- system.defaults.debmirror
parameters:
-# Transition in progress.
-# Please ignore 'G' transition marker - it uses only for internal purposes
_param:
apt_mk_version: "stable"
linux_system_architecture: 'amd64'
linux_system_repo_url: "http://mirror.mirantis.com/${_param:apt_mk_version}/"
- # Openstack
- openstack_version: 'pike'
+ # Openstack globals
+ openstack_version: 'queens'
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
new file mode 100644
index 0000000..e2856a0
--- /dev/null
+++ b/defaults/openstack/init.yml
@@ -0,0 +1,8 @@
+parameters:
+ _param:
+ # SSL
+ ceilometer_agent_ssl_enabled: False
+ openstack_mysql_x509_enabled: False
+ # for non-ssl use 5672 / for ssl 5671
+ openstack_rabbitmq_port: 5672
+ openstack_rabbitmq_x509_enabled: False
diff --git a/defaults/rabbitmq/init.yml b/defaults/rabbitmq/init.yml
new file mode 100644
index 0000000..2cad9ec
--- /dev/null
+++ b/defaults/rabbitmq/init.yml
@@ -0,0 +1,4 @@
+parameters:
+ _param:
+ # SSL
+ rabbitmq_ssl_enabled: False