chore: re-organise puppet, puppetdb and puppetboard roles

data/prodinf01n01.main.unkin.net.yaml

@@ -1,4 +1,4 @@
 ---
 classes:
-  - roles::puppet::puppetmaster
+  - roles::infra::puppet::master
 environment: testing

data/prodinf01n04.main.unkin.net.yaml

@@ -1,4 +1,4 @@
 ---
 classes:
-  - roles::puppet::puppetdb_api
+  - roles::infra::puppetdb::api
 environment: testing

data/prodinf01n05.main.unkin.net.yaml

@@ -1,4 +1,4 @@
 ---
 classes:
-  - roles::puppet::puppetdb_sql
+  - roles::infra::puppetdb::sql
 environment: testing

data/prodinf01n06.main.unkin.net.yaml

@@ -1,4 +1,4 @@
 ---
 classes:
-  - roles::puppet::puppetboard
+  - roles::infra::puppetboard::server
 environment: testing

data/prodinf01n25.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::metrics::prometheus
-environment: testing

data/prodinf01n26.main.unkin.net.yaml

@@ -1,4 +0,0 @@
----
-classes:
-  - roles::infra::metrics::prometheus
-environment: testing