fbb-api - revert user-add because puppet module version doesn't support it yet

diff --git a/customer/fbb-api/test.yaml b/customer/fbb-api/test.yaml
index b0f2d6c62d421c9a02f9fd10416628062aba0069..7bb4c3fa693aebc540790e5b08acc34c51942fc0 100644 (file)
--- a/customer/fbb-api/test.yaml
+++ b/customer/fbb-api/test.yaml
@@ -106,14 +106,14 @@ rabbitmq::config_variables:
 rabbitmq::erlang_cookie: ENC[PKCS7,MIIBuQYJKoZIhvcNAQcDoIIBqjCCAaYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAuO5WxiGE1Rxfn4I1EovaArzYCLTJ5dSAk/hTkbWjKusUNEpZHwMtrO8qfG9NjY1fCkJaITwmCbdr/i2l9yDZp7pxn2yIC2QbNCDE7gXk345yWD9qxKQ3ivgNna8dnx5CbNo5cqPd2R2z7eyQZFpa0Jt9OjI4conGYg7eDYbequZPV+E603R1tBcGG7db9rV/DIlqxgJ2dcXzCOtiuFzD+YldlbjbhAt62yjkDUzyZW9YojRUk+3ItPJ5ccOxPO3qGpgtjvrN4BVbRSbqKi1JSEmMDhLADI+UHzunp+vePg2P4WsfrABKbXhbBVY8MGOm/zXVhGMqBNWRV9o6rMFqUTB8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBXYWoNX9GS0EPkaCMZHh7BgFAZKWQ8Ity7ANKMl33R6rmjB6gBHsy09+UdZzJ+D2SUnX3K1STtpKRjZmPSxq/8H6v9Rg5og+GGdhOgNayzmcxtN+oFqMyn4KV992rOL0Q4Cg==]
 rabbitmq::config_cluster: true
 rabbitmq::cluster_nodes:
-  - 'tst-api01-fbb'
-  - 'tst-api02-fbb'
+  - 'tst-api01-fbb.pixelpark.net'
+  - 'tst-api02-fbb.pixelpark.net'
 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: 'admin@/'
+#rabbitmq::rabbitmq_user: 'admin@/'
 #    admin: true
 #    password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAsS/SR7BdCnjk41lGwkOoKU8KFxiNM/I2n3gKNZxdwVKyXNcvzII3SvwxPdL1llj8edL4aexBN+pXw7ERSNHcDy7CLJDXjhyac5ivz1tqPGAhK7tYcWMsGQ/iIUBmUBpORttwqfzoq0750QfQ9NubuBq7L8ltM0cD2Ve4xBfR/xp7jXRZm65P7wJs3tCOrFwUXjoVEJLK40LI80qEU5GEbjCtayxIxBglM0Zv8tr4qIOdLIIIfCtk3BvBl0pEDiBbVw5Qy7lpEY10FNGp78lfRzzFrm0oKCUwuO368748SU8BiKZQs30eUaRyLIE0kwCGj8TnRl0+DAI9tZD1A+oUqjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCmOLcuFUWGhvnE1wasGTW7gCDdICkvmnTz2tKgZm6hkLGLh0qmpLUqVw70GhZ1c7JbPA==]

diff --git a/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml b/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml
index a05cac6002e53647f5b37435ca5e50a217978701..0ec7fd4dc8adab7cb0ea4952af132d939e63c691 100644 (file)
--- a/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml
+++ b/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml
@@ -10,6 +10,9 @@ infra::profile::cron::cronjobs:
     minute: '*/3'
     description: FBBPSCDM-167
 
+rabbitmq::environment_variables:
+  - 'NODENAME=rabbit@tst-api01-fbb.pixelpark.net'
+
 infra::profile::apache::pp_vhosts:
   tst-api:
     docroot: /var/www/api/public

diff --git a/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml b/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml
index d2b7a2b7dfdee6040beb855e3014111dfd1debd5..1da7f2e1cae12cfdaac422ab82a516da54835aeb 100644 (file)
--- a/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml
+++ b/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml
@@ -3,6 +3,9 @@ infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEApLwtQtA38osTY/7lUdvIQofSDJzSVVGCiE7m3++ZB+AnZPB0ygy4fKWig+ESSVD1fny4BFnl2WK1/E5BbFxOYkOFYNIQwEeXBTfukf4EFx8CJ4EfRGoWi2G8u/hDVS2mG6VCV7G71yg5JbDpo5riR/tLlJV6pEbgPITIRQE8DJ+a6gYy1Zs+QiWHoZpmh7ZrXR8XQMEoYOMtGig1EIHEb8t1vT5QQQiCT0JqwLzG9gdwHNf8+W42A1xNfPcZlHX5aFhUwDo+AQkn1Z5/C8Z2t44f/Sbd79D8T6UdIv+Ji98i47V1zFlbSe9DntU6yBa+pIPG+MHVPGuqoGBDOSxJFTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBYFlJNLjZNOjB+ZJfS6OLTgBBfrWwrqWzTXq2m+8Up6oj1]
 
+rabbitmq::environment_variables:
+  - 'NODENAME=rabbit@tst-api02-fbb.pixelpark.net'
+
 infra::profile::apache::pp_vhosts:
   tst-api:
     docroot: /var/www/api/public