From 2bc783b8c62c254357b1af6d2f27dde6efd497b5 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Tue, 7 Oct 2014 15:32:34 -0700 Subject: Reorganize k8s structure All services go to TLD/k8s/service All pods go to TLD/k8s/pod Change-Id: Iad2977a9f0cd5f430c4e0a566846bf4681618379 --- docker/glance/glance-api-service.json | 10 --- docker/glance/glance-registry-service.json | 10 --- docker/glance/glance.json | 60 --------------- docker/heat/heat.json | 60 --------------- docker/keystone/keystone-admin-service.json | 10 --- docker/keystone/keystone-public-service.json | 10 --- docker/keystone/keystone.json | 24 ------ docker/mariadb/mariadb-service.json | 10 --- docker/mariadb/mariadb.json | 29 ------- docker/nova-compute/nova-compute-service.json | 8 -- docker/nova-compute/nova-compute.json | 53 ------------- docker/nova-compute/nova-libvirt-service.json | 10 --- docker/nova-controller/nova-controller.json | 98 ------------------------ docker/rabbitmq/rabbitmq-service.json | 10 --- docker/rabbitmq/rabbitmq.json | 19 ----- docker/swift/swift.json | 106 -------------------------- 16 files changed, 527 deletions(-) delete mode 100644 docker/glance/glance-api-service.json delete mode 100644 docker/glance/glance-registry-service.json delete mode 100644 docker/glance/glance.json delete mode 100644 docker/heat/heat.json delete mode 100644 docker/keystone/keystone-admin-service.json delete mode 100644 docker/keystone/keystone-public-service.json delete mode 100644 docker/keystone/keystone.json delete mode 100644 docker/mariadb/mariadb-service.json delete mode 100644 docker/mariadb/mariadb.json delete mode 100644 docker/nova-compute/nova-compute-service.json delete mode 100644 docker/nova-compute/nova-compute.json delete mode 100644 docker/nova-compute/nova-libvirt-service.json delete mode 100644 docker/nova-controller/nova-controller.json delete mode 100644 docker/rabbitmq/rabbitmq-service.json delete mode 100644 docker/rabbitmq/rabbitmq.json delete mode 100644 docker/swift/swift.json (limited to 'docker') diff --git a/docker/glance/glance-api-service.json b/docker/glance/glance-api-service.json deleted file mode 100644 index c77873c5b..000000000 --- a/docker/glance/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/docker/glance/glance-registry-service.json b/docker/glance/glance-registry-service.json deleted file mode 100644 index ec557b4ee..000000000 --- a/docker/glance/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/docker/glance/glance.json b/docker/glance/glance.json deleted file mode 100644 index 94da934c6..000000000 --- a/docker/glance/glance.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "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/docker/heat/heat.json b/docker/heat/heat.json deleted file mode 100644 index dcdbcd523..000000000 --- a/docker/heat/heat.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/docker/keystone/keystone-admin-service.json b/docker/keystone/keystone-admin-service.json deleted file mode 100644 index c67d58553..000000000 --- a/docker/keystone/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/docker/keystone/keystone-public-service.json b/docker/keystone/keystone-public-service.json deleted file mode 100644 index 6768fe9e0..000000000 --- a/docker/keystone/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/docker/keystone/keystone.json b/docker/keystone/keystone.json deleted file mode 100644 index 4a1edf0db..000000000 --- a/docker/keystone/keystone.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/docker/mariadb/mariadb-service.json b/docker/mariadb/mariadb-service.json deleted file mode 100644 index d46b058cf..000000000 --- a/docker/mariadb/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/docker/mariadb/mariadb.json b/docker/mariadb/mariadb.json deleted file mode 100644 index a0c58bdaf..000000000 --- a/docker/mariadb/mariadb.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/docker/nova-compute/nova-compute-service.json b/docker/nova-compute/nova-compute-service.json deleted file mode 100644 index 8df090a5d..000000000 --- a/docker/nova-compute/nova-compute-service.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "id": "novacompute", - "kind": "Service", - "apiVersion": "v1beta1", - "selector": { - "name": "nova-compute" - } -} diff --git a/docker/nova-compute/nova-compute.json b/docker/nova-compute/nova-compute.json deleted file mode 100644 index d280a4b09..000000000 --- a/docker/nova-compute/nova-compute.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/docker/nova-compute/nova-libvirt-service.json b/docker/nova-compute/nova-libvirt-service.json deleted file mode 100644 index e14d88300..000000000 --- a/docker/nova-compute/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/docker/nova-controller/nova-controller.json b/docker/nova-controller/nova-controller.json deleted file mode 100644 index 5faae5ca9..000000000 --- a/docker/nova-controller/nova-controller.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/docker/rabbitmq/rabbitmq-service.json b/docker/rabbitmq/rabbitmq-service.json deleted file mode 100644 index cec850c1a..000000000 --- a/docker/rabbitmq/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/docker/rabbitmq/rabbitmq.json b/docker/rabbitmq/rabbitmq.json deleted file mode 100644 index 24d7511ce..000000000 --- a/docker/rabbitmq/rabbitmq.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "id": "rabbitmq-master", - "desiredState": { - "manifest": { - "version": "v1beta1", - "id": "rabbitmq-1", - "containers": [{ - "name": "rabbitmq", - "image": "docker.usersys.redhat.com/larsks/rabbitmq", - "ports": [ - {"containerPort": 5672} - ] - }] - } - }, - "labels": { - "name": "rabbitmq-master" - } -} diff --git a/docker/swift/swift.json b/docker/swift/swift.json deleted file mode 100644 index 0e21cdf71..000000000 --- a/docker/swift/swift.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" - } -} -- cgit v1.2.3