From 027a2b1fbebeb34d290a66d46039633040a9ab3a Mon Sep 17 00:00:00 2001
From: caoyuan <cao.yuan@99cloud.net>
Date: Thu, 18 Jan 2018 15:14:25 +0800
Subject: [PATCH] dev mode: Add support for Zun
Allows users to develop on Zun using Kolla.
Partially implements: blueprint mount-sources
Change-Id: I2724aecad95f5165c1cfacd2fae80cdad22f98b4
---
ansible/roles/zun/defaults/main.yml | 10 ++++++++++
ansible/roles/zun/handlers/main.yml | 4 ++--
ansible/roles/zun/tasks/bootstrap_service.yml | 2 +-
ansible/roles/zun/tasks/clone.yml | 6 ++++++
ansible/roles/zun/tasks/config.yml | 2 +-
ansible/roles/zun/tasks/deploy.yml | 3 +++
6 files changed, 23 insertions(+), 4 deletions(-)
create mode 100644 ansible/roles/zun/tasks/clone.yml
diff --git a/ansible/roles/zun/defaults/main.yml b/ansible/roles/zun/defaults/main.yml
index 45acdcf50..12088bb99 100644
--- a/ansible/roles/zun/defaults/main.yml
+++ b/ansible/roles/zun/defaults/main.yml
@@ -10,6 +10,7 @@ zun_services:
volumes:
- "{{ node_config_directory }}/zun-api/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
+ - "{{ kolla_dev_repos_directory ~ '/zun/zun:/var/lib/kolla/venv/lib/python2.7/site-packages/zun' if zun_dev_mode | bool else '' }}"
- "kolla_logs:/var/log/kolla/"
zun-compute:
container_name: zun_compute
@@ -21,6 +22,7 @@ zun_services:
- "{{ node_config_directory }}/zun-compute/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
+ - "{{ kolla_dev_repos_directory ~ '/zun/zun:/var/lib/kolla/venv/lib/python2.7/site-packages/zun' if zun_dev_mode | bool else '' }}"
- "/run:/run:shared"
- "/usr/lib/docker:/usr/lib/docker"
@@ -59,3 +61,11 @@ zun_logging_debug: "{{ openstack_logging_debug }}"
zun_keystone_user: "zun"
openstack_zun_auth: "{{ openstack_auth }}"
+
+
+####################
+# Kolla
+####################
+zun_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
+zun_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
+zun_dev_mode: "{{ kolla_dev_mode }}"
diff --git a/ansible/roles/zun/handlers/main.yml b/ansible/roles/zun/handlers/main.yml
index beab820d5..22f0a8731 100644
--- a/ansible/roles/zun/handlers/main.yml
+++ b/ansible/roles/zun/handlers/main.yml
@@ -13,7 +13,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
privileged: "{{ service.privileged | default(False) }}"
- volumes: "{{ service.volumes }}"
+ volumes: "{{ service.volumes|reject('equalto', '')|list }}"
when:
- action != "config"
- inventory_hostname in groups[service.group]
@@ -38,7 +38,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
privileged: "{{ service.privileged | default(False) }}"
- volumes: "{{ service.volumes }}"
+ volumes: "{{ service.volumes|reject('equalto', '')|list }}"
when:
- action != "config"
- inventory_hostname in groups[service.group]
diff --git a/ansible/roles/zun/tasks/bootstrap_service.yml b/ansible/roles/zun/tasks/bootstrap_service.yml
index 32de6f06a..fd5480c9d 100644
--- a/ansible/roles/zun/tasks/bootstrap_service.yml
+++ b/ansible/roles/zun/tasks/bootstrap_service.yml
@@ -14,6 +14,6 @@
BOOTSTRAP:
name: "bootstrap_zun"
restart_policy: "never"
- volumes: "{{ zun_api.volumes }}"
+ volumes: "{{ zun_api.volumes|reject('equalto', '')|list }}"
run_once: True
delegate_to: "{{ groups[zun_api.group][0] }}"
diff --git a/ansible/roles/zun/tasks/clone.yml b/ansible/roles/zun/tasks/clone.yml
new file mode 100644
index 000000000..c3f35c250
--- /dev/null
+++ b/ansible/roles/zun/tasks/clone.yml
@@ -0,0 +1,6 @@
+---
+- name: Cloning zun source repository for development
+ git:
+ repo: "{{ zun_git_repository }}"
+ dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
+ update: "{{ zun_dev_repos_pull }}"
diff --git a/ansible/roles/zun/tasks/config.yml b/ansible/roles/zun/tasks/config.yml
index 5787f3e39..811af45ff 100644
--- a/ansible/roles/zun/tasks/config.yml
+++ b/ansible/roles/zun/tasks/config.yml
@@ -78,7 +78,7 @@
name: "{{ item.value.container_name }}"
image: "{{ item.value.image }}"
privileged: "{{ item.value.privileged | default(False) }}"
- volumes: "{{ item.value.volumes }}"
+ volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
register: check_zun_containers
when:
- action != "config"
diff --git a/ansible/roles/zun/tasks/deploy.yml b/ansible/roles/zun/tasks/deploy.yml
index ce46a42af..15e3410d4 100644
--- a/ansible/roles/zun/tasks/deploy.yml
+++ b/ansible/roles/zun/tasks/deploy.yml
@@ -6,6 +6,9 @@
when: inventory_hostname in groups['zun-api'] or
inventory_hostname in groups['zun-compute']
+- include: clone.yml
+ when: zun_dev_mode | bool
+
- include: bootstrap.yml
when: inventory_hostname in groups['zun-api']
--
GitLab