convert all configs to yaml

Change-Id: I7edbd3a59007d9e2f7f5ab5e4c020eeb58d03dd3

31 files changed, 291 insertions, 467 deletions

diff --git a/k8s/pod/glance-pod.yaml b/k8s/pod/glance-pod.yaml
new file mode 100644
index 000000000..1caedb95c
--- /dev/null
+++ b/k8s/pod/glance-pod.yaml
@@ -0,0 +1,30 @@
+desiredState:
+  manifest:
+    containers:
+    - env:
+      - name: DB_ROOT_PASSWORD
+        value: password
+      - name: GLANCE_DB_PASSWORD
+        value: password
+      - name: KEYSTONE_ADMIN_TOKEN
+        value: ADMINTOKEN
+      image: kollaglue/fedora-rdo-glance-registry
+      name: glance-registry
+      ports:
+      - containerPort: 9191
+    - env:
+      - name: DB_ROOT_PASSWORD
+        value: password
+      - name: GLANCE_DB_PASSWORD
+        value: password
+      - name: KEYSTONE_ADMIN_TOKEN
+        value: ADMINTOKEN
+      image: kollaglue/fedora-rdo-glance-api
+      name: glance-api
+      ports:
+      - containerPort: 9292
+    id: glance-1
+    version: v1beta1
+id: glance
+labels:
+  name: glance
diff --git a/k8s/pod/heat-pod.json b/k8s/pod/heat-pod.json
deleted file mode 100644
index dcdbcd523..000000000
--- a/k8s/pod/heat-pod.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-    "id": "heat",
-    "desiredState": {
-        "manifest": {
-            "version": "v1beta1",
-            "id": "heat-1",
-            "containers": [
-                {
-                    "name": "heat-engine",
-                    "image": "fedora-rdo-heat-engine",
-                    "ports": [
-                        {
-                            "containerPort": 9292
-                        }
-                    ],
-                    "env": [
-                        {
-                            "name": "DB_ROOT_PASSWORD",
-                            "value": "password"
-                        },
-                        {
-                            "name": "HEAT_DB_PASSWORD",
-                            "value": "heatdbpassword"
-                        },
-                        {
-                            "name": "KEYSTONE_ADMIN_TOKEN",
-                            "value": "ADMINTOKEN"
-                        }
-                    ]
-                },
-                {
-                    "name": "heat-api",
-                    "image": "fedora-rdo-heat-api",
-                    "ports": [
-                        {
-                            "containerPort": 9292
-                        }
-                    ],
-                    "env": [
-                        {
-                            "name": "DB_ROOT_PASSWORD",
-                            "value": "password"
-                        },
-                        {
-                            "name": "HEAT_DB_PASSWORD",
-                            "value": "heatdbpassword"
-                        },
-                        {
-                            "name": "KEYSTONE_ADMIN_TOKEN",
-                            "value": "ADMINTOKEN"
-                        }
-                    ]
-                }
-            ]
-        }
-    },
-    "labels": {
-        "name": "keystone-master"
-    }
-}
diff --git a/k8s/pod/heat-pod.yaml b/k8s/pod/heat-pod.yaml
new file mode 100644
index 000000000..9d6d17d80
--- /dev/null
+++ b/k8s/pod/heat-pod.yaml
@@ -0,0 +1,30 @@
+desiredState:
+  manifest:
+    containers:
+    - env:
+      - name: DB_ROOT_PASSWORD
+        value: password
+      - name: HEAT_DB_PASSWORD
+        value: heatdbpassword
+      - name: KEYSTONE_ADMIN_TOKEN
+        value: ADMINTOKEN
+      image: fedora-rdo-heat-engine
+      name: heat-engine
+      ports:
+      - containerPort: 9292
+    - env:
+      - name: DB_ROOT_PASSWORD
+        value: password
+      - name: HEAT_DB_PASSWORD
+        value: heatdbpassword
+      - name: KEYSTONE_ADMIN_TOKEN
+        value: ADMINTOKEN
+      image: fedora-rdo-heat-api
+      name: heat-api
+      ports:
+      - containerPort: 9292
+    id: heat-1
+    version: v1beta1
+id: heat
+labels:
+  name: keystone-master
diff --git a/k8s/pod/keystone-pod.json b/k8s/pod/keystone-pod.json
deleted file mode 100644
index 4a1edf0db..000000000
--- a/k8s/pod/keystone-pod.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "id": "keystone",
-  "desiredState": {
-    "manifest": {
-      "version": "v1beta1",
-      "id": "keystone-1",
-      "containers": [{
-        "name": "keystone",
-        "image": "kollaglue/fedora-rdo-keystone",
-        "ports": [
-          {"containerPort": 5000},
-          {"containerPort": 35357}
-        ],
-        "env": [
-          {"name": "DB_ROOT_PASSWORD", "value": "password"},
-          {"name": "KEYSTONE_ADMIN_TOKEN", "value": "ADMINTOKEN"}
-        ]
-      }]
-    }
-  },
-  "labels": {
-    "name": "keystone"
-  }
-}
diff --git a/k8s/pod/keystone-pod.yaml b/k8s/pod/keystone-pod.yaml
new file mode 100644
index 000000000..5efe70984
--- /dev/null
+++ b/k8s/pod/keystone-pod.yaml
@@ -0,0 +1,18 @@
+desiredState:
+  manifest:
+    containers:
+    - env:
+      - name: DB_ROOT_PASSWORD
+        value: password
+      - name: KEYSTONE_ADMIN_TOKEN
+        value: ADMINTOKEN
+      image: kollaglue/fedora-rdo-keystone
+      name: keystone
+      ports:
+      - containerPort: 5000
+      - containerPort: 35357
+    id: keystone-1
+    version: v1beta1
+id: keystone
+labels:
+  name: keystone
diff --git a/k8s/pod/mariadb-pod.json b/k8s/pod/mariadb-pod.json
deleted file mode 100644
index a0c58bdaf..000000000
--- a/k8s/pod/mariadb-pod.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "desiredState": {
-        "manifest": {
-            "containers": [
-                {
-                    "env": [
-                        {
-                            "name": "DB_ROOT_PASSWORD",
-                            "value": "password"
-                        }
-                    ],
-                    "image": "kollaglue/fedora-rdo-mariadb",
-                    "name": "mariadb",
-                    "ports": [
-                        {
-                            "containerPort": 3306
-                        }
-                    ]
-                }
-            ],
-            "id": "mariadb-1",
-            "version": "v1beta1"
-        }
-    },
-    "id": "mariadb",
-    "labels": {
-        "name": "mariadb"
-    }
-}
diff --git a/k8s/pod/mariadb-pod.yaml b/k8s/pod/mariadb-pod.yaml
new file mode 100644
index 000000000..7b18a4327
--- /dev/null
+++ b/k8s/pod/mariadb-pod.yaml
@@ -0,0 +1,15 @@
+desiredState:
+  manifest:
+    containers:
+    - env:
+      - name: DB_ROOT_PASSWORD
+        value: password
+      image: kollaglue/fedora-rdo-mariadb
+      name: mariadb
+      ports:
+      - containerPort: 3306
+    id: mariadb-1
+    version: v1beta1
+id: mariadb
+labels:
+  name: mariadb
diff --git a/k8s/pod/nova-compute-pod.json b/k8s/pod/nova-compute-pod.json
deleted file mode 100644
index d280a4b09..000000000
--- a/k8s/pod/nova-compute-pod.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "id": "nova",
-  "desiredState": {
-    "manifest": {
-      "version": "v1beta1",
-      "id": "nova-1",
-      "containers": [
-        {
-          "name": "nova-compute",
-          "image": "kollaglue/fedora-rdo-nova-compute",
-          "env": [
-            {
-              "name": "DB_ROOT_PASSWORD",
-              "value": "password"
-            },
-            {
-              "name": "NOVA_DB_PASSWORD",
-              "value": "novadbpassword"
-            },
-            {
-              "name": "KEYSTONE_ADMIN_TOKEN",
-              "value": "ADMINTOKEN"
-            }
-          ]
-        },
-        {
-          "name": "nova-libvirt",
-          "image": "kollaglue/fedora-rdo-nova-libvirt",
-          "ports": [
-            {"containerPort": 16509}
-          ],
-          "env": [
-            {
-              "name": "DB_ROOT_PASSWORD",
-              "value": "password"
-            },
-            {
-              "name": "NOVA_DB_PASSWORD",
-              "value": "novadbpassword"
-            },
-            {
-              "name": "KEYSTONE_ADMIN_TOKEN",
-              "value": "ADMINTOKEN"
-            }
-          ]
-        }
-      ]
-    }
-  },
-  "labels": {
-    "name": "nova-compute"
-  }
-}
diff --git a/k8s/pod/nova-compute-pod.yaml b/k8s/pod/nova-compute-pod.yaml
new file mode 100644
index 000000000..7cd4ac444
--- /dev/null
+++ b/k8s/pod/nova-compute-pod.yaml
@@ -0,0 +1,28 @@
+desiredState:
+  manifest:
+    containers:
+    - env:
+      - name: DB_ROOT_PASSWORD
+        value: password
+      - name: NOVA_DB_PASSWORD
+        value: novadbpassword
+      - name: KEYSTONE_ADMIN_TOKEN
+        value: ADMINTOKEN
+      image: kollaglue/fedora-rdo-nova-compute
+      name: nova-compute
+    - env:
+      - name: DB_ROOT_PASSWORD
+        value: password
+      - name: NOVA_DB_PASSWORD
+        value: novadbpassword
+      - name: KEYSTONE_ADMIN_TOKEN
+        value: ADMINTOKEN
+      image: kollaglue/fedora-rdo-nova-libvirt
+      name: nova-libvirt
+      ports:
+      - containerPort: 16509
+    id: nova-1
+    version: v1beta1
+id: nova
+labels:
+  name: nova-compute
diff --git a/k8s/pod/nova-controller-pod.json b/k8s/pod/nova-controller-pod.json
deleted file mode 100644
index 5faae5ca9..000000000
--- a/k8s/pod/nova-controller-pod.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-  "id": "nova",
-  "desiredState": {
-    "manifest": {
-      "version": "v1beta1",
-      "id": "nova-1",
-      "containers": [
-        {
-          "name": "nova-controller",
-          "image": "kollaglue/fedora-rdo-nova-controller",
-          "ports": [
-            {"containerPort": 9292}
-          ],
-          "env": [
-            {
-              "name": "DB_ROOT_PASSWORD",
-              "value": "password"
-            },
-            {
-              "name": "NOVA_DB_PASSWORD",
-              "value": "novadbpassword"
-            },
-            {
-              "name": "KEYSTONE_ADMIN_TOKEN",
-              "value": "ADMINTOKEN"
-            }
-          ]
-        },
-        {
-          "name": "nova-conductor",
-          "image": "kollaglue/fedora-rdo-nova-conductor",
-          "ports": [
-            {"containerPort": 9292}
-          ],
-          "env": [
-            {
-              "name": "DB_ROOT_PASSWORD",
-              "value": "password"
-            },
-            {
-              "name": "NOVA_DB_PASSWORD",
-              "value": "novadbpassword"
-            },
-            {
-              "name": "KEYSTONE_ADMIN_TOKEN",
-              "value": "ADMINTOKEN"
-            }
-          ]
-        },
-        {
-          "name": "nova-scheduler",
-          "image": "kollaglue/fedora-rdo-nova-scheduler",
-          "ports": [
-            {"containerPort": 9292}
-          ],
-          "env": [
-            {
-              "name": "DB_ROOT_PASSWORD",
-              "value": "password"
-            },
-            {
-              "name": "NOVA_DB_PASSWORD",
-              "value": "novadbpassword"
-            },
-            {
-              "name": "KEYSTONE_ADMIN_TOKEN",
-              "value": "ADMINTOKEN"
-            }
-          ]
-        },
-        {
-          "name": "nova-api",
-          "image": "kollaglue/fedora-rdo-nova-api",
-          "ports": [
-            {"containerPort": 9292}
-          ],
-          "env": [
-            {
-              "name": "DB_ROOT_PASSWORD",
-              "value": "password"
-            },
-            {
-              "name": "NOVA_DB_PASSWORD",
-              "value": "novadbpassword"
-            },
-            {
-              "name": "KEYSTONE_ADMIN_TOKEN",
-              "value": "ADMINTOKEN"
-            }
-          ]
-        }
-      ]
-    }
-  },
-  "labels": {
-    "name": "nova-controller"
-  }
-}
diff --git a/k8s/pod/nova-controller-pod.yaml b/k8s/pod/nova-controller-pod.yaml
new file mode 100644
index 000000000..dee8b7f86
--- /dev/null
+++ b/k8s/pod/nova-controller-pod.yaml
@@ -0,0 +1,52 @@
+desiredState:
+  manifest:
+    containers:
+    - env:
+      - name: DB_ROOT_PASSWORD
+        value: password
+      - name: NOVA_DB_PASSWORD
+        value: novadbpassword
+      - name: KEYSTONE_ADMIN_TOKEN
+        value: ADMINTOKEN
+      image: kollaglue/fedora-rdo-nova-controller
+      name: nova-controller
+      ports:
+      - containerPort: 9292
+    - env:
+      - name: DB_ROOT_PASSWORD
+        value: password
+      - name: NOVA_DB_PASSWORD
+        value: novadbpassword
+      - name: KEYSTONE_ADMIN_TOKEN
+        value: ADMINTOKEN
+      image: kollaglue/fedora-rdo-nova-conductor
+      name: nova-conductor
+      ports:
+      - containerPort: 9292
+    - env:
+      - name: DB_ROOT_PASSWORD
+        value: password
+      - name: NOVA_DB_PASSWORD
+        value: novadbpassword
+      - name: KEYSTONE_ADMIN_TOKEN
+        value: ADMINTOKEN
+      image: kollaglue/fedora-rdo-nova-scheduler
+      name: nova-scheduler
+      ports:
+      - containerPort: 9292
+    - env:
+      - name: DB_ROOT_PASSWORD
+        value: password
+      - name: NOVA_DB_PASSWORD
+        value: novadbpassword
+      - name: KEYSTONE_ADMIN_TOKEN
+        value: ADMINTOKEN
+      image: kollaglue/fedora-rdo-nova-api
+      name: nova-api
+      ports:
+      - containerPort: 9292
+    id: nova-1
+    version: v1beta1
+id: nova
+labels:
+  name: nova-controller
diff --git a/k8s/pod/rabbitmq-pod.json b/k8s/pod/rabbitmq-pod.json
deleted file mode 100644
index 8fd511d3a..000000000
--- a/k8s/pod/rabbitmq-pod.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "id": "rabbitmq-master",
-  "desiredState": {
-    "manifest": {
-      "version": "v1beta1",
-      "id": "rabbitmq-1",
-      "containers": [{
-        "name": "rabbitmq",
-        "image": "kollaglue/fedora-rdo-rabbitmq",
-        "ports": [
-          {"containerPort": 5672}
-        ]
-      }]
-    }
-  },
-  "labels": {
-    "name": "rabbitmq-master"
-  }
-}
diff --git a/k8s/pod/rabbitmq-pod.yaml b/k8s/pod/rabbitmq-pod.yaml
new file mode 100644
index 000000000..c8d3d32b3
--- /dev/null
+++ b/k8s/pod/rabbitmq-pod.yaml
@@ -0,0 +1,12 @@
+desiredState:
+  manifest:
+    containers:
+    - image: kollaglue/fedora-rdo-rabbitmq
+      name: rabbitmq
+      ports:
+      - containerPort: 5672
+    id: rabbitmq-1
+    version: v1beta1
+id: rabbitmq-master
+labels:
+  name: rabbitmq-master
diff --git a/k8s/pod/swift-pod.json b/k8s/pod/swift-pod.json
deleted file mode 100644
index 0e21cdf71..000000000
--- a/k8s/pod/swift-pod.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-    "id": "swift",
-    "desiredState": {
-        "manifest": {
-            "version": "v1beta1",
-            "id": "swift-1",
-            "containers": [
-                {
-                    "name": "swift-account-server",
-                    "image": "fedora-rdo-swift-account-server",
-                    "ports": [
-                        {
-                            "containerPort": 9292
-                        }
-                    ],
-                    "env": [
-                        {
-                            "name": "DB_ROOT_PASSWORD",
-                            "value": "password"
-                        },
-                        {
-                            "name": "SWIFT_DB_PASSWORD",
-                            "value": "swiftdbpassword"
-                        },
-                        {
-                            "name": "KEYSTONE_ADMIN_TOKEN",
-                            "value": "ADMINTOKEN"
-                        }
-                    ]
-                },
-                {
-                    "name": "swift-container-server",
-                    "image": "fedora-rdo-swift-container-server",
-                    "ports": [
-                        {
-                            "containerPort": 9292
-                        }
-                    ],
-                    "env": [
-                        {
-                            "name": "DB_ROOT_PASSWORD",
-                            "value": "password"
-                        },
-                        {
-                            "name": "SWIFT_DB_PASSWORD",
-                            "value": "swiftdbpassword"
-                        },
-                        {
-                            "name": "KEYSTONE_ADMIN_TOKEN",
-                            "value": "ADMINTOKEN"
-                        }
-                    ]
-                },
-                {
-                    "name": "swift-object-server",
-                    "image": "fedora-rdo-swift-object-server",
-                    "ports": [
-                        {
-                            "containerPort": 9292
-                        }
-                    ],
-                    "env": [
-                        {
-                            "name": "DB_ROOT_PASSWORD",
-                            "value": "password"
-                        },
-                        {
-                            "name": "SWIFT_DB_PASSWORD",
-                            "value": "swiftdbpassword"
-                        },
-                        {
-                            "name": "KEYSTONE_ADMIN_TOKEN",
-                            "value": "ADMINTOKEN"
-                        }
-                    ]
-                },
-                {
-                    "name": "swift-proxy-server",
-                    "image": "fedora-rdo-swift-proxy-server",
-                    "ports": [
-                        {
-                            "containerPort": 9292
-                        }
-                    ],
-                    "env": [
-                        {
-                            "name": "DB_ROOT_PASSWORD",
-                            "value": "password"
-                        },
-                        {
-                            "name": "SWIFT_DB_PASSWORD",
-                            "value": "swiftdbpassword"
-                        },
-                        {
-                            "name": "KEYSTONE_ADMIN_TOKEN",
-                            "value": "ADMINTOKEN"
-                        }
-                    ]
-                }
-            ]
-        }
-    },
-    "labels": {
-        "name": "keystone-master"
-    }
-}
diff --git a/k8s/pod/swift-pod.yaml b/k8s/pod/swift-pod.yaml
new file mode 100644
index 000000000..f8c3a057d
--- /dev/null
+++ b/k8s/pod/swift-pod.yaml
@@ -0,0 +1,52 @@
+desiredState:
+  manifest:
+    containers:
+    - env:
+      - name: DB_ROOT_PASSWORD
+        value: password
+      - name: SWIFT_DB_PASSWORD
+        value: swiftdbpassword
+      - name: KEYSTONE_ADMIN_TOKEN
+        value: ADMINTOKEN
+      image: fedora-rdo-swift-account-server
+      name: swift-account-server
+      ports:
+      - containerPort: 9292
+    - env:
+      - name: DB_ROOT_PASSWORD
+        value: password
+      - name: SWIFT_DB_PASSWORD
+        value: swiftdbpassword
+      - name: KEYSTONE_ADMIN_TOKEN
+        value: ADMINTOKEN
+      image: fedora-rdo-swift-container-server
+      name: swift-container-server
+      ports:
+      - containerPort: 9292
+    - env:
+      - name: DB_ROOT_PASSWORD
+        value: password
+      - name: SWIFT_DB_PASSWORD
+        value: swiftdbpassword
+      - name: KEYSTONE_ADMIN_TOKEN
+        value: ADMINTOKEN
+      image: fedora-rdo-swift-object-server
+      name: swift-object-server
+      ports:
+      - containerPort: 9292
+    - env:
+      - name: DB_ROOT_PASSWORD
+        value: password
+      - name: SWIFT_DB_PASSWORD
+        value: swiftdbpassword
+      - name: KEYSTONE_ADMIN_TOKEN
+        value: ADMINTOKEN
+      image: fedora-rdo-swift-proxy-server
+      name: swift-proxy-server
+      ports:
+      - containerPort: 9292
+    id: swift-1
+    version: v1beta1
+id: swift
+labels:
+  name: keystone-master
diff --git a/k8s/service/glance-api-service.json b/k8s/service/glance-api-service.json
deleted file mode 100644
index c77873c5b..000000000
--- a/k8s/service/glance-api-service.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "id": "glance-api",
-  "kind": "Service",
-  "apiVersion": "v1beta1",
-  "port": 9292,
-  "containerPort": 9292,
-  "selector": {
-    "name": "glance"
-  }
-}
diff --git a/k8s/service/glance-api-service.yaml b/k8s/service/glance-api-service.yaml
new file mode 100644
index 000000000..42e8c5c65
--- /dev/null
+++ b/k8s/service/glance-api-service.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1beta1
+containerPort: 9292
+id: glance-api
+kind: Service
+port: 9292
+selector:
+  name: glance
diff --git a/k8s/service/glance-registry-service.json b/k8s/service/glance-registry-service.json
deleted file mode 100644
index ec557b4ee..000000000
--- a/k8s/service/glance-registry-service.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "id": "glance-registry",
-  "kind": "Service",
-  "apiVersion": "v1beta1",
-  "port": 9191,
-  "containerPort": 9191,
-  "selector": {
-    "name": "glance"
-  }
-}
diff --git a/k8s/service/glance-registry-service.yaml b/k8s/service/glance-registry-service.yaml
new file mode 100644
index 000000000..8cd81f504
--- /dev/null
+++ b/k8s/service/glance-registry-service.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1beta1
+containerPort: 9191
+id: glance-registry
+kind: Service
+port: 9191
+selector:
+  name: glance
diff --git a/k8s/service/keystone-admin-service.json b/k8s/service/keystone-admin-service.json
deleted file mode 100644
index c67d58553..000000000
--- a/k8s/service/keystone-admin-service.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "id": "keystone-admin",
-  "kind": "Service",
-  "apiVersion": "v1beta1",
-  "port": 35357,
-  "containerPort": 35357,
-  "selector": {
-    "name": "keystone"
-  }
-}
diff --git a/k8s/service/keystone-admin-service.yaml b/k8s/service/keystone-admin-service.yaml
new file mode 100644
index 000000000..59114c249
--- /dev/null
+++ b/k8s/service/keystone-admin-service.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1beta1
+containerPort: 35357
+id: keystone-admin
+kind: Service
+port: 35357
+selector:
+  name: keystone
diff --git a/k8s/service/keystone-public-service.json b/k8s/service/keystone-public-service.json
deleted file mode 100644
index 6768fe9e0..000000000
--- a/k8s/service/keystone-public-service.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "id": "keystone-public",
-  "kind": "Service",
-  "apiVersion": "v1beta1",
-  "port": 5000,
-  "containerPort": 5000,
-  "selector": {
-    "name": "keystone"
-  }
-}
diff --git a/k8s/service/keystone-public-service.yaml b/k8s/service/keystone-public-service.yaml
new file mode 100644
index 000000000..83ea2b734
--- /dev/null
+++ b/k8s/service/keystone-public-service.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1beta1
+containerPort: 5000
+id: keystone-public
+kind: Service
+port: 5000
+selector:
+  name: keystone
diff --git a/k8s/service/mariadb-service.json b/k8s/service/mariadb-service.json
deleted file mode 100644
index d46b058cf..000000000
--- a/k8s/service/mariadb-service.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "id": "mariadb",
-  "kind": "Service",
-  "apiVersion": "v1beta1",
-  "port": 3306,
-  "containerPort": 3306,
-  "selector": {
-    "name": "mariadb"
-  }
-}
diff --git a/k8s/service/mariadb-service.yaml b/k8s/service/mariadb-service.yaml
new file mode 100644
index 000000000..c0aaa14fe
--- /dev/null
+++ b/k8s/service/mariadb-service.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1beta1
+containerPort: 3306
+id: mariadb
+kind: Service
+port: 3306
+selector:
+  name: mariadb
diff --git a/k8s/service/nova-compute-service.json b/k8s/service/nova-compute-service.json
deleted file mode 100644
index 8df090a5d..000000000
--- a/k8s/service/nova-compute-service.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "id": "novacompute",
-  "kind": "Service",
-  "apiVersion": "v1beta1",
-  "selector": {
-    "name": "nova-compute"
-  }
-}
diff --git a/k8s/service/nova-compute-service.yaml b/k8s/service/nova-compute-service.yaml
new file mode 100644
index 000000000..abc860b14
--- /dev/null
+++ b/k8s/service/nova-compute-service.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1beta1
+id: novacompute
+kind: Service
+selector:
+  name: nova-compute
diff --git a/k8s/service/nova-libvirt-service.json b/k8s/service/nova-libvirt-service.json
deleted file mode 100644
index e14d88300..000000000
--- a/k8s/service/nova-libvirt-service.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "id": "novalibvirt",
-  "kind": "Service",
-  "apiVersion": "v1beta1",
-  "port": 16509,
-  "containerPort": 16509,
-  "selector": {
-    "name": "nova-compute"
-  }
-}
diff --git a/k8s/service/nova-libvirt-service.yaml b/k8s/service/nova-libvirt-service.yaml
new file mode 100644
index 000000000..da2e472ff
--- /dev/null
+++ b/k8s/service/nova-libvirt-service.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1beta1
+containerPort: 16509
+id: novalibvirt
+kind: Service
+port: 16509
+selector:
+  name: nova-compute
diff --git a/k8s/service/rabbitmq-service.json b/k8s/service/rabbitmq-service.json
deleted file mode 100644
index cec850c1a..000000000
--- a/k8s/service/rabbitmq-service.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "id": "rabbitmq",
-  "kind": "Service",
-  "apiVersion": "v1beta1",
-  "port": 5672,
-  "containerPort": 5672,
-  "selector": {
-    "name": "rabbitmq-master"
-  }
-}
diff --git a/k8s/service/rabbitmq-service.yaml b/k8s/service/rabbitmq-service.yaml
new file mode 100644
index 000000000..8c6bb35f8
--- /dev/null
+++ b/k8s/service/rabbitmq-service.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1beta1
+containerPort: 5672
+id: rabbitmq
+kind: Service
+port: 5672
+selector:
+  name: rabbitmq-master