From f839e5f4aa90b2f4d7245a1b50276e4ff96578d7 Mon Sep 17 00:00:00 2001 From: Kevin Fox Date: Sun, 11 Sep 2016 09:39:18 -0700 Subject: [PATCH] remove redundant -configmap from names And fix pv/pvc issues. Partially-Implements: blueprint redundant-cli-info Change-Id: I7c6b55a95f576f351fd14918d2e3421ac6b43181 --- etc/kolla-kubernetes/service_resources.yml | 94 ++++++++++--------- kolla_kubernetes/commands/cmd_resource.py | 19 ++-- kolla_kubernetes/tests/test_templates.py | 4 +- services/cinder/cinder-api-pod.yml.j2 | 2 +- services/cinder/cinder-backup-pod.yml.j2 | 2 +- .../cinder-bootstrap-job-create-db.yml.j2 | 2 +- .../cinder-bootstrap-job-endpoints.yml.j2 | 2 +- .../cinder-bootstrap-job-manage-db.yml.j2 | 2 +- services/cinder/cinder-scheduler-pod.yml.j2 | 2 +- services/cinder/cinder-volume-lvm-pod.yml.j2 | 2 +- services/common/common-pv.yml.j2 | 2 +- services/common/common-pvc.yml.j2 | 2 +- services/glance/glance-api-pod.yml.j2 | 2 +- .../glance-bootstrap-job-manage-db.yml.j2 | 2 +- services/glance/glance-registry-pod.yml.j2 | 2 +- services/horizon/horizon-pod.yml.j2 | 2 +- .../keystone/keystone-bootstrap-job.yml.j2 | 2 +- services/keystone/keystone-pod.yml.j2 | 2 +- services/mariadb/mariadb-bootstrap-job.yml.j2 | 2 +- services/mariadb/mariadb-pod.yml.j2 | 2 +- services/memcached/memcached-pod.yml.j2 | 2 +- services/neutron/neutron-bootstrap-job.yml.j2 | 2 +- .../neutron-dhcp-agent-daemonset.yml.j2 | 6 +- .../neutron/neutron-l3-agent-daemonset.yml.j2 | 2 +- .../neutron-metadata-agent-daemonset.yml.j2 | 2 +- ...neutron-openvswitch-agent-daemonset.yml.j2 | 2 +- services/neutron/neutron-server-pod.yml.j2 | 2 +- .../nova/nova-compute-bootstrap-job.yml.j2 | 2 +- services/nova/nova-compute-pod.yml.j2 | 2 +- services/nova/nova-control-api-pod.yml.j2 | 2 +- ...ol-bootstrap-job-create-nova-api-db.yml.j2 | 2 +- ...ontrol-bootstrap-job-create-nova-db.yml.j2 | 2 +- ...bootstrap-job-create-nova-endpoints.yml.j2 | 2 +- .../nova/nova-control-conductor-pod.yml.j2 | 2 +- .../nova/nova-control-scheduler-pod.yml.j2 | 2 +- services/nova/nova-libvirt-pod.yml.j2 | 2 +- .../openvswitch-ovsdb-daemonset.yml.j2 | 2 +- .../openvswitch-vswitchd-daemonset.yml.j2 | 2 +- .../rabbitmq/rabbitmq-bootstrap-job.yml.j2 | 2 +- services/rabbitmq/rabbitmq-pod.yml.j2 | 2 +- services/swift/swift-account-pod.yml.j2 | 10 +- services/swift/swift-container-pod.yml.j2 | 10 +- services/swift/swift-object-pod.yml.j2 | 12 +-- services/swift/swift-proxy-pod.yml.j2 | 2 +- 44 files changed, 123 insertions(+), 106 deletions(-) diff --git a/etc/kolla-kubernetes/service_resources.yml b/etc/kolla-kubernetes/service_resources.yml index 9a1afcac2..e1945160f 100644 --- a/etc/kolla-kubernetes/service_resources.yml +++ b/etc/kolla-kubernetes/service_resources.yml @@ -42,7 +42,7 @@ kolla-kubernetes: resources: secret: configmap: - - name: mariadb-configmap + - name: mariadb disk: - name: mariadb template: services/common/common-disk.sh.j2 @@ -52,11 +52,13 @@ kolla-kubernetes: - name: mariadb template: services/common/common-pv.yml.j2 vars: + name: mariadb size_in_gb: 10 pvc: - name: mariadb template: services/common/common-pvc.yml.j2 vars: + name: mariadb size_in_gb: 10 svc: - name: mariadb @@ -74,7 +76,7 @@ kolla-kubernetes: - name: memcached resources: configmap: - - name: memcached-configmap + - name: memcached secret: disk: pv: @@ -93,7 +95,7 @@ kolla-kubernetes: - name: keystone resources: configmap: - - name: keystone-configmap + - name: keystone secret: disk: pv: @@ -116,7 +118,7 @@ kolla-kubernetes: - name: horizon resources: configmap: - - name: horizon-configmap + - name: horizon secret: disk: pv: @@ -135,7 +137,7 @@ kolla-kubernetes: - name: rabbitmq resources: configmap: - - name: rabbitmq-configmap + - name: rabbitmq secret: disk: - name: rabbitmq @@ -146,11 +148,13 @@ kolla-kubernetes: - name: rabbitmq template: services/common/common-pv.yml.j2 vars: + name: rabbitmq size_in_gb: 10 pvc: - name: rabbitmq template: services/common/common-pvc.yml.j2 vars: + name: rabbitmq size_in_gb: 10 svc: - name: rabbitmq-management @@ -171,14 +175,14 @@ kolla-kubernetes: - name: glance-registry resources: configmap: - - name: glance-api-configmap - - name: glance-registry-configmap - - name: glance-api-haproxy-configmap + - name: glance-api + - name: glance-registry + - name: glance-api-haproxy template: services/common/api-haproxy-configmap.yml.j2 vars: configmap_name: glance-api-haproxy port_name: glance_api_port - - name: glance-registry-haproxy-configmap + - name: glance-registry-haproxy template: services/common/api-haproxy-configmap.yml.j2 vars: configmap_name: glance-registry-haproxy @@ -193,11 +197,13 @@ kolla-kubernetes: - name: glance template: services/common/common-pv.yml.j2 vars: + name: glance size_in_gb: 10 pvc: - name: glance template: services/common/common-pvc.yml.j2 vars: + name: glance size_in_gb: 10 svc: - name: glance-api @@ -239,10 +245,10 @@ kolla-kubernetes: - name: nova-conductor resources: configmap: - - name: nova-api-configmap - - name: nova-compute-configmap - - name: nova-conductor-configmap - - name: nova-scheduler-configmap + - name: nova-api + - name: nova-compute + - name: nova-conductor + - name: nova-scheduler secret: disk: pv: @@ -290,8 +296,8 @@ kolla-kubernetes: - name: openvswitch-vswitchd resources: configmaps: - - name: openvswitch-db-server-configmap - - name: openvswitch-vswitchd-configmap + - name: openvswitch-db-server + - name: openvswitch-vswitchd secret: disk: pv: @@ -333,11 +339,11 @@ kolla-kubernetes: - name: neutron-server resources: configmap: - - name: neutron-server-configmap - - name: neutron-dhcp-agent-configmap - - name: neutron-l3-agent-configmap - - name: neutron-metadata-agent-configmap - - name: neutron-openvswitch-agent-configmap + - name: neutron-server + - name: neutron-dhcp-agent + - name: neutron-l3-agent + - name: neutron-metadata-agent + - name: neutron-openvswitch-agent secret: disk: pv: @@ -406,23 +412,23 @@ kolla-kubernetes: - name: swift-proxy-server resources: configmap: - - name: swift-rsyncd-configmap - - name: swift-account-server-configmap - - name: swift-account-auditor-configmap - - name: swift-account-replicator-configmap - - name: swift-account-reaper-configmap - - name: swift-rsyncd-configmap - - name: swift-container-server-configmap - - name: swift-container-auditor-configmap - - name: swift-container-replicator-configmap - - name: swift-container-updater-configmap - - name: swift-rsyncd-configmap - - name: swift-object-server-configmap - - name: swift-object-auditor-configmap - - name: swift-object-replicator-configmap - - name: swift-object-updater-configmap - - name: swift-object-expirer-configmap - - name: swift-proxy-server-configmap + - name: swift-rsyncd + - name: swift-account-server + - name: swift-account-auditor + - name: swift-account-replicator + - name: swift-account-reaper + - name: swift-rsyncd + - name: swift-container-server + - name: swift-container-auditor + - name: swift-container-replicator + - name: swift-container-updater + - name: swift-rsyncd + - name: swift-object-server + - name: swift-object-auditor + - name: swift-object-replicator + - name: swift-object-updater + - name: swift-object-expirer + - name: swift-proxy-server secret: disk: pv: @@ -472,8 +478,8 @@ kolla-kubernetes: pods: resources: configmap: - - name: iscsid-configmap - - name: tgtd-configmap + - name: openvswitch-iscsid + - name: openvswitch-tgtd secret: disk: pv: @@ -495,11 +501,11 @@ kolla-kubernetes: - name: cinder-volume resources: configmap: - - name: cinder-api-configmap - - name: cinder-backup-configmap - - name: cinder-scheduler-configmap - - name: cinder-volume-configmap - - name: cinder-api-haproxy-configmap + - name: cinder-api + - name: cinder-backup + - name: cinder-scheduler + - name: cinder-volume + - name: cinder-api-haproxy template: services/common/api-haproxy-configmap.yml.j2 vars: configmap_name: cinder-api-haproxy diff --git a/kolla_kubernetes/commands/cmd_resource.py b/kolla_kubernetes/commands/cmd_resource.py index 864f8259d..7a3885622 100644 --- a/kolla_kubernetes/commands/cmd_resource.py +++ b/kolla_kubernetes/commands/cmd_resource.py @@ -176,27 +176,34 @@ class Resource(ResourceTemplate): 'Deployment': 'deployment', 'ConfigMap': 'configmap', 'Service': 'svc', + 'PersistentVolume': 'pv', + 'PersistentVolumeClaim': 'pvc', } if kind not in kind_map: msg = ("unknown template kind [{}].".format(kind)) raise Exception(msg) + nsflag = "" + if kind != 'PersistentVolume': + nsflag = " --namespace={}".format( + y['metadata']['namespace'] + ) if args.action == 'create': with tempfile.NamedTemporaryFile() as tf: tf.write(t) tf.flush() - s = "kubectl {} -f {} --namespace={}".format( - args.action, tf.name, y['metadata']['namespace']) + s = "kubectl {} -f {}{}".format( + args.action, tf.name, nsflag) subprocess.call(s, shell=True) tf.close() elif args.action == "delete": - s = "kubectl delete {} {} --namespace={}".format( + s = "kubectl delete {} {}{}".format( kind_map[kind], y['metadata']['name'], - y['metadata']['namespace']) + nsflag) subprocess.call(s, shell=True) elif args.action == 'status': - s = "kubectl get {} {} --namespace={}".format( + s = "kubectl get {} {}{}".format( kind_map[kind], y['metadata']['name'], - y['metadata']['namespace']) + nsflag) subprocess.call(s, shell=True) diff --git a/kolla_kubernetes/tests/test_templates.py b/kolla_kubernetes/tests/test_templates.py index 94589717a..3d28417fc 100644 --- a/kolla_kubernetes/tests/test_templates.py +++ b/kolla_kubernetes/tests/test_templates.py @@ -18,6 +18,8 @@ from kolla_kubernetes.service_resources import KollaKubernetesResources from kolla_kubernetes.tests import base KKR = KollaKubernetesResources.Get() +# FIXME configmap should be here, but requires config to be done in tox. +# as it seems to change home. RESOURCE_TYPES = ('secret pv pvc svc bootstrap pod').split(" ") technical_debt = { @@ -93,7 +95,7 @@ class TestTemplatesTest(base.BaseTestCase): if part.lower() in ('petset', 'deployment', 'job', 'replicationcontroller', 'pod', 'daemonset', 'configmap', - 'secret', + 'secret', 'configmap' 'ps', 'pv', 'pvc', 'disk', 'ds', 'persistentvolume', 'persistentvolumeclaim') and \ diff --git a/services/cinder/cinder-api-pod.yml.j2 b/services/cinder/cinder-api-pod.yml.j2 index 4a7deb605..912b49e0c 100644 --- a/services/cinder/cinder-api-pod.yml.j2 +++ b/services/cinder/cinder-api-pod.yml.j2 @@ -118,7 +118,7 @@ spec: emptyDir: {} - name: cinder-api-configmap configMap: - name: cinder-api-configmap + name: cinder-api - name: cinder-haproxy-config configMap: name: cinder-api-haproxy diff --git a/services/cinder/cinder-backup-pod.yml.j2 b/services/cinder/cinder-backup-pod.yml.j2 index fa55a57cb..38a2fd026 100644 --- a/services/cinder/cinder-backup-pod.yml.j2 +++ b/services/cinder/cinder-backup-pod.yml.j2 @@ -81,7 +81,7 @@ spec: emptyDir: {} - name: cinder-backup-configmap configMap: - name: cinder-backup-configmap + name: cinder-backup - name: etc-localtime hostPath: path: /etc/localtime diff --git a/services/cinder/cinder-bootstrap-job-create-db.yml.j2 b/services/cinder/cinder-bootstrap-job-create-db.yml.j2 index e0865410c..a9771472b 100644 --- a/services/cinder/cinder-bootstrap-job-create-db.yml.j2 +++ b/services/cinder/cinder-bootstrap-job-create-db.yml.j2 @@ -72,7 +72,7 @@ spec: volumes: - name: cinder-api-config configMap: - name: cinder-api-configmap + name: cinder-api - name: etc-localtime hostPath: path: /etc/localtime diff --git a/services/cinder/cinder-bootstrap-job-endpoints.yml.j2 b/services/cinder/cinder-bootstrap-job-endpoints.yml.j2 index c6cb5540c..ead76f95d 100644 --- a/services/cinder/cinder-bootstrap-job-endpoints.yml.j2 +++ b/services/cinder/cinder-bootstrap-job-endpoints.yml.j2 @@ -204,7 +204,7 @@ spec: volumes: - name: cinder-api-config configMap: - name: cinder-api-configmap + name: cinder-api - name: etc-localtime hostPath: path: /etc/localtime diff --git a/services/cinder/cinder-bootstrap-job-manage-db.yml.j2 b/services/cinder/cinder-bootstrap-job-manage-db.yml.j2 index e53703f83..0f47970fa 100644 --- a/services/cinder/cinder-bootstrap-job-manage-db.yml.j2 +++ b/services/cinder/cinder-bootstrap-job-manage-db.yml.j2 @@ -30,7 +30,7 @@ spec: volumes: - name: cinder-api-config configMap: - name: cinder-api-configmap + name: cinder-api - name: etc-localtime hostPath: path: /etc/localtime diff --git a/services/cinder/cinder-scheduler-pod.yml.j2 b/services/cinder/cinder-scheduler-pod.yml.j2 index db8a3cabd..d8b624317 100644 --- a/services/cinder/cinder-scheduler-pod.yml.j2 +++ b/services/cinder/cinder-scheduler-pod.yml.j2 @@ -40,7 +40,7 @@ spec: emptyDir: {} - name: cinder-scheduler-configmap configMap: - name: cinder-scheduler-configmap + name: cinder-scheduler - name: etc-localtime hostPath: path: /etc/localtime diff --git a/services/cinder/cinder-volume-lvm-pod.yml.j2 b/services/cinder/cinder-volume-lvm-pod.yml.j2 index cad1b4ceb..0f7e25aef 100644 --- a/services/cinder/cinder-volume-lvm-pod.yml.j2 +++ b/services/cinder/cinder-volume-lvm-pod.yml.j2 @@ -122,7 +122,7 @@ spec: emptyDir: {} - name: cinder-volume-configmap configMap: - name: cinder-volume-configmap + name: cinder-volume - name: run hostPath: path: /run diff --git a/services/common/common-pv.yml.j2 b/services/common/common-pv.yml.j2 index e2a39c04d..f56be8bc2 100644 --- a/services/common/common-pv.yml.j2 +++ b/services/common/common-pv.yml.j2 @@ -1,4 +1,4 @@ -{%- set resourceName = kolla_kubernetes.cli.args.service_name %} +{%- set resourceName = kolla_kubernetes.template.vars.name %} {%- if storage_provider in ["host", "ceph", "gce"] -%} diff --git a/services/common/common-pvc.yml.j2 b/services/common/common-pvc.yml.j2 index 66a55786e..94201ed1f 100644 --- a/services/common/common-pvc.yml.j2 +++ b/services/common/common-pvc.yml.j2 @@ -1,4 +1,4 @@ -{%- set resourceName = kolla_kubernetes.cli.args.service_name %} +{%- set resourceName = kolla_kubernetes.template.vars.name %} apiVersion: v1 kind: PersistentVolumeClaim diff --git a/services/glance/glance-api-pod.yml.j2 b/services/glance/glance-api-pod.yml.j2 index a78250955..527eb38f4 100644 --- a/services/glance/glance-api-pod.yml.j2 +++ b/services/glance/glance-api-pod.yml.j2 @@ -136,7 +136,7 @@ spec: emptyDir: {} - name: glance-api-configmap configMap: - name: glance-api-configmap + name: glance-api - name: glance-haproxy-config configMap: name: glance-api-haproxy diff --git a/services/glance/glance-bootstrap-job-manage-db.yml.j2 b/services/glance/glance-bootstrap-job-manage-db.yml.j2 index b2683b3ea..99af9f165 100644 --- a/services/glance/glance-bootstrap-job-manage-db.yml.j2 +++ b/services/glance/glance-bootstrap-job-manage-db.yml.j2 @@ -36,7 +36,7 @@ spec: volumes: - name: glance-api-config configMap: - name: glance-api-configmap + name: glance-api {% if glance_backend_ceph != "yes" %} - name: glance-persistent-storage persistentVolumeClaim: diff --git a/services/glance/glance-registry-pod.yml.j2 b/services/glance/glance-registry-pod.yml.j2 index 0832c42e8..212d612e6 100644 --- a/services/glance/glance-registry-pod.yml.j2 +++ b/services/glance/glance-registry-pod.yml.j2 @@ -123,7 +123,7 @@ spec: emptyDir: {} - name: glance-registry-configmap configMap: - name: glance-registry-configmap + name: glance-registry - name: glance-haproxy-config configMap: name: glance-registry-haproxy diff --git a/services/horizon/horizon-pod.yml.j2 b/services/horizon/horizon-pod.yml.j2 index b22939779..a4fb80537 100644 --- a/services/horizon/horizon-pod.yml.j2 +++ b/services/horizon/horizon-pod.yml.j2 @@ -31,7 +31,7 @@ spec: volumes: - name: horizon-configmap configMap: - name: horizon-configmap + name: horizon items: - key: horizon.conf path: horizon.conf diff --git a/services/keystone/keystone-bootstrap-job.yml.j2 b/services/keystone/keystone-bootstrap-job.yml.j2 index a700d0e7b..e91a61a29 100644 --- a/services/keystone/keystone-bootstrap-job.yml.j2 +++ b/services/keystone/keystone-bootstrap-job.yml.j2 @@ -119,7 +119,7 @@ spec: volumes: - name: keystone-config configMap: - name: keystone-configmap + name: keystone - name: dev hostPath: path: /dev diff --git a/services/keystone/keystone-pod.yml.j2 b/services/keystone/keystone-pod.yml.j2 index f2a9603aa..475b237e3 100644 --- a/services/keystone/keystone-pod.yml.j2 +++ b/services/keystone/keystone-pod.yml.j2 @@ -35,7 +35,7 @@ spec: volumes: - name: keystone-config configMap: - name: keystone-configmap + name: keystone - name: kolla-logs emptyDir: {} metadata: diff --git a/services/mariadb/mariadb-bootstrap-job.yml.j2 b/services/mariadb/mariadb-bootstrap-job.yml.j2 index ce6be5fce..b868c0feb 100644 --- a/services/mariadb/mariadb-bootstrap-job.yml.j2 +++ b/services/mariadb/mariadb-bootstrap-job.yml.j2 @@ -33,7 +33,7 @@ spec: volumes: - name: mariadb-config configMap: - name: mariadb-configmap + name: mariadb - name: mariadb-persistent-storage persistentVolumeClaim: claimName: {{ resourceName }} diff --git a/services/mariadb/mariadb-pod.yml.j2 b/services/mariadb/mariadb-pod.yml.j2 index f324abc71..ff4a01c64 100644 --- a/services/mariadb/mariadb-pod.yml.j2 +++ b/services/mariadb/mariadb-pod.yml.j2 @@ -47,7 +47,7 @@ spec: volumes: - name: mariadb-config configMap: - name: mariadb-configmap + name: mariadb - name: mariadb-persistent-storage persistentVolumeClaim: claimName: {{ resourceName }} diff --git a/services/memcached/memcached-pod.yml.j2 b/services/memcached/memcached-pod.yml.j2 index 320ebfc1a..b4a93a894 100644 --- a/services/memcached/memcached-pod.yml.j2 +++ b/services/memcached/memcached-pod.yml.j2 @@ -29,7 +29,7 @@ spec: volumes: - name: memcached-config configMap: - name: memcached-configmap + name: memcached metadata: name: memcached namespace: {{ kolla_kubernetes_namespace }} diff --git a/services/neutron/neutron-bootstrap-job.yml.j2 b/services/neutron/neutron-bootstrap-job.yml.j2 index 881e68d3c..e445a135f 100644 --- a/services/neutron/neutron-bootstrap-job.yml.j2 +++ b/services/neutron/neutron-bootstrap-job.yml.j2 @@ -202,7 +202,7 @@ spec: volumes: - name: neutron-server-config configMap: - name: neutron-server-configmap + name: neutron-server items: - key: neutron.conf path: neutron.conf diff --git a/services/neutron/neutron-dhcp-agent-daemonset.yml.j2 b/services/neutron/neutron-dhcp-agent-daemonset.yml.j2 index 876cb932f..a826243dc 100644 --- a/services/neutron/neutron-dhcp-agent-daemonset.yml.j2 +++ b/services/neutron/neutron-dhcp-agent-daemonset.yml.j2 @@ -34,7 +34,7 @@ spec: "], "volumeMounts": [ { - "name": "neutron-l3-agent-configmap", + "name": "neutron-dhcp-agent-configmap", "mountPath": "/srv/configmap" }, { @@ -99,8 +99,10 @@ spec: value: {{ config_strategy }} volumes: - name: neutron-dhcp-agent-config + emptyDir: {} + - name: neutron-dhcp-agent-configmap configMap: - name: neutron-dhcp-agent-configmap + name: neutron-dhcp-agent items: - key: neutron.conf path: neutron.conf diff --git a/services/neutron/neutron-l3-agent-daemonset.yml.j2 b/services/neutron/neutron-l3-agent-daemonset.yml.j2 index c7b8107d5..3ae21f2d4 100644 --- a/services/neutron/neutron-l3-agent-daemonset.yml.j2 +++ b/services/neutron/neutron-l3-agent-daemonset.yml.j2 @@ -118,7 +118,7 @@ spec: emptyDir: {} - name: neutron-l3-agent-configmap configMap: - name: neutron-l3-agent-configmap + name: neutron-l3-agent items: - key: neutron.conf path: neutron.conf diff --git a/services/neutron/neutron-metadata-agent-daemonset.yml.j2 b/services/neutron/neutron-metadata-agent-daemonset.yml.j2 index e3228e1e7..e1c95c498 100644 --- a/services/neutron/neutron-metadata-agent-daemonset.yml.j2 +++ b/services/neutron/neutron-metadata-agent-daemonset.yml.j2 @@ -51,7 +51,7 @@ spec: volumes: - name: neutron-metadata-agent-config configMap: - name: neutron-metadata-agent-configmap + name: neutron-metadata-agent items: - key: neutron.conf path: neutron.conf diff --git a/services/neutron/neutron-openvswitch-agent-daemonset.yml.j2 b/services/neutron/neutron-openvswitch-agent-daemonset.yml.j2 index 6cb996adb..7e01ccc4d 100644 --- a/services/neutron/neutron-openvswitch-agent-daemonset.yml.j2 +++ b/services/neutron/neutron-openvswitch-agent-daemonset.yml.j2 @@ -132,7 +132,7 @@ spec: volumes: - name: neutron-openvswitch-agent-configmap configMap: - name: neutron-openvswitch-agent-configmap + name: neutron-openvswitch-agent items: - key: neutron.conf path: neutron.conf diff --git a/services/neutron/neutron-server-pod.yml.j2 b/services/neutron/neutron-server-pod.yml.j2 index 10e97b3ad..b743f04aa 100644 --- a/services/neutron/neutron-server-pod.yml.j2 +++ b/services/neutron/neutron-server-pod.yml.j2 @@ -38,7 +38,7 @@ spec: volumes: - name: neutron-server-config configMap: - name: neutron-server-configmap + name: neutron-server items: - key: neutron.conf path: neutron.conf diff --git a/services/nova/nova-compute-bootstrap-job.yml.j2 b/services/nova/nova-compute-bootstrap-job.yml.j2 index 9424bf2f6..4b5ab6356 100644 --- a/services/nova/nova-compute-bootstrap-job.yml.j2 +++ b/services/nova/nova-compute-bootstrap-job.yml.j2 @@ -39,7 +39,7 @@ spec: volumes: - name: nova-compute-config configMap: - name: nova-compute-configmap + name: nova-compute - name: nova-compute-persistent-storage hostPath: path: /var/lib/nova/instances diff --git a/services/nova/nova-compute-pod.yml.j2 b/services/nova/nova-compute-pod.yml.j2 index 505f171f9..95c24a0b3 100644 --- a/services/nova/nova-compute-pod.yml.j2 +++ b/services/nova/nova-compute-pod.yml.j2 @@ -87,7 +87,7 @@ spec: volumes: - name: nova-compute-config configMap: - name: nova-compute-configmap + name: nova-compute - name: nova-compute-persistent-storage hostPath: path: /var/lib/nova diff --git a/services/nova/nova-control-api-pod.yml.j2 b/services/nova/nova-control-api-pod.yml.j2 index 3b206c01a..965724c89 100644 --- a/services/nova/nova-control-api-pod.yml.j2 +++ b/services/nova/nova-control-api-pod.yml.j2 @@ -70,7 +70,7 @@ spec: volumes: - name: nova-api-config configMap: - name: nova-api-configmap + name: nova-api - name: etc-localtime hostPath: path: /etc/localtime diff --git a/services/nova/nova-control-bootstrap-job-create-nova-api-db.yml.j2 b/services/nova/nova-control-bootstrap-job-create-nova-api-db.yml.j2 index 4f24fbc65..308e0526c 100644 --- a/services/nova/nova-control-bootstrap-job-create-nova-api-db.yml.j2 +++ b/services/nova/nova-control-bootstrap-job-create-nova-api-db.yml.j2 @@ -28,7 +28,7 @@ spec: volumes: - name: nova-api-config configMap: - name: nova-api-configmap + name: nova-api - name: etc-localtime hostPath: path: /etc/localtime diff --git a/services/nova/nova-control-bootstrap-job-create-nova-db.yml.j2 b/services/nova/nova-control-bootstrap-job-create-nova-db.yml.j2 index fc01b591c..78c325826 100644 --- a/services/nova/nova-control-bootstrap-job-create-nova-db.yml.j2 +++ b/services/nova/nova-control-bootstrap-job-create-nova-db.yml.j2 @@ -71,7 +71,7 @@ spec: volumes: - name: nova-api-config configMap: - name: nova-api-configmap + name: nova-api - name: etc-localtime hostPath: path: /etc/localtime diff --git a/services/nova/nova-control-bootstrap-job-create-nova-endpoints.yml.j2 b/services/nova/nova-control-bootstrap-job-create-nova-endpoints.yml.j2 index 2f899fb15..d5a18299b 100644 --- a/services/nova/nova-control-bootstrap-job-create-nova-endpoints.yml.j2 +++ b/services/nova/nova-control-bootstrap-job-create-nova-endpoints.yml.j2 @@ -73,7 +73,7 @@ spec: volumes: - name: nova-api-config configMap: - name: nova-api-configmap + name: nova-api - name: etc-localtime hostPath: path: /etc/localtime diff --git a/services/nova/nova-control-conductor-pod.yml.j2 b/services/nova/nova-control-conductor-pod.yml.j2 index 31d607fd5..88d5f092f 100644 --- a/services/nova/nova-control-conductor-pod.yml.j2 +++ b/services/nova/nova-control-conductor-pod.yml.j2 @@ -61,7 +61,7 @@ spec: volumes: - name: nova-conductor-config configMap: - name: nova-conductor-configmap + name: nova-conductor - name: etc-localtime hostPath: path: /etc/localtime diff --git a/services/nova/nova-control-scheduler-pod.yml.j2 b/services/nova/nova-control-scheduler-pod.yml.j2 index eaac5a9ec..37099d631 100644 --- a/services/nova/nova-control-scheduler-pod.yml.j2 +++ b/services/nova/nova-control-scheduler-pod.yml.j2 @@ -63,7 +63,7 @@ spec: volumes: - name: nova-scheduler-config configMap: - name: nova-scheduler-configmap + name: nova-scheduler - name: etc-localtime hostPath: path: /etc/localtime diff --git a/services/nova/nova-libvirt-pod.yml.j2 b/services/nova/nova-libvirt-pod.yml.j2 index 47a9df997..92bfd9ca8 100644 --- a/services/nova/nova-libvirt-pod.yml.j2 +++ b/services/nova/nova-libvirt-pod.yml.j2 @@ -83,7 +83,7 @@ spec: path: /var/lib/nova - name: nova-libvirt-config configMap: - name: nova-libvirt-configmap + name: nova-libvirt - name: nova-libvirt-persistent-storage hostPath: path: /var/lib/libvirt diff --git a/services/openvswitch/openvswitch-ovsdb-daemonset.yml.j2 b/services/openvswitch/openvswitch-ovsdb-daemonset.yml.j2 index ad9a05d79..a84a223a9 100644 --- a/services/openvswitch/openvswitch-ovsdb-daemonset.yml.j2 +++ b/services/openvswitch/openvswitch-ovsdb-daemonset.yml.j2 @@ -87,7 +87,7 @@ spec: volumes: - name: openvswitch-db-config configMap: - name: openvswitch-db-server-configmap + name: openvswitch-ovsdb - name: openvswitch-db emptyDir: {} - name: openvswitch-run diff --git a/services/openvswitch/openvswitch-vswitchd-daemonset.yml.j2 b/services/openvswitch/openvswitch-vswitchd-daemonset.yml.j2 index b57731838..19a8b8064 100644 --- a/services/openvswitch/openvswitch-vswitchd-daemonset.yml.j2 +++ b/services/openvswitch/openvswitch-vswitchd-daemonset.yml.j2 @@ -88,7 +88,7 @@ spec: volumes: - name: openvswitch-vswitchd-config configMap: - name: openvswitch-vswitchd-configmap + name: openvswitch-vswitchd - name: openvswitch-run hostPath: path: /var/run/openvswitch diff --git a/services/rabbitmq/rabbitmq-bootstrap-job.yml.j2 b/services/rabbitmq/rabbitmq-bootstrap-job.yml.j2 index c0e04a5fe..735953191 100644 --- a/services/rabbitmq/rabbitmq-bootstrap-job.yml.j2 +++ b/services/rabbitmq/rabbitmq-bootstrap-job.yml.j2 @@ -27,7 +27,7 @@ spec: volumes: - name: rabbitmq-config configMap: - name: rabbitmq-configmap + name: rabbitmq - name: rabbitmq-persistent-storage persistentVolumeClaim: claimName: {{ resourceName }} diff --git a/services/rabbitmq/rabbitmq-pod.yml.j2 b/services/rabbitmq/rabbitmq-pod.yml.j2 index 861e1b02d..f8edba126 100644 --- a/services/rabbitmq/rabbitmq-pod.yml.j2 +++ b/services/rabbitmq/rabbitmq-pod.yml.j2 @@ -36,7 +36,7 @@ spec: volumes: - name: rabbitmq-config configMap: - name: rabbitmq-configmap + name: rabbitmq - name: rabbitmq-persistent-storage persistentVolumeClaim: claimName: {{ resourceName }} diff --git a/services/swift/swift-account-pod.yml.j2 b/services/swift/swift-account-pod.yml.j2 index 569c3d196..b15507c60 100644 --- a/services/swift/swift-account-pod.yml.j2 +++ b/services/swift/swift-account-pod.yml.j2 @@ -90,19 +90,19 @@ spec: volumes: - name: swift-rsyncd-config configMap: - name: swift-rsyncd-configmap + name: swift-rsyncd - name: swift-account-server-config configMap: - name: swift-account-server-configmap + name: swift-account-server - name: swift-account-auditor-config configMap: - name: swift-account-auditor-configmap + name: swift-account-auditor - name: swift-account-replicator-config configMap: - name: swift-account-replicator-configmap + name: swift-account-replicator - name: swift-account-reaper-config configMap: - name: swift-account-reaper-configmap + name: swift-account-reaper - name: swift-config hostPath: path: {{ node_config_directory }}/swift/ diff --git a/services/swift/swift-container-pod.yml.j2 b/services/swift/swift-container-pod.yml.j2 index ff09913f2..78d226954 100644 --- a/services/swift/swift-container-pod.yml.j2 +++ b/services/swift/swift-container-pod.yml.j2 @@ -92,19 +92,19 @@ spec: volumes: - name: swift-rsyncd-config configMap: - name: swift-rsyncd-configmap + name: swift-rsyncd - name: swift-container-server-config configMap: - name: swift-container-server-configmap + name: swift-container-server - name: swift-container-auditor-config configMap: - name: swift-container-auditor-configmap + name: swift-container-auditor - name: swift-container-replicator-config configMap: - name: swift-container-replicator-configmap + name: swift-container-replicator - name: swift-container-updater-config configMap: - name: swift-container-updater-configmap + name: swift-container-updater - name: swift-config hostPath: path: {{ node_config_directory }}/swift/ diff --git a/services/swift/swift-object-pod.yml.j2 b/services/swift/swift-object-pod.yml.j2 index 227f91e5a..0102c0e21 100644 --- a/services/swift/swift-object-pod.yml.j2 +++ b/services/swift/swift-object-pod.yml.j2 @@ -107,22 +107,22 @@ spec: volumes: - name: swift-rsyncd-config configMap: - name: swift-rsyncd-configmap + name: swift-rsyncd - name: swift-object-server-config configMap: - name: swift-object-server-configmap + name: swift-object-server - name: swift-object-auditor-config configMap: - name: swift-object-auditor-configmap + name: swift-object-auditor - name: swift-object-replicator-config configMap: - name: swift-object-replicator-configmap + name: swift-object-replicator - name: swift-object-updater-config configMap: - name: swift-object-updater-configmap + name: swift-object-updater - name: swift-object-expirer-config configMap: - name: swift-object-expirer-configmap + name: swift-object-expirer - name: swift-config hostPath: path: {{ node_config_directory }}/swift/ diff --git a/services/swift/swift-proxy-pod.yml.j2 b/services/swift/swift-proxy-pod.yml.j2 index 6e854d16a..80e0cb3f9 100644 --- a/services/swift/swift-proxy-pod.yml.j2 +++ b/services/swift/swift-proxy-pod.yml.j2 @@ -30,7 +30,7 @@ spec: volumes: - name: swift-proxy-server-config configMap: - name: swift-proxy-server-configmap + name: swift-proxy-server - name: swift-config hostPath: path: {{ node_config_directory }}/swift/