From f34a104097f7766d2d331bc14b4a83f96f6e8bc5 Mon Sep 17 00:00:00 2001 From: Thomas Dalichow Date: Thu, 9 Aug 2018 14:57:52 +0200 Subject: [PATCH] fbb-api - streamline defective parameters (although they are not working) to reflect real state, since puppet module is not working correctly --- customer/fbb-api/production.yaml | 4 ++-- customer/fbb-api/test.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/customer/fbb-api/production.yaml b/customer/fbb-api/production.yaml index d93bdc01..702a4556 100644 --- a/customer/fbb-api/production.yaml +++ b/customer/fbb-api/production.yaml @@ -86,14 +86,14 @@ rabbitmq::cluster_nodes: - 'prd-api01-fbb.pixelpark.net' - 'prd-api02-fbb.pixelpark.net' rabbitmq::rabbitmq_vhost: - 'fbb-api': + '/fbbapi_vhost': rabbitmq::cluster_node_type: 'disk' rabbitmq::ssl_versions: ['tlsv1.2', 'tlsv1.1', 'tlsv1'] rabbitmq::ssl_cert: "/etc/puppetlabs/puppet/ssl/certs/%{fqdn}.pem" rabbitmq::ssl_key: "/etc/puppetlabs/puppet/ssl/private_keys/%{fqdn}.pem" rabbitmq::ssl_cacert: '/etc/puppetlabs/puppet/ssl/certs/ca.pem' rabbitmq::rabbitmq_user: - 'fbb@/fbb-api': + 'fbb@/fbbapi_vhost': admin: false configure_permission: '.*' read_permission: '.*' diff --git a/customer/fbb-api/test.yaml b/customer/fbb-api/test.yaml index 137dc66f..e60748e3 100644 --- a/customer/fbb-api/test.yaml +++ b/customer/fbb-api/test.yaml @@ -111,14 +111,14 @@ rabbitmq::cluster_nodes: - 'tst-api01-fbb.pixelpark.net' - 'tst-api02-fbb.pixelpark.net' rabbitmq::rabbitmq_vhost: - 'fbb-api': + '/fbbapi_vhost': rabbitmq::cluster_node_type: 'disk' rabbitmq::ssl_versions: ['tlsv1.2', 'tlsv1.1', 'tlsv1'] rabbitmq::ssl_cert: "/etc/puppetlabs/puppet/ssl/certs/%{fqdn}.pem" rabbitmq::ssl_key: "/etc/puppetlabs/puppet/ssl/private_keys/%{fqdn}.pem" rabbitmq::ssl_cacert: '/etc/puppetlabs/puppet/ssl/certs/ca.pem' rabbitmq::rabbitmq_user: - 'fbb@/': + 'fbb@/fbbapi_vhost': admin: false configure_permission: '.*' read_permission: '.*' -- 2.39.5