From 3155b1e2d24a7f2f714a4f26138f75e18f9d0b8c Mon Sep 17 00:00:00 2001 From: David C Wang Date: Mon, 18 Jul 2016 18:19:48 +0000 Subject: [PATCH] Git mv'd all bootstrap dir files into services dir - No bug-fixes, blue-prints, nor code changes. - Originally, kolla-kubernetes only used 3 types of kubernetes resource files (job, pod, svc). Bootstrap files (job) were separated from service files (pod, svc). Subcommands were tied directly to the files their respective directories (bootstrap command -> ./bootstrap dir, run command -> ./services dir). - This was done because of the way kolla-kubernetes used to work. Upon subcommand launch, all of the files in its respective directory were jinja processed and then loaded into kubernetes (in random order). - Now that we have added a bunch of resources that require ordering (disk, pv, pvc, etc), and kolla-kubernetes directly references each type of file based on the configuration of ./etc/kolla-kubernetes/kolla-kubernetes.yml, we no longer need to separate bootstrap and service files. Change-Id: I595388a686330cfdeb662b9a0a8b52cc1d45c913 --- etc/kolla-kubernetes/service_resources.yml | 22 +++++++++---------- .../glance/glance-bootstrap-job.yml.j2 | 0 .../keystone/keystone-bootstrap-job.yml.j2 | 0 .../mariadb/mariadb-bootstrap-job.yml.j2 | 0 .../mariadb/mariadb-disk.sh.j2 | 0 .../mariadb/mariadb-pv.yml.j2 | 0 .../mariadb/mariadb-pvc.yml.j2 | 0 .../neutron/neutron-bootstrap-job.yml.j2 | 0 .../nova/nova-compute-bootstrap-job.yml.j2 | 0 .../nova/nova-control-bootstrap-job.yml.j2 | 0 .../rabbitmq/rabbitmq-bootstrap-job.yml.j2 | 0 setup.cfg | 1 - 12 files changed, 11 insertions(+), 12 deletions(-) rename bootstrap/glance/glance-job.yml.j2 => services/glance/glance-bootstrap-job.yml.j2 (100%) rename bootstrap/keystone/keystone-job.yml.j2 => services/keystone/keystone-bootstrap-job.yml.j2 (100%) rename bootstrap/mariadb/mariadb-job.yml.j2 => services/mariadb/mariadb-bootstrap-job.yml.j2 (100%) rename {bootstrap => services}/mariadb/mariadb-disk.sh.j2 (100%) rename {bootstrap => services}/mariadb/mariadb-pv.yml.j2 (100%) rename {bootstrap => services}/mariadb/mariadb-pvc.yml.j2 (100%) rename bootstrap/neutron/neutron-job.yml.j2 => services/neutron/neutron-bootstrap-job.yml.j2 (100%) rename bootstrap/nova/nova-compute-job.yml.j2 => services/nova/nova-compute-bootstrap-job.yml.j2 (100%) rename bootstrap/nova/nova-control-job.yml.j2 => services/nova/nova-control-bootstrap-job.yml.j2 (100%) rename bootstrap/rabbitmq/rabbitmq-job.yml.j2 => services/rabbitmq/rabbitmq-bootstrap-job.yml.j2 (100%) diff --git a/etc/kolla-kubernetes/service_resources.yml b/etc/kolla-kubernetes/service_resources.yml index 8f860c458..409c02fca 100644 --- a/etc/kolla-kubernetes/service_resources.yml +++ b/etc/kolla-kubernetes/service_resources.yml @@ -22,15 +22,15 @@ kolla-kubernetes: - name: mariadb resources: disk: - - bootstrap/mariadb/mariadb-disk.sh.j2 + - services/mariadb/mariadb-disk.sh.j2 pv: - - bootstrap/mariadb/mariadb-pv.yml.j2 + - services/mariadb/mariadb-pv.yml.j2 pvc: - - bootstrap/mariadb/mariadb-pvc.yml.j2 + - services/mariadb/mariadb-pvc.yml.j2 svc: - services/mariadb/mariadb-service.yml.j2 bootstrap: - - bootstrap/mariadb/mariadb-job.yml.j2 + - services/mariadb/mariadb-bootstrap-job.yml.j2 pod: - services/mariadb/mariadb-pod.yml.j2 - name: memcached @@ -60,7 +60,7 @@ kolla-kubernetes: - services/keystone/keystone-service-admin.yml.j2 - services/keystone/keystone-service-public.yml.j2 bootstrap: - - bootstrap/keystone/keystone-job.yml.j2 + - services/keystone/keystone-bootstrap-job.yml.j2 pod: - services/keystone/keystone-pod.yml.j2 - name: horizon @@ -90,7 +90,7 @@ kolla-kubernetes: - services/rabbitmq/rabbitmq-service-management.yml.j2 - services/rabbitmq/rabbitmq-service.yml.j2 bootstrap: - - bootstrap/rabbitmq/rabbitmq-job.yml.j2 + - services/rabbitmq/rabbitmq-bootstrap-job.yml.j2 pod: - services/rabbitmq/rabbitmq-pod.yml.j2 - name: glance @@ -107,7 +107,7 @@ kolla-kubernetes: - services/glance/glance-api-pod.yml.j2 - services/glance/glance-registry-pod.yml.j2 bootstrap: - - bootstrap/glance/glance-job.yml.j2 + - services/glance/glance-bootstrap-job.yml.j2 pod: - services/glance/glance-api-service.yml.j2 - services/glance/glance-registry-service.yml.j2 @@ -130,8 +130,8 @@ kolla-kubernetes: svc: - services/nova/nova-service-compute.yml.j2 bootstrap: - - bootstrap/nova/nova-compute-job.yml.j2 - - bootstrap/nova/nova-control-job.yml.j2 + - services/nova/nova-compute-bootstrap-job.yml.j2 + - services/nova/nova-control-bootstrap-job.yml.j2 pod: - services/nova/nova-compute-pod.yml.j2 - services/nova/nova-control-pod.yml.j2 @@ -158,7 +158,7 @@ kolla-kubernetes: svc: - services/neutron/neutron-server-service.yml.j2 bootstrap: - - bootstrap/neutron/neutron-job.yml.j2 + - services/neutron/neutron-bootstrap-job.yml.j2 pod: - services/neutron/neutron-compute-pod.yml.j2 - services/neutron/neutron-control-pod.yml.j2 @@ -220,6 +220,6 @@ kolla-kubernetes: pvc: svc: - services/skydns/skydns-service.yml.j2 + bootstrap: pod: - services/skydns/skydns-pod.yml.j2 - diff --git a/bootstrap/glance/glance-job.yml.j2 b/services/glance/glance-bootstrap-job.yml.j2 similarity index 100% rename from bootstrap/glance/glance-job.yml.j2 rename to services/glance/glance-bootstrap-job.yml.j2 diff --git a/bootstrap/keystone/keystone-job.yml.j2 b/services/keystone/keystone-bootstrap-job.yml.j2 similarity index 100% rename from bootstrap/keystone/keystone-job.yml.j2 rename to services/keystone/keystone-bootstrap-job.yml.j2 diff --git a/bootstrap/mariadb/mariadb-job.yml.j2 b/services/mariadb/mariadb-bootstrap-job.yml.j2 similarity index 100% rename from bootstrap/mariadb/mariadb-job.yml.j2 rename to services/mariadb/mariadb-bootstrap-job.yml.j2 diff --git a/bootstrap/mariadb/mariadb-disk.sh.j2 b/services/mariadb/mariadb-disk.sh.j2 similarity index 100% rename from bootstrap/mariadb/mariadb-disk.sh.j2 rename to services/mariadb/mariadb-disk.sh.j2 diff --git a/bootstrap/mariadb/mariadb-pv.yml.j2 b/services/mariadb/mariadb-pv.yml.j2 similarity index 100% rename from bootstrap/mariadb/mariadb-pv.yml.j2 rename to services/mariadb/mariadb-pv.yml.j2 diff --git a/bootstrap/mariadb/mariadb-pvc.yml.j2 b/services/mariadb/mariadb-pvc.yml.j2 similarity index 100% rename from bootstrap/mariadb/mariadb-pvc.yml.j2 rename to services/mariadb/mariadb-pvc.yml.j2 diff --git a/bootstrap/neutron/neutron-job.yml.j2 b/services/neutron/neutron-bootstrap-job.yml.j2 similarity index 100% rename from bootstrap/neutron/neutron-job.yml.j2 rename to services/neutron/neutron-bootstrap-job.yml.j2 diff --git a/bootstrap/nova/nova-compute-job.yml.j2 b/services/nova/nova-compute-bootstrap-job.yml.j2 similarity index 100% rename from bootstrap/nova/nova-compute-job.yml.j2 rename to services/nova/nova-compute-bootstrap-job.yml.j2 diff --git a/bootstrap/nova/nova-control-job.yml.j2 b/services/nova/nova-control-bootstrap-job.yml.j2 similarity index 100% rename from bootstrap/nova/nova-control-job.yml.j2 rename to services/nova/nova-control-bootstrap-job.yml.j2 diff --git a/bootstrap/rabbitmq/rabbitmq-job.yml.j2 b/services/rabbitmq/rabbitmq-bootstrap-job.yml.j2 similarity index 100% rename from bootstrap/rabbitmq/rabbitmq-job.yml.j2 rename to services/rabbitmq/rabbitmq-bootstrap-job.yml.j2 diff --git a/setup.cfg b/setup.cfg index a26c22c18..c3600e1d0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -24,7 +24,6 @@ packages = kolla_kubernetes data_files = share/kolla-kubernetes/services = services/* - share/kolla-kubernetes/bootstrap = bootstrap/* [entry_points] console_scripts =