diff options
Diffstat (limited to 'k8s')
| -rw-r--r-- | k8s/pod/barbican-pod.yaml | 2 | ||||
| -rw-r--r-- | k8s/pod/ceilometer-controller-pod.yaml | 4 | ||||
| -rw-r--r-- | k8s/pod/glance-pod.yaml | 2 | ||||
| -rw-r--r-- | k8s/pod/heat-pod.yaml | 2 | ||||
| -rw-r--r-- | k8s/pod/horizon-pod.yaml | 2 | ||||
| -rw-r--r-- | k8s/pod/keystone-pod.yaml | 2 | ||||
| -rw-r--r-- | k8s/pod/mariadb-pod.yaml | 2 | ||||
| -rw-r--r-- | k8s/pod/mongodb-pod.yaml | 2 | ||||
| -rw-r--r-- | k8s/pod/neutron-network-pod.yaml | 2 | ||||
| -rw-r--r-- | k8s/pod/neutron-server-pod.yaml | 2 | ||||
| -rw-r--r-- | k8s/pod/nova-compute-pod.yaml | 2 | ||||
| -rw-r--r-- | k8s/pod/nova-controller-pod.yaml | 4 | ||||
| -rw-r--r-- | k8s/pod/rabbitmq-pod.yaml | 6 | ||||
| -rw-r--r-- | k8s/pod/swift-pod.yaml | 2 | ||||
| -rw-r--r-- | k8s/pod/zaqar-pod.yaml | 2 | ||||
| -rw-r--r-- | k8s/replication/nova-compute-replication.yaml | 4 |
16 files changed, 36 insertions, 6 deletions
diff --git a/k8s/pod/barbican-pod.yaml b/k8s/pod/barbican-pod.yaml index 1a79adbac..274f65bb6 100644 --- a/k8s/pod/barbican-pod.yaml +++ b/k8s/pod/barbican-pod.yaml @@ -1,3 +1,5 @@ +apiVersion: v1beta1 +kind: Pod desiredState: manifest: containers: diff --git a/k8s/pod/ceilometer-controller-pod.yaml b/k8s/pod/ceilometer-controller-pod.yaml index ef94094f5..fb387bb78 100644 --- a/k8s/pod/ceilometer-controller-pod.yaml +++ b/k8s/pod/ceilometer-controller-pod.yaml @@ -1,3 +1,5 @@ +apiVersion: v1beta1 +kind: Pod desiredState: manifest: containers: @@ -50,6 +52,6 @@ desiredState: name: ceilometer-alarm id: ceilometer-1 version: v1beta1 -id: ceilometer +id: ceilometer-controller labels: name: ceilometer-controller diff --git a/k8s/pod/glance-pod.yaml b/k8s/pod/glance-pod.yaml index a7b8e2944..bf8c0d8ca 100644 --- a/k8s/pod/glance-pod.yaml +++ b/k8s/pod/glance-pod.yaml @@ -1,3 +1,5 @@ +apiVersion: v1beta1 +kind: Pod desiredState: manifest: volumes: diff --git a/k8s/pod/heat-pod.yaml b/k8s/pod/heat-pod.yaml index a4eb0de57..69babd33c 100644 --- a/k8s/pod/heat-pod.yaml +++ b/k8s/pod/heat-pod.yaml @@ -1,3 +1,5 @@ +apiVersion: v1beta1 +kind: Pod desiredState: manifest: containers: diff --git a/k8s/pod/horizon-pod.yaml b/k8s/pod/horizon-pod.yaml index a7f64c22e..d25a96a0a 100644 --- a/k8s/pod/horizon-pod.yaml +++ b/k8s/pod/horizon-pod.yaml @@ -1,3 +1,5 @@ +apiVersion: v1beta1 +kind: Pod desiredState: manifest: containers: diff --git a/k8s/pod/keystone-pod.yaml b/k8s/pod/keystone-pod.yaml index cead5dd14..0b2b1a2ac 100644 --- a/k8s/pod/keystone-pod.yaml +++ b/k8s/pod/keystone-pod.yaml @@ -1,3 +1,5 @@ +apiVersion: v1beta1 +kind: Pod desiredState: manifest: containers: diff --git a/k8s/pod/mariadb-pod.yaml b/k8s/pod/mariadb-pod.yaml index 493a393e6..4d5fb609d 100644 --- a/k8s/pod/mariadb-pod.yaml +++ b/k8s/pod/mariadb-pod.yaml @@ -1,3 +1,5 @@ +apiVersion: v1beta1 +kind: Pod desiredState: manifest: volumes: diff --git a/k8s/pod/mongodb-pod.yaml b/k8s/pod/mongodb-pod.yaml index 17663a726..58d6b7be0 100644 --- a/k8s/pod/mongodb-pod.yaml +++ b/k8s/pod/mongodb-pod.yaml @@ -1,3 +1,5 @@ +apiVersion: v1beta1 +kind: Pod desiredState: manifest: volumes: diff --git a/k8s/pod/neutron-network-pod.yaml b/k8s/pod/neutron-network-pod.yaml index a9fcfacd2..834244c1a 100644 --- a/k8s/pod/neutron-network-pod.yaml +++ b/k8s/pod/neutron-network-pod.yaml @@ -1,3 +1,5 @@ +apiVersion: v1beta1 +kind: Pod desiredState: manifest: containers: diff --git a/k8s/pod/neutron-server-pod.yaml b/k8s/pod/neutron-server-pod.yaml index a8d18ee8b..0a2879134 100644 --- a/k8s/pod/neutron-server-pod.yaml +++ b/k8s/pod/neutron-server-pod.yaml @@ -1,3 +1,5 @@ +apiVersion: v1beta1 +kind: Pod desiredState: manifest: volumes: diff --git a/k8s/pod/nova-compute-pod.yaml b/k8s/pod/nova-compute-pod.yaml index 6b7a72d57..37a3c2c8a 100644 --- a/k8s/pod/nova-compute-pod.yaml +++ b/k8s/pod/nova-compute-pod.yaml @@ -1,3 +1,5 @@ +apiVersion: v1beta1 +kind: Pod desiredState: manifest: containers: diff --git a/k8s/pod/nova-controller-pod.yaml b/k8s/pod/nova-controller-pod.yaml index 903400887..393f58a1e 100644 --- a/k8s/pod/nova-controller-pod.yaml +++ b/k8s/pod/nova-controller-pod.yaml @@ -1,3 +1,5 @@ +apiVersion: v1beta1 +kind: Pod desiredState: manifest: containers: @@ -43,6 +45,6 @@ desiredState: privileged: true id: nova-1 version: v1beta1 -id: nova +id: nova-controller labels: name: nova-controller diff --git a/k8s/pod/rabbitmq-pod.yaml b/k8s/pod/rabbitmq-pod.yaml index c8d3d32b3..676e7b2e5 100644 --- a/k8s/pod/rabbitmq-pod.yaml +++ b/k8s/pod/rabbitmq-pod.yaml @@ -1,3 +1,5 @@ +apiVersion: v1beta1 +kind: Pod desiredState: manifest: containers: @@ -7,6 +9,6 @@ desiredState: - containerPort: 5672 id: rabbitmq-1 version: v1beta1 -id: rabbitmq-master +id: rabbitmq labels: - name: rabbitmq-master + name: rabbitmq diff --git a/k8s/pod/swift-pod.yaml b/k8s/pod/swift-pod.yaml index f8c3a057d..0f61fe634 100644 --- a/k8s/pod/swift-pod.yaml +++ b/k8s/pod/swift-pod.yaml @@ -1,3 +1,5 @@ +apiVersion: v1beta1 +kind: Pod desiredState: manifest: containers: diff --git a/k8s/pod/zaqar-pod.yaml b/k8s/pod/zaqar-pod.yaml index b2564d52d..3f4696c68 100644 --- a/k8s/pod/zaqar-pod.yaml +++ b/k8s/pod/zaqar-pod.yaml @@ -1,3 +1,5 @@ +apiVersion: v1beta1 +kind: Pod desiredState: manifest: containers: diff --git a/k8s/replication/nova-compute-replication.yaml b/k8s/replication/nova-compute-replication.yaml index 569436b3d..0929d558b 100644 --- a/k8s/replication/nova-compute-replication.yaml +++ b/k8s/replication/nova-compute-replication.yaml @@ -30,14 +30,14 @@ desiredState: value: novadbpassword - name: KEYSTONE_ADMIN_TOKEN value: ADMINTOKEN - id: nova-compute-controller + id: nova-compute version: v1beta1 labels: name: nova-compute replicaSelector: name: nova-compute replicas: 6 -id: nova-compute-controller +id: nova-compute kind: ReplicationController labels: name: nova-compute |