From a6edd270db737ab414afdae1daf268b3bdadacd5 Mon Sep 17 00:00:00 2001
From: Steven Dake <sdake@redhat.com>
Date: Tue, 14 Oct 2014 11:12:45 -0700
Subject: [PATCH] Convert nova-compute-replication to yaml

Yaml is the future - json is the past

\o/

Change-Id: I36a9cbf8db034d1e8deba040a22e556d791c65ed
---
 k8s/replication/nova-compute-replication.json | 66 -------------------
 k8s/replication/nova-compute-replication.yaml | 37 +++++++++++
 2 files changed, 37 insertions(+), 66 deletions(-)
 delete mode 100644 k8s/replication/nova-compute-replication.json
 create mode 100644 k8s/replication/nova-compute-replication.yaml

diff --git a/k8s/replication/nova-compute-replication.json b/k8s/replication/nova-compute-replication.json
deleted file mode 100644
index 5acf70d583..0000000000
--- a/k8s/replication/nova-compute-replication.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "apiVersion": "v1beta1",
-    "desiredState": {
-        "podTemplate": {
-            "desiredState": {
-                "manifest": {
-                    "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"
-                          }
-                        ]
-                      },
-                    ],
-                    "id": "nova-compute-controller",
-                    "version": "v1beta1"
-                }
-            },
-            "labels": {
-                "name": "nova-compute"
-            }
-        },
-        "replicaSelector": {
-            "name": "nova-compute"
-        },
-        "replicas": 2
-    },
-    "id": "nova-compute-controller",
-    "kind": "ReplicationController",
-    "labels": {
-        "name": "nova-compute"
-    }
-}
diff --git a/k8s/replication/nova-compute-replication.yaml b/k8s/replication/nova-compute-replication.yaml
new file mode 100644
index 0000000000..ea500747f0
--- /dev/null
+++ b/k8s/replication/nova-compute-replication.yaml
@@ -0,0 +1,37 @@
+apiVersion: v1beta1
+desiredState:
+  podTemplate:
+    desiredState:
+      manifest:
+        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
+        id: nova-compute-controller
+        version: v1beta1
+    labels:
+      name: nova-compute
+  replicaSelector:
+    name: nova-compute
+  replicas: 2
+id: nova-compute-controller
+kind: ReplicationController
+labels:
+  name: nova-compute