commit f94ab8ccf839a76de6c377a1d17bbfa2093604cd
author azvyagintsev <azvyagintsev@mirantis.com> Fri Oct 12 20:48:59 2018 +0300
committer azvyagintsev <azvyagintsev@mirantis.com> Tue Oct 16 16:10:22 2018 +0300
tree 5f924d32865e068dff33d223ba3e276d5ecda6aa
parent 3cbe52b6291dba9fbee967acf74da1ff6a01daa8

Move few openstack _params to defaults

   * galera|rabbitmq ssl
   * openstack port|ssl

Change-Id: Ibd3b8d4760b9b062c5d7eb7c58049b83c9732973

ironic/api/cluster.yml

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}

ironic/api/single.yml

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:

ironic/conductor/cluster.yml

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:

ironic/conductor/single.yml

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: