Move few openstack _params to defaults
* galera|rabbitmq ssl
* openstack port|ssl
Change-Id: Ibd3b8d4760b9b062c5d7eb7c58049b83c9732973
diff --git a/aodh/server/cluster.yml b/aodh/server/cluster.yml
index 444050a..9bc2971 100644
--- a/aodh/server/cluster.yml
+++ b/aodh/server/cluster.yml
@@ -10,11 +10,6 @@
openstack_event_alarm_topic: alarm.all
# Keep alarm history in database for 30 days
aodh_alarm_history_ttl: 2592000
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
cron:
diff --git a/aodh/server/single.yml b/aodh/server/single.yml
index 2dfdea9..106a1b6 100644
--- a/aodh/server/single.yml
+++ b/aodh/server/single.yml
@@ -7,11 +7,6 @@
openstack_event_alarm_topic: alarm.all
# Keep alarm history in database for 30 days
aodh_alarm_history_ttl: 2592000
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
cron:
diff --git a/barbican/server/cluster.yml b/barbican/server/cluster.yml
index 60700a7..52c8712 100644
--- a/barbican/server/cluster.yml
+++ b/barbican/server/cluster.yml
@@ -6,11 +6,6 @@
parameters:
_param:
cluster_internal_protocol: 'http'
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
barbican:
server:
role: ${_param:openstack_node_role}
diff --git a/barbican/server/single.yml b/barbican/server/single.yml
index f004c85..6897cbd 100644
--- a/barbican/server/single.yml
+++ b/barbican/server/single.yml
@@ -5,11 +5,6 @@
parameters:
_param:
internal_protocol: 'http'
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
barbican:
server:
database:
diff --git a/ceilometer/agent/cluster.yml b/ceilometer/agent/cluster.yml
index 4e028f1..681e990 100644
--- a/ceilometer/agent/cluster.yml
+++ b/ceilometer/agent/cluster.yml
@@ -2,11 +2,6 @@
- service.ceilometer.agent.cluster
- system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
parameters:
- _param:
- openstack_rabbitmq_port: 5672
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- ceilometer_agent_ssl_enabled: False
ceilometer:
agent:
region: ${_param:openstack_region}
diff --git a/ceilometer/agent/single.yml b/ceilometer/agent/single.yml
index dc75fc5..ada8cd5 100644
--- a/ceilometer/agent/single.yml
+++ b/ceilometer/agent/single.yml
@@ -2,11 +2,6 @@
- service.ceilometer.agent.single
- system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
parameters:
- _param:
- openstack_rabbitmq_port: 5672
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- ceilometer_agent_ssl_enabled: False
ceilometer:
agent:
libvirt:
diff --git a/ceilometer/agent/telemetry/cluster.yml b/ceilometer/agent/telemetry/cluster.yml
index a110361..73f6d5a 100644
--- a/ceilometer/agent/telemetry/cluster.yml
+++ b/ceilometer/agent/telemetry/cluster.yml
@@ -2,11 +2,6 @@
- service.ceilometer.agent.cluster.common
- system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
parameters:
- _param:
- openstack_rabbitmq_port: 5672
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- ceilometer_agent_ssl_enabled: False
ceilometer:
agent:
region: ${_param:openstack_region}
diff --git a/ceilometer/agent/telemetry/single.yml b/ceilometer/agent/telemetry/single.yml
index 0f87d73..c86bee4 100644
--- a/ceilometer/agent/telemetry/single.yml
+++ b/ceilometer/agent/telemetry/single.yml
@@ -2,11 +2,6 @@
- service.ceilometer.agent.single.common
- system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
parameters:
- _param:
- openstack_rabbitmq_port: 5672
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- ceilometer_agent_ssl_enabled: False
ceilometer:
agent:
libvirt:
diff --git a/ceilometer/server/cluster.yml b/ceilometer/server/cluster.yml
index 31a0abe..5e3c9a2 100644
--- a/ceilometer/server/cluster.yml
+++ b/ceilometer/server/cluster.yml
@@ -6,10 +6,6 @@
- system.keepalived.cluster.instance.openstack_telemetry_vip
- system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
parameters:
- _param:
- openstack_rabbitmq_port: 5672
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
ceilometer:
server:
enabled: true
diff --git a/ceilometer/server/single.yml b/ceilometer/server/single.yml
index 37feddc..9045f68 100644
--- a/ceilometer/server/single.yml
+++ b/ceilometer/server/single.yml
@@ -2,10 +2,6 @@
- service.ceilometer.server.single
- system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
parameters:
- _param:
- openstack_rabbitmq_port: 5672
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
ceilometer:
server:
role: ${_param:openstack_node_role}
diff --git a/ceilometer/server/telemetry/cluster.yml b/ceilometer/server/telemetry/cluster.yml
index a887536..81f6c38 100644
--- a/ceilometer/server/telemetry/cluster.yml
+++ b/ceilometer/server/telemetry/cluster.yml
@@ -4,10 +4,6 @@
- system.keepalived.cluster.instance.openstack_telemetry_vip
- system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
parameters:
- _param:
- openstack_rabbitmq_port: 5672
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
ceilometer:
server:
enabled: true
diff --git a/ceilometer/server/telemetry/single.yml b/ceilometer/server/telemetry/single.yml
index 9ff35d1..66b9431 100644
--- a/ceilometer/server/telemetry/single.yml
+++ b/ceilometer/server/telemetry/single.yml
@@ -2,10 +2,6 @@
- service.ceilometer.server.single.common
- system.salt.minion.cert.rabbitmq.clients.openstack.ceilometer
parameters:
- _param:
- openstack_rabbitmq_port: 5672
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
ceilometer:
server:
role: ${_param:openstack_node_role}
diff --git a/cinder/control/cluster.yml b/cinder/control/cluster.yml
index e4a0718..e34f55c 100644
--- a/cinder/control/cluster.yml
+++ b/cinder/control/cluster.yml
@@ -8,11 +8,6 @@
parameters:
_param:
cluster_internal_protocol: 'http'
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/cinder/control/single.yml b/cinder/control/single.yml
index 0d29e31..46bf972 100644
--- a/cinder/control/single.yml
+++ b/cinder/control/single.yml
@@ -5,11 +5,6 @@
parameters:
_param:
internal_protocol: 'http'
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/cinder/volume/local.yml b/cinder/volume/local.yml
index b0e179a..52f45db 100644
--- a/cinder/volume/local.yml
+++ b/cinder/volume/local.yml
@@ -3,12 +3,6 @@
- system.salt.minion.cert.mysql.clients.openstack.cinder
- system.salt.minion.cert.rabbitmq.clients.openstack.cinder
parameters:
- _param:
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
cinder:
volume:
enabled: True
diff --git a/cinder/volume/single.yml b/cinder/volume/single.yml
index 03c4b3c..35902b8 100644
--- a/cinder/volume/single.yml
+++ b/cinder/volume/single.yml
@@ -5,11 +5,6 @@
parameters:
_param:
cluster_internal_protocol: 'http'
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
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
diff --git a/designate/server/cluster/default.yml b/designate/server/cluster/default.yml
index 1e8076e..db453f7 100644
--- a/designate/server/cluster/default.yml
+++ b/designate/server/cluster/default.yml
@@ -9,11 +9,6 @@
_param:
designate_admin_api_enabled: false
cluster_internal_protocol: 'http'
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/designate/server/cluster/simple.yml b/designate/server/cluster/simple.yml
index 459ab96..bf520a4 100644
--- a/designate/server/cluster/simple.yml
+++ b/designate/server/cluster/simple.yml
@@ -6,11 +6,6 @@
_param:
designate_admin_api_enabled: false
cluster_internal_protocol: 'http'
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/designate/server/single.yml b/designate/server/single.yml
index e89afe1..10aac33 100644
--- a/designate/server/single.yml
+++ b/designate/server/single.yml
@@ -6,11 +6,6 @@
_param:
designate_admin_api_enabled: false
internal_protocol: 'http'
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/glance/control/cluster.yml b/glance/control/cluster.yml
index c69cf55..da4b9e8 100644
--- a/glance/control/cluster.yml
+++ b/glance/control/cluster.yml
@@ -6,12 +6,6 @@
- system.salt.minion.cert.mysql.clients.openstack.glance
- system.salt.minion.cert.rabbitmq.clients.openstack.glance
parameters:
- _param:
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
cron:
diff --git a/glance/control/single.yml b/glance/control/single.yml
index a789a56..34e3e96 100644
--- a/glance/control/single.yml
+++ b/glance/control/single.yml
@@ -3,12 +3,6 @@
- system.salt.minion.cert.mysql.clients.openstack.glance
- system.salt.minion.cert.rabbitmq.clients.openstack.glance
parameters:
- _param:
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
cron:
diff --git a/gnocchi/common/cluster.yml b/gnocchi/common/cluster.yml
index 8d7ae5e..a841b56 100644
--- a/gnocchi/common/cluster.yml
+++ b/gnocchi/common/cluster.yml
@@ -2,9 +2,6 @@
- service.gnocchi.common.cluster
- system.salt.minion.cert.mysql.clients.openstack.gnocchi
parameters:
- _param:
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
gnocchi:
common:
database:
diff --git a/gnocchi/common/single.yml b/gnocchi/common/single.yml
index 1f68f5c..b7d9d96 100644
--- a/gnocchi/common/single.yml
+++ b/gnocchi/common/single.yml
@@ -2,9 +2,6 @@
- service.gnocchi.common.single
- system.salt.minion.cert.mysql.clients.openstack.gnocchi
parameters:
- _param:
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
gnocchi:
common:
database:
diff --git a/heat/server/cluster.yml b/heat/server/cluster.yml
index e11feae..52b3582 100644
--- a/heat/server/cluster.yml
+++ b/heat/server/cluster.yml
@@ -9,11 +9,6 @@
_param:
cluster_public_protocol: 'https'
cluster_internal_protocol: 'http'
- openstack_mysql_x509_enabled: False
- openstack_rabbitmq_x509_enabled: False
- galera_ssl_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/heat/server/single.yml b/heat/server/single.yml
index 1ecb122..c0dc700 100644
--- a/heat/server/single.yml
+++ b/heat/server/single.yml
@@ -3,12 +3,6 @@
- system.salt.minion.cert.mysql.clients.openstack.heat
- system.salt.minion.cert.rabbitmq.clients.openstack.heat
parameters:
- _param:
- openstack_mysql_x509_enabled: False
- openstack_rabbitmq_x509_enabled: False
- galera_ssl_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/ironic/api/cluster.yml b/ironic/api/cluster.yml
index 849b923..fe90091 100644
--- a/ironic/api/cluster.yml
+++ b/ironic/api/cluster.yml
@@ -3,12 +3,6 @@
- system.salt.minion.cert.rabbitmq.clients.openstack.ironic
- service.ironic.api.cluster
parameters:
- _param:
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
@@ -38,4 +32,4 @@
key_file: ${_param:rabbitmq_ironic_client_ssl_key_file}
cert_file: ${_param:rabbitmq_ironic_client_ssl_cert_file}
ssl:
- enabled: ${_param:rabbitmq_ssl_enabled}
\ No newline at end of file
+ enabled: ${_param:rabbitmq_ssl_enabled}
diff --git a/ironic/api/single.yml b/ironic/api/single.yml
index 3313eb2..1ca654b 100644
--- a/ironic/api/single.yml
+++ b/ironic/api/single.yml
@@ -3,12 +3,6 @@
- system.salt.minion.cert.rabbitmq.clients.openstack.ironic
- service.ironic.api.single
parameters:
- _param:
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/ironic/conductor/cluster.yml b/ironic/conductor/cluster.yml
index 81fa2b5..a839f5d 100644
--- a/ironic/conductor/cluster.yml
+++ b/ironic/conductor/cluster.yml
@@ -3,12 +3,6 @@
- system.salt.minion.cert.rabbitmq.clients.openstack.ironic
- service.ironic.conductor.cluster
parameters:
- _param:
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/ironic/conductor/single.yml b/ironic/conductor/single.yml
index 7a24028..b08239e 100644
--- a/ironic/conductor/single.yml
+++ b/ironic/conductor/single.yml
@@ -3,12 +3,6 @@
- system.salt.minion.cert.rabbitmq.clients.openstack.ironic
- service.ironic.conductor.single
parameters:
- _param:
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/keystone/server/cluster.yml b/keystone/server/cluster.yml
index a42d3b6..f83b039 100644
--- a/keystone/server/cluster.yml
+++ b/keystone/server/cluster.yml
@@ -11,11 +11,6 @@
_param:
keystone_tokens_expiration: 3600
openstack_node_role: primary
- openstack_mysql_x509_enabled: False
- openstack_rabbitmq_x509_enabled: False
- galera_ssl_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/keystone/server/single.yml b/keystone/server/single.yml
index 10a5331..cbfeb40 100644
--- a/keystone/server/single.yml
+++ b/keystone/server/single.yml
@@ -13,11 +13,6 @@
mysql_keystone_password: password
keystone_tokens_expiration: 3600
openstack_node_role: primary
- openstack_mysql_x509_enabled: False
- openstack_rabbitmq_x509_enabled: False
- galera_ssl_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/manila/common/cluster.yml b/manila/common/cluster.yml
index ad1254b..71d848d 100644
--- a/manila/common/cluster.yml
+++ b/manila/common/cluster.yml
@@ -4,12 +4,7 @@
- system.salt.minion.cert.rabbitmq.clients.openstack.manila
parameters:
_param:
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
manila_cluster_vip_address: ${_param:cluster_vip_address}
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
cluster_internal_protocol: 'http'
manila:
common:
diff --git a/manila/common/single.yml b/manila/common/single.yml
index c5a6f97..2ff514b 100644
--- a/manila/common/single.yml
+++ b/manila/common/single.yml
@@ -4,11 +4,6 @@
- system.salt.minion.cert.rabbitmq.clients.openstack.manila
parameters:
_param:
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
cluster_internal_protocol: 'http'
manila:
common:
diff --git a/neutron/compute/cluster.yml b/neutron/compute/cluster.yml
index 92e3a2e..a9cf9c1 100644
--- a/neutron/compute/cluster.yml
+++ b/neutron/compute/cluster.yml
@@ -7,9 +7,6 @@
neutron_enable_vlan_aware_vms: False
neutron_enable_bgp_vpn: False
neutron_bgp_vpn_driver: bagpipe
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/neutron/control/cluster.yml b/neutron/control/cluster.yml
index ceaed1d..52a91ea 100644
--- a/neutron/control/cluster.yml
+++ b/neutron/control/cluster.yml
@@ -9,11 +9,6 @@
parameters:
_param:
cluster_internal_protocol: 'http'
- openstack_mysql_x509_enabled: False
- openstack_rabbitmq_x509_enabled: False
- galera_ssl_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/neutron/control/single.yml b/neutron/control/single.yml
index 27d16e1..40bdea3 100644
--- a/neutron/control/single.yml
+++ b/neutron/control/single.yml
@@ -6,11 +6,6 @@
parameters:
_param:
internal_protocol: 'http'
- openstack_mysql_x509_enabled: False
- openstack_rabbitmq_x509_enabled: False
- galera_ssl_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/neutron/gateway/cluster.yml b/neutron/gateway/cluster.yml
index 03ab583..8f84fa1 100644
--- a/neutron/gateway/cluster.yml
+++ b/neutron/gateway/cluster.yml
@@ -5,9 +5,6 @@
_param:
neutron_enable_qos: False
neutron_enable_vlan_aware_vms: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
kernel:
diff --git a/nova/compute/cluster.yml b/nova/compute/cluster.yml
index b281f4d..3a1314d 100644
--- a/nova/compute/cluster.yml
+++ b/nova/compute/cluster.yml
@@ -37,9 +37,6 @@
SG9MrLHCd5l60aCUQg0UA5ed7Hd6SA314k+HwxJno9/wJ+voBeacMg==
-----END RSA PRIVATE KEY-----
cluster_internal_protocol: 'http'
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
openssh:
client:
enabled: True
diff --git a/nova/compute/single.yml b/nova/compute/single.yml
index 32d5087..aff1bd3 100644
--- a/nova/compute/single.yml
+++ b/nova/compute/single.yml
@@ -37,9 +37,6 @@
SG9MrLHCd5l60aCUQg0UA5ed7Hd6SA314k+HwxJno9/wJ+voBeacMg==
-----END RSA PRIVATE KEY-----
cluster_internal_protocol: 'http'
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
openssh:
client:
enabled: True
diff --git a/nova/control/cluster.yml b/nova/control/cluster.yml
index 3f0a644..31f2d6e 100644
--- a/nova/control/cluster.yml
+++ b/nova/control/cluster.yml
@@ -14,11 +14,6 @@
nova_disk_allocation_ratio: 1.0
metadata_password: metadataPass
cluster_internal_protocol: 'http'
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/nova/control/single.yml b/nova/control/single.yml
index 2a28cc7..07c8dc2 100644
--- a/nova/control/single.yml
+++ b/nova/control/single.yml
@@ -5,11 +5,6 @@
parameters:
_param:
cluster_internal_protocol: 'http'
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
- openstack_rabbitmq_x509_enabled: False
- rabbitmq_ssl_enabled: False
- openstack_rabbitmq_port: 5672
linux:
system:
package:
diff --git a/panko/server/cluster.yml b/panko/server/cluster.yml
index 7954944..354ac58 100644
--- a/panko/server/cluster.yml
+++ b/panko/server/cluster.yml
@@ -12,8 +12,6 @@
panko_memcached_node03_address: ${_param:cluster_node03_address}
# Keep events in database for 30 days
panko_event_time_to_live: 2592000
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
linux:
system:
cron:
diff --git a/panko/server/single.yml b/panko/server/single.yml
index 968267c..5e91db1 100644
--- a/panko/server/single.yml
+++ b/panko/server/single.yml
@@ -6,8 +6,6 @@
_param:
# Keep events in database for 30 days
panko_event_time_to_live: 2592000
- openstack_mysql_x509_enabled: False
- galera_ssl_enabled: False
linux:
system:
cron:
diff --git a/rabbitmq/server/ssl/init.yml b/rabbitmq/server/ssl/init.yml
index 961d28d..06962d1 100644
--- a/rabbitmq/server/ssl/init.yml
+++ b/rabbitmq/server/ssl/init.yml
@@ -2,10 +2,6 @@
- system.salt.minion.cert.rabbitmq_server
- service.rabbitmq.server.ssl
parameters:
- _param:
- rabbitmq_ssl_enabled: true
- openstack_rabbitmq_x509_enabled: false
- openstack_rabbitmq_port: 5671 # for non-ssl use 5672 / for ssl 5671
rabbitmq:
server:
ssl: