summaryrefslogtreecommitdiff
path: root/k8s/pod
diff options
context:
space:
mode:
Diffstat (limited to 'k8s/pod')
-rw-r--r--k8s/pod/neutron-network-pod.yaml30
-rw-r--r--k8s/pod/neutron-server-pod.yaml (renamed from k8s/pod/neutron-controller-pod.yaml)8
-rw-r--r--k8s/pod/nova-controller-pod.yaml13
3 files changed, 43 insertions, 8 deletions
diff --git a/k8s/pod/neutron-network-pod.yaml b/k8s/pod/neutron-network-pod.yaml
new file mode 100644
index 000000000..a9fcfacd2
--- /dev/null
+++ b/k8s/pod/neutron-network-pod.yaml
@@ -0,0 +1,30 @@
+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-controller-pod.yaml b/k8s/pod/neutron-server-pod.yaml
index b614bed41..a8d18ee8b 100644
--- a/k8s/pod/neutron-controller-pod.yaml
+++ b/k8s/pod/neutron-server-pod.yaml
@@ -17,14 +17,14 @@ desiredState:
value: ADMINTOKEN
- name: NOVA_ADMIN_PASSWORD
value: kolla
- image: kollaglue/fedora-rdo-neutron-server
+ image: kollaglue/fedora-rdo-neutron-server:l3_ovs_wip
ports:
- containerPort: 9696
volumeMounts:
- name: neutron-data
mountPath: /var/lib/neutron
- id: neutron-controller-1
+ id: neutron-server-1
version: v1beta1
-id: neutron-controller
+id: neutron-server
labels:
- name: neutron
+ name: neutron-server
diff --git a/k8s/pod/nova-controller-pod.yaml b/k8s/pod/nova-controller-pod.yaml
index b7e9bce0d..903400887 100644
--- a/k8s/pod/nova-controller-pod.yaml
+++ b/k8s/pod/nova-controller-pod.yaml
@@ -2,6 +2,8 @@ desiredState:
manifest:
containers:
- env:
+ - name: NETWORK_MANAGER
+ value: neutron
- name: DB_ROOT_PASSWORD
value: password
- name: NOVA_DB_PASSWORD
@@ -10,9 +12,11 @@ desiredState:
value: ADMINTOKEN
- name: NEUTRON_SHARED_SECRET
value: sharedsecret
- image: kollaglue/fedora-rdo-nova-conductor
+ 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
@@ -21,9 +25,11 @@ desiredState:
value: ADMINTOKEN
- name: NEUTRON_SHARED_SECRET
value: sharedsecret
- image: kollaglue/fedora-rdo-nova-scheduler
+ 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
@@ -32,12 +38,11 @@ desiredState:
value: ADMINTOKEN
- name: NEUTRON_SHARED_SECRET
value: sharedsecret
- image: kollaglue/fedora-rdo-nova-api
+ image: kollaglue/fedora-rdo-nova-api:l3_ovs_wip
name: nova-api
privileged: true
id: nova-1
version: v1beta1
-
id: nova
labels:
name: nova-controller