diff --git a/k8s/pod/barbican-pod.yaml b/k8s/pod/barbican-pod.yaml
deleted file mode 100644
index 274f65bb65..0000000000
--- a/k8s/pod/barbican-pod.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-apiVersion: v1beta1
-kind: Pod
-desiredState:
-  manifest:
-    containers:
-    - env:
-      - name: BARBICAN_DB_PASSWORD
-        value: password
-      - name: DB_ROOT_PASSWORD
-        value: password
-      - name: KEYSTONE_ADMIN_TOKEN
-        value: ADMINTOKEN
-      - name: BARBICAN_ADMIN_PASSWORD
-        value: kolla
-      image: kollaglue/fedora-rdo-barbican
-      name: barbican
-      ports:
-      - containerPort: 9311
-      - containerPort: 9312
-    id: barbican
-    version: v1beta1
-id: barbican
-labels:
-  name: barbican
diff --git a/k8s/pod/ceilometer-controller-pod.yaml b/k8s/pod/ceilometer-controller-pod.yaml
deleted file mode 100644
index fb387bb781..0000000000
--- a/k8s/pod/ceilometer-controller-pod.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-apiVersion: v1beta1
-kind: Pod
-desiredState:
-  manifest:
-    containers:
-    - env:
-      - name: DB_ROOT_PASSWORD
-        value: password
-      - name: CEILOMETER_DB_PASSWORD
-        value: ceilometerdbpassword
-      - name: KEYSTONE_ADMIN_TOKEN
-        value: ADMINTOKEN
-      image: kollaglue/fedora-rdo-ceilometer-api
-      name: ceilometer-api
-      ports:
-      - containerPort: 8777
-    - env:
-      - name: DB_ROOT_PASSWORD
-        value: password
-      - name: CEILOMETER_DB_PASSWORD
-        value: ceilometerdbpassword
-      - name: KEYSTONE_ADMIN_TOKEN
-        value: ADMINTOKEN
-      image: kollaglue/fedora-rdo-ceilometer-notification
-      name: ceilometer-notification
-    - env:
-      - name: DB_ROOT_PASSWORD
-        value: password
-      - name: CEILOMETER_DB_PASSWORD
-        value: ceilometerdbpassword
-      - name: KEYSTONE_ADMIN_TOKEN
-        value: ADMINTOKEN
-      image: kollaglue/fedora-rdo-ceilometer-central
-      name: ceilometer-central
-    - env:
-      - name: DB_ROOT_PASSWORD
-        value: password
-      - name: CEILOMETER_DB_PASSWORD
-        value: ceilometerdbpassword
-      - name: KEYSTONE_ADMIN_TOKEN
-        value: ADMINTOKEN
-      image: kollaglue/fedora-rdo-ceilometer-collector
-      name: ceilometer-collector
-    - env:
-      - name: DB_ROOT_PASSWORD
-        value: password
-      - name: CEILOMETER_DB_PASSWORD
-        value: ceilometerdbpassword
-      - name: KEYSTONE_ADMIN_TOKEN
-        value: ADMINTOKEN
-      image: kollaglue/fedora-rdo-ceilometer-alarm
-      name: ceilometer-alarm
-    id: ceilometer-1
-    version: v1beta1
-id: ceilometer-controller
-labels:
-  name: ceilometer-controller
diff --git a/k8s/pod/glance-pod.yaml b/k8s/pod/glance-pod.yaml
deleted file mode 100644
index bf8c0d8cad..0000000000
--- a/k8s/pod/glance-pod.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-apiVersion: v1beta1
-kind: Pod
-desiredState:
-  manifest:
-    volumes:
-      - name: glance-data
-        source:
-          emptyDir: {}
-    containers:
-      - name: glance-registry
-        env:
-          - name: DB_ROOT_PASSWORD
-            value: password
-          - name: GLANCE_KEYSTONE_PASSWORD
-            value: password
-          - name: GLANCE_DB_PASSWORD
-            value: password
-          - name: KEYSTONE_ADMIN_TOKEN
-            value: ADMINTOKEN
-        image: kollaglue/fedora-rdo-glance-registry
-        ports:
-          - containerPort: 9191
-        volumeMounts:
-          - name: glance-data
-            mountPath: /var/lib/glance
-      - name: glance-api
-        env:
-          - name: DB_ROOT_PASSWORD
-            value: password
-          - name: GLANCE_KEYSTONE_PASSWORD
-            value: password
-          - name: GLANCE_DB_PASSWORD
-            value: password
-          - name: KEYSTONE_ADMIN_TOKEN
-            value: ADMINTOKEN
-        image: kollaglue/fedora-rdo-glance-api
-        ports:
-          - containerPort: 9292
-        volumeMounts:
-          - name: glance-data
-            mountPath: /var/lib/glance
-    id: glance-1
-    version: v1beta1
-id: glance
-labels:
-  name: glance
diff --git a/k8s/pod/heat-pod.yaml b/k8s/pod/heat-pod.yaml
deleted file mode 100644
index 69babd33c9..0000000000
--- a/k8s/pod/heat-pod.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-apiVersion: v1beta1
-kind: Pod
-desiredState:
-  manifest:
-    containers:
-    - env:
-      - name: DB_ROOT_PASSWORD
-        value: password
-      - name: HEAT_DB_PASSWORD
-        value: password
-      - name: HEAT_KEYSTONE_PASSWORD
-        value: password
-      image: kollaglue/fedora-rdo-heat-engine
-      name: heat-engine
-    - env:
-      - name: DB_ROOT_PASSWORD
-        value: password
-      - name: HEAT_DB_PASSWORD
-        value: password
-      - name: HEAT_KEYSTONE_PASSWORD
-        value: password
-      - name: KEYSTONE_ADMIN_TOKEN
-        value: ADMINTOKEN
-      image: kollaglue/fedora-rdo-heat-api
-      name: heat-api
-      ports:
-      - containerPort: 8004
-    id: heat-1
-    version: v1beta1
-id: heat
-labels:
-  name: heat
diff --git a/k8s/pod/horizon-pod.yaml b/k8s/pod/horizon-pod.yaml
deleted file mode 100644
index d25a96a0a7..0000000000
--- a/k8s/pod/horizon-pod.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1beta1
-kind: Pod
-desiredState:
-  manifest:
-    containers:
-    - env:
-      image: kollaglue/fedora-rdo-horizon
-      name: horizon
-      ports:
-      - containerPort: 80
-    id: horizon-1
-    version: v1beta1
-id: horizon
-labels:
-  name: horizon
diff --git a/k8s/pod/keystone-pod.yaml b/k8s/pod/keystone-pod.yaml
deleted file mode 100644
index 0b2b1a2acd..0000000000
--- a/k8s/pod/keystone-pod.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-apiVersion: v1beta1
-kind: Pod
-desiredState:
-  manifest:
-    containers:
-    - env:
-      - name: KEYSTONE_DB_PASSWORD
-        value: password
-      - 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.yaml b/k8s/pod/mariadb-pod.yaml
deleted file mode 100644
index 4d5fb609d8..0000000000
--- a/k8s/pod/mariadb-pod.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-apiVersion: v1beta1
-kind: Pod
-desiredState:
-  manifest:
-    volumes:
-      - name: mariadb-data
-        source:
-          emptyDir: {}
-    containers:
-    - env:
-      - name: DB_ROOT_PASSWORD
-        value: password
-      image: kollaglue/fedora-rdo-mariadb
-      name: mariadb
-      ports:
-      - containerPort: 3306
-      volumeMounts:
-        - name: mariadb-data
-          mountPath: /var/lib/mysql
-    id: mariadb-1
-    version: v1beta1
-id: mariadb
-labels:
-  name: mariadb
diff --git a/k8s/pod/mongodb-pod.yaml b/k8s/pod/mongodb-pod.yaml
deleted file mode 100644
index 58d6b7be05..0000000000
--- a/k8s/pod/mongodb-pod.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: v1beta1
-kind: Pod
-desiredState:
-  manifest:
-    volumes:
-      - name: mongodb-data
-        source:
-          emptyDir: {}
-    containers:
-      image: kollaglue/fedora-rdo-mongodb
-      name: mongodb
-      ports:
-      - containerPort: 27017
-      volumeMounts:
-        - name: mongodb-data
-          mountPath: /data/db
-    id: mongodb-1
-    version: v1beta1
-id: mongodb
-labels:
-  name: mongodb
diff --git a/k8s/pod/neutron-network-pod.yaml b/k8s/pod/neutron-network-pod.yaml
deleted file mode 100644
index 834244c1a3..0000000000
--- a/k8s/pod/neutron-network-pod.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-apiVersion: v1beta1
-kind: Pod
-desiredState:
-  manifest:
-    containers:
-      - name: neutron-linux-bridge
-        image: kollaglue/fedora-rdo-linux-bridge:l3_ovs_wip
-        env:
-          - name: CONFIG_NETWORK
-            value: true
-          - name: NEUTRON_KEYSTONE_PASSWORD
-            value: password
-      - name: neutron-l3-agent
-        image: kollaglue/fedora-rdo-l3:l3_ovs_wip
-        env:
-          - name: NEUTRON_KEYSTONE_PASSWORD
-            value: password
-      - name: neutron-dhcp-agent
-        image: kollaglue/fedora-rdo-dhcp:l3_ovs_wip
-        env:
-          - name: NEUTRON_KEYSTONE_PASSWORD
-            value: password
-      - name: neutron-metadata-agent
-        image: kollaglue/fedora-rdo-metadata:l3_ovs_wip
-        env:
-          - name: NEUTRON_KEYSTONE_PASSWORD
-            value: password
-    id: neutron-network-1
-    version: v1beta1
-id: neutron-network
-labels:
-  name: neutron-network
diff --git a/k8s/pod/neutron-server-pod.yaml b/k8s/pod/neutron-server-pod.yaml
deleted file mode 100644
index 0a2879134f..0000000000
--- a/k8s/pod/neutron-server-pod.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-apiVersion: v1beta1
-kind: Pod
-desiredState:
-  manifest:
-    volumes:
-      - name: neutron-data
-        source:
-          emptyDir: {}
-    containers:
-      - name: neutron-server
-        env:
-          - name: DB_ROOT_PASSWORD
-            value: password
-          - name: NEUTRON_DB_PASSWORD
-            value: password
-          - name: NEUTRON_KEYSTONE_PASSWORD
-            value: password
-          - name: KEYSTONE_ADMIN_TOKEN
-            value: ADMINTOKEN
-          - name: NOVA_ADMIN_PASSWORD
-            value: kolla
-        image: kollaglue/fedora-rdo-neutron-server:l3_ovs_wip
-        ports:
-          - containerPort: 9696
-        volumeMounts:
-          - name: neutron-data
-            mountPath: /var/lib/neutron
-    id: neutron-server-1
-    version: v1beta1
-id: neutron-server
-labels:
-  name: neutron-server
diff --git a/k8s/pod/nova-compute-pod.yaml b/k8s/pod/nova-compute-pod.yaml
deleted file mode 100644
index 37a3c2c8a7..0000000000
--- a/k8s/pod/nova-compute-pod.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-apiVersion: v1beta1
-kind: Pod
-desiredState:
-  manifest:
-    containers:
-      - 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-compute
-        privileged: true
-      - name: nova-network
-        env:
-          - name: DB_ROOT_PASSWORD
-            value: password
-          - name: NOVA_DB_PASSWORD
-            value: novadbpassword
-          - name: KEYSTONE_ADMIN_TOKEN
-            value: ADMINTOKEN
-          - name: CONFIG_NETWORK
-            value: true
-        image: kollaglue/fedora-rdo-nova-network
-        privileged: true
-      - name: ceilometer-compute
-        env:
-          - name: DB_ROOT_PASSWORD
-            value: password
-          - name: CEILOMETER_DB_PASSWORD
-            value: ceilometerdbpassword
-          - name: KEYSTONE_ADMIN_TOKEN
-            value: ADMINTOKEN
-        image: kollaglue/fedora-rdo-ceilometer-compute
-    id: nova-1
-    version: v1beta1
-id: nova-compute
-labels:
-  name: nova-compute
diff --git a/k8s/pod/nova-controller-pod.yaml b/k8s/pod/nova-controller-pod.yaml
deleted file mode 100644
index 393f58a1e5..0000000000
--- a/k8s/pod/nova-controller-pod.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-apiVersion: v1beta1
-kind: Pod
-desiredState:
-  manifest:
-    containers:
-    - env:
-      - name: NETWORK_MANAGER
-        value: neutron
-      - name: DB_ROOT_PASSWORD
-        value: password
-      - name: NOVA_DB_PASSWORD
-        value: novadbpassword
-      - name: KEYSTONE_ADMIN_TOKEN
-        value: ADMINTOKEN
-      - name: NEUTRON_SHARED_SECRET
-        value: sharedsecret
-      image: kollaglue/fedora-rdo-nova-conductor:l3_ovs_wip
-      name: nova-conductor
-    - env:
-      - name: NETWORK_MANAGER
-        value: neutron
-      - name: DB_ROOT_PASSWORD
-        value: password
-      - name: NOVA_DB_PASSWORD
-        value: novadbpassword
-      - name: KEYSTONE_ADMIN_TOKEN
-        value: ADMINTOKEN
-      - name: NEUTRON_SHARED_SECRET
-        value: sharedsecret
-      image: kollaglue/fedora-rdo-nova-scheduler:l3_ovs_wip
-      name: nova-scheduler
-    - env:
-      - name: NETWORK_MANAGER
-        value: neutron
-      - name: DB_ROOT_PASSWORD
-        value: password
-      - name: NOVA_DB_PASSWORD
-        value: novadbpassword
-      - name: KEYSTONE_ADMIN_TOKEN
-        value: ADMINTOKEN
-      - name: NEUTRON_SHARED_SECRET
-        value: sharedsecret
-      image: kollaglue/fedora-rdo-nova-api:l3_ovs_wip
-      name: nova-api
-      privileged: true
-    id: nova-1
-    version: v1beta1
-id: nova-controller
-labels:
-  name: nova-controller
diff --git a/k8s/pod/rabbitmq-pod.yaml b/k8s/pod/rabbitmq-pod.yaml
deleted file mode 100644
index 676e7b2e59..0000000000
--- a/k8s/pod/rabbitmq-pod.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: v1beta1
-kind: Pod
-desiredState:
-  manifest:
-    containers:
-    - image: kollaglue/fedora-rdo-rabbitmq
-      name: rabbitmq
-      ports:
-      - containerPort: 5672
-    id: rabbitmq-1
-    version: v1beta1
-id: rabbitmq
-labels:
-  name: rabbitmq
diff --git a/k8s/pod/swift-pod.yaml b/k8s/pod/swift-pod.yaml
deleted file mode 100644
index 0f61fe6343..0000000000
--- a/k8s/pod/swift-pod.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-apiVersion: v1beta1
-kind: Pod
-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/pod/zaqar-pod.yaml b/k8s/pod/zaqar-pod.yaml
deleted file mode 100644
index 3f4696c680..0000000000
--- a/k8s/pod/zaqar-pod.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: v1beta1
-kind: Pod
-desiredState:
-  manifest:
-    containers:
-    - env:
-      - name: ZAQAR_DB_PASSWORD
-        value: password
-      - name: ZAQAR_KEYSTONE_PASSWORD
-        value: password
-      - name: KEYSTONE_ADMIN_TOKEN
-        value: ADMINTOKEN
-      image: kollaglue/fedora-rdo-zaqar
-      name: zaqar-server
-      ports:
-      - containerPort: 8004
-    id: zaqar-1
-    version: v1beta1
-id: zaqar
-labels:
-  name: zaqar
diff --git a/k8s/replication/nova-compute-replication.yaml b/k8s/replication/nova-compute-replication.yaml
deleted file mode 100644
index 0929d558be..0000000000
--- a/k8s/replication/nova-compute-replication.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-apiVersion: v1beta1
-desiredState:
-  podTemplate:
-    desiredState:
-      manifest:
-        containers:
-        - name: nova-compute
-          image: kollaglue/fedora-rdo-nova-compute
-          ports:
-          - containerPort: 12000
-            hostPort: 12000
-          privileged: true
-          env:
-          - name: DB_ROOT_PASSWORD
-            value: password
-          - name: NOVA_DB_PASSWORD
-            value: novadbpassword
-          - name: KEYSTONE_ADMIN_TOKEN
-            value: ADMINTOKEN
-        - name: nova-network
-          image: kollaglue/fedora-rdo-nova-network
-          ports:
-          - containerPort: 12001
-            hostPort: 12001
-          privileged: true
-          env:
-          - name: DB_ROOT_PASSWORD
-            value: password
-          - name: NOVA_DB_PASSWORD
-            value: novadbpassword
-          - name: KEYSTONE_ADMIN_TOKEN
-            value: ADMINTOKEN
-        id: nova-compute
-        version: v1beta1
-    labels:
-      name: nova-compute
-  replicaSelector:
-    name: nova-compute
-  replicas: 6
-id: nova-compute
-kind: ReplicationController
-labels:
-  name: nova-compute
diff --git a/k8s/service/barbican-admin-service.yaml b/k8s/service/barbican-admin-service.yaml
deleted file mode 100644
index b2a2a88aac..0000000000
--- a/k8s/service/barbican-admin-service.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1beta1
-containerPort: 9312
-id: barbican-admin
-kind: Service
-port: 9312
-selector:
-  name: barbican
diff --git a/k8s/service/barbican-public-service.yaml b/k8s/service/barbican-public-service.yaml
deleted file mode 100644
index c555dde3af..0000000000
--- a/k8s/service/barbican-public-service.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1beta1
-containerPort: 9311
-id: barbican-public
-kind: Service
-port: 9311
-selector:
-  name: barbican
diff --git a/k8s/service/ceilometer-api-service.yaml b/k8s/service/ceilometer-api-service.yaml
deleted file mode 100644
index e831cf4817..0000000000
--- a/k8s/service/ceilometer-api-service.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1beta1
-containerPort: 8777
-id: ceilometer-api
-kind: Service
-port: 8777
-selector:
-  name: ceilometer-controller
diff --git a/k8s/service/glance-api-service.yaml b/k8s/service/glance-api-service.yaml
deleted file mode 100644
index 42e8c5c656..0000000000
--- a/k8s/service/glance-api-service.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1beta1
-containerPort: 9292
-id: glance-api
-kind: Service
-port: 9292
-selector:
-  name: glance
diff --git a/k8s/service/glance-registry-service.yaml b/k8s/service/glance-registry-service.yaml
deleted file mode 100644
index 8cd81f5049..0000000000
--- a/k8s/service/glance-registry-service.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1beta1
-containerPort: 9191
-id: glance-registry
-kind: Service
-port: 9191
-selector:
-  name: glance
diff --git a/k8s/service/heat-api-service.yaml b/k8s/service/heat-api-service.yaml
deleted file mode 100644
index 875d8ded80..0000000000
--- a/k8s/service/heat-api-service.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1beta1
-containerPort: 8004
-id: heat-api
-kind: Service
-port: 8004
-selector:
-  name: heat
diff --git a/k8s/service/horizon-service.yaml b/k8s/service/horizon-service.yaml
deleted file mode 100644
index 7b03b56847..0000000000
--- a/k8s/service/horizon-service.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1beta1
-containerPort: 80
-id: horizon
-kind: Service
-port: 80
-selector:
-  name: horizon
diff --git a/k8s/service/keystone-admin-service.yaml b/k8s/service/keystone-admin-service.yaml
deleted file mode 100644
index 59114c249a..0000000000
--- a/k8s/service/keystone-admin-service.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1beta1
-containerPort: 35357
-id: keystone-admin
-kind: Service
-port: 35357
-selector:
-  name: keystone
diff --git a/k8s/service/keystone-public-service.yaml b/k8s/service/keystone-public-service.yaml
deleted file mode 100644
index 83ea2b7346..0000000000
--- a/k8s/service/keystone-public-service.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1beta1
-containerPort: 5000
-id: keystone-public
-kind: Service
-port: 5000
-selector:
-  name: keystone
diff --git a/k8s/service/mariadb-service.yaml b/k8s/service/mariadb-service.yaml
deleted file mode 100644
index c0aaa14fe7..0000000000
--- a/k8s/service/mariadb-service.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1beta1
-containerPort: 3306
-id: mariadb
-kind: Service
-port: 3306
-selector:
-  name: mariadb
diff --git a/k8s/service/mongodb-service.yaml b/k8s/service/mongodb-service.yaml
deleted file mode 100644
index 4b8c94197f..0000000000
--- a/k8s/service/mongodb-service.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1beta1
-containerPort: 27017
-id: mongodb
-kind: Service
-port: 27017
-selector:
-  name: mongodb
diff --git a/k8s/service/neutron-server-service.yaml b/k8s/service/neutron-server-service.yaml
deleted file mode 100644
index 148ea4da26..0000000000
--- a/k8s/service/neutron-server-service.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-id: neutron-server
-kind: Service
-apiVersion: v1beta1
-port: 9696
-containerPort: 9696
-selector:
-  name: neutron-server
diff --git a/k8s/service/nova-api-service.yaml b/k8s/service/nova-api-service.yaml
deleted file mode 100644
index 40bd63a7b7..0000000000
--- a/k8s/service/nova-api-service.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1beta1
-containerPort: 8774
-id: nova-api
-kind: Service
-port: 8774
-selector:
-  name: nova-controller
diff --git a/k8s/service/nova-ec2-api-service.yaml b/k8s/service/nova-ec2-api-service.yaml
deleted file mode 100644
index fe2db8ff51..0000000000
--- a/k8s/service/nova-ec2-api-service.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1beta1
-containerPort: 8773
-id: nova-ec2-api
-kind: Service
-port: 8773
-selector:
-  name: nova-controller
diff --git a/k8s/service/nova-libvirt-service.yaml b/k8s/service/nova-libvirt-service.yaml
deleted file mode 100644
index 76dd911dd6..0000000000
--- a/k8s/service/nova-libvirt-service.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1beta1
-containerPort: 16509
-id: nova-libvirt
-kind: Service
-port: 16509
-selector:
-  name: nova-compute
diff --git a/k8s/service/nova-metadata-api-service.yaml b/k8s/service/nova-metadata-api-service.yaml
deleted file mode 100644
index 5783b2fddd..0000000000
--- a/k8s/service/nova-metadata-api-service.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1beta1
-containerPort: 8775
-id: nova-metadata-api
-kind: Service
-port: 8775
-selector:
-  name: nova-controller
diff --git a/k8s/service/nova-novncproxy-service.yaml b/k8s/service/nova-novncproxy-service.yaml
deleted file mode 100644
index 099d844a20..0000000000
--- a/k8s/service/nova-novncproxy-service.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1beta1
-containerPort: 6080
-id: nova-novncproxy
-kind: Service
-port: 6080
-selector:
-  name: nova-controller
diff --git a/k8s/service/rabbitmq-service.yaml b/k8s/service/rabbitmq-service.yaml
deleted file mode 100644
index c0de65e2b2..0000000000
--- a/k8s/service/rabbitmq-service.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1beta1
-containerPort: 5672
-id: rabbitmq
-kind: Service
-port: 5672
-selector:
-  name: rabbitmq
diff --git a/k8s/service/zaqar-server-service.yaml b/k8s/service/zaqar-server-service.yaml
deleted file mode 100644
index bbb351f220..0000000000
--- a/k8s/service/zaqar-server-service.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1beta1
-containerPort: 8888
-id: zaqar-server
-kind: Service
-port: 8888
-selector:
-  name: zaqar
diff --git a/tools/start b/tools/start
deleted file mode 100755
index d0d3f7bc48..0000000000
--- a/tools/start
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-REAL_PATH=$(python -c "import os,sys;print os.path.realpath('$0')")
-cd "$(dirname "$REAL_PATH")/.."
-
-./tools/start-all-services
-./tools/start-all-replications
-./tools/start-all-pods
diff --git a/tools/start-all-pods b/tools/start-all-pods
deleted file mode 100755
index 8bad8d0ffe..0000000000
--- a/tools/start-all-pods
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-REAL_PATH=$(python -c "import os,sys;print os.path.realpath('$0')")
-cd "$(dirname "$REAL_PATH")/.."
-
-pods='
-rabbitmq
-mariadb
-keystone
-glance
-nova-controller
-nova-compute
-neutron-server
-heat
-mongodb
-ceilometer-controller
-zaqar
-horizon
-'
-
-for pod in $pods; do
-    kubectl create -f "k8s/pod/${pod}-pod.yaml"
-done
-
diff --git a/tools/start-all-replications b/tools/start-all-replications
deleted file mode 100755
index 8adc0430f2..0000000000
--- a/tools/start-all-replications
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-REAL_PATH=$(python -c "import os,sys;print os.path.realpath('$0')")
-cd "$(dirname "$REAL_PATH")/.."
-
-services='
-nova-compute
-'
-
-for svc in $services; do
-    kubectl create -f "k8s/replication/${svc}-replication.yaml"
-done
-
diff --git a/tools/start-all-services b/tools/start-all-services
deleted file mode 100755
index 23a8e4c1ca..0000000000
--- a/tools/start-all-services
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-REAL_PATH=$(python -c "import os,sys;print os.path.realpath('$0')")
-cd "$(dirname "$REAL_PATH")/.."
-
-services='
-ceilometer-api
-glance-api
-glance-registry
-keystone-admin
-keystone-public
-mariadb
-mongodb
-nova-api
-nova-ec2-api
-nova-libvirt
-nova-metadata-api
-rabbitmq
-neutron-server
-heat-api
-zaqar-server
-horizon
-'
-
-for svc in $services; do
-    kubectl create -f "k8s/service/${svc}-service.yaml"
-done
-
diff --git a/tools/stop b/tools/stop
deleted file mode 100755
index 2a914d9175..0000000000
--- a/tools/stop
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-REAL_PATH=$(python -c "import os,sys;print os.path.realpath('$0')")
-cd "$(dirname "$REAL_PATH")/.."
-
-./tools/stop-all-replications
-./tools/stop-all-pods
-./tools/stop-all-services
-
diff --git a/tools/stop-all-pods b/tools/stop-all-pods
deleted file mode 100755
index f18f822818..0000000000
--- a/tools/stop-all-pods
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-REAL_PATH=$(python -c "import os,sys;print os.path.realpath('$0')")
-cd "$(dirname "$REAL_PATH")/.."
-
-UUID_REGEX="[a-f0-9]{8}(-[a-f0-9]{4}){3}-[a-f0-9]{12}"
-
-pods=$(kubectl get pods -o template -t '{{range .items}}{{.id}} {{end}}')
-for pod in $pods; do
-    if [[ $pod =~ $UUID_REGEX ]]; then
-	# Stopping a k8s replicationController doesn't delete the associated
-	# pods, which names are UUIDs.
-	# Assuming all pods named by UUID are leftover replication pods.
-	kubectl delete pod $pod
-    else
-	kubectl delete -f "k8s/pod/${pod}-pod.yaml" 2>/dev/null
-    fi
-done
diff --git a/tools/stop-all-replications b/tools/stop-all-replications
deleted file mode 100755
index 014ecb3bf0..0000000000
--- a/tools/stop-all-replications
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-REAL_PATH=$(python -c "import os,sys;print os.path.realpath('$0')")
-cd "$(dirname "$REAL_PATH")/.."
-
-replication_ctrs=$(kubectl get replicationController | awk 'NR>1 {print $1}')
-
-for replication_ctr in $replication_ctrs; do
-    kubectl delete -f "k8s/replication/${replication_ctr}-replication.yaml"
-done
-
diff --git a/tools/stop-all-services b/tools/stop-all-services
deleted file mode 100755
index 14e4942b3c..0000000000
--- a/tools/stop-all-services
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-REAL_PATH=$(python -c "import os,sys;print os.path.realpath('$0')")
-cd "$(dirname "$REAL_PATH")/.."
-
-services=$(kubectl get services | awk 'NR>1 {print $1}')
-
-for service in $services; do
-    kubectl delete -f "k8s/service/${service}-service.yaml" 2>/dev/null
-done