diff options
| author | Steven Dake <sdake@redhat.com> | 2014-10-14 11:12:45 -0700 |
|---|---|---|
| committer | Steven Dake <sdake@redhat.com> | 2014-10-14 11:13:24 -0700 |
| commit | a6edd270db737ab414afdae1daf268b3bdadacd5 (patch) | |
| tree | 44bb30a08bba2d29356fd7c9742889ac0a0d6842 | |
| parent | 20e88776bc9b85b2a3a0f7a86004f6b04520e9a8 (diff) | |
| download | kolla-a6edd270db737ab414afdae1daf268b3bdadacd5.tar.gz kolla-a6edd270db737ab414afdae1daf268b3bdadacd5.zip | |
Convert nova-compute-replication to yaml
Yaml is the future - json is the past
\o/
Change-Id: I36a9cbf8db034d1e8deba040a22e556d791c65ed
| -rw-r--r-- | k8s/replication/nova-compute-replication.json | 66 | ||||
| -rw-r--r-- | k8s/replication/nova-compute-replication.yaml | 37 |
2 files changed, 37 insertions, 66 deletions
diff --git a/k8s/replication/nova-compute-replication.json b/k8s/replication/nova-compute-replication.json deleted file mode 100644 index 5acf70d58..000000000 --- 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 000000000..ea500747f --- /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 |