diff --git a/ansible/roles/etcd/defaults/main.yml b/ansible/roles/etcd/defaults/main.yml
index c8f73263a7..9d9902f905 100644
--- a/ansible/roles/etcd/defaults/main.yml
+++ b/ansible/roles/etcd/defaults/main.yml
@@ -1,6 +1,30 @@
---
project_name: "etcd"
+etcd_services:
+ etcd:
+ container_name: etcd
+ group: etcd
+ enabled: true
+ environment:
+ ETCD_DATA_DIR: "/var/lib/etcd"
+ ETCD_NAME: "{{ ansible_hostname }}"
+ ETCD_ADVERTISE_CLIENT_URLS: "{{ internal_protocol }}://{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ etcd_client_port }}"
+ ETCD_LISTEN_CLIENT_URLS: "{{ internal_protocol }}://{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ etcd_client_port }}"
+ ETCD_INITIAL_ADVERTISE_PEER_URLS: "{{ internal_protocol }}://{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ etcd_peer_port }}"
+ ETCD_LISTEN_PEER_URLS: "{{ internal_protocol }}://{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ etcd_peer_port }}"
+ ETCD_INITIAL_CLUSTER_TOKEN: "{{ etcd_cluster_token }}"
+ ETCD_INITIAL_CLUSTER: "{% for host in groups['etcd'] %}{{ hostvars[host]['ansible_hostname'] }}={{ internal_protocol }}://{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ etcd_peer_port }}{% if not loop.last %},{% endif %}{% endfor %}"
+ ETCD_INITIAL_CLUSTER_STATE: "new"
+ ETCD_OUT_FILE: "/var/log/kolla/etcd/etcd.log"
+ KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
+ image: "{{ etcd_image_full }}"
+ volumes:
+ - "{{ node_config_directory }}/etcd/:{{ container_config_directory }}/:ro"
+ - "/etc/localtime:/etc/localtime:ro"
+ - "kolla_etcd:/var/lib/etcd/"
+ - "kolla_logs:/var/log/kolla/"
+
####################
# Docker
diff --git a/ansible/roles/etcd/handlers/main.yml b/ansible/roles/etcd/handlers/main.yml
new file mode 100644
index 0000000000..5ea27b896c
--- /dev/null
+++ b/ansible/roles/etcd/handlers/main.yml
@@ -0,0 +1,19 @@
+---
+- name: Restart etcd container
+ vars:
+ service_name: "etcd"
+ service: "{{ etcd_services[service_name] }}"
+ config_json: "{{ etcd_config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
+ etcd_container: "{{ check_etcd_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
+ kolla_docker:
+ action: "recreate_or_restart_container"
+ common_options: "{{ docker_common_options }}"
+ name: "{{ service.container_name }}"
+ image: "{{ service.image }}"
+ volumes: "{{ service.volumes }}"
+ when:
+ - action != "config"
+ - inventory_hostname in groups[service.group]
+ - service.enabled | bool
+ - config_json.changed | bool
+ or etcd_container.changed | bool
diff --git a/ansible/roles/etcd/tasks/bootstrap.yml b/ansible/roles/etcd/tasks/bootstrap.yml
index d098ff99bd..86fc77ffa7 100644
--- a/ansible/roles/etcd/tasks/bootstrap.yml
+++ b/ansible/roles/etcd/tasks/bootstrap.yml
@@ -1,5 +1,7 @@
---
- name: Running etcd bootstrap container
+ vars:
+ etcd: "{{ etcd_services['etcd'] }}"
kolla_docker:
action: "start_container"
common_options: "{{ docker_common_options }}"
@@ -7,13 +9,11 @@
environment:
KOLLA_BOOTSTRAP:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
- image: "{{ etcd_image_full }}"
+ image: "{{ etcd.image }}"
labels:
BOOTSTRAP:
name: "bootstrap_etcd"
restart_policy: "never"
- volumes:
- - "{{ node_config_directory }}/etcd/:{{ container_config_directory }}/:ro"
- - "/etc/localtime:/etc/localtime:ro"
- - "kolla_etcd:/var/lib/etcd/"
- - "kolla_logs:/var/log/kolla/"
+ volumes: "{{ etcd.volumes }}"
+ run_once: True
+ delegate_to: "{{ groups[etcd.group][0] }}"
diff --git a/ansible/roles/etcd/tasks/config.yml b/ansible/roles/etcd/tasks/config.yml
index 2ff3ac1f0e..9d2e43b6de 100644
--- a/ansible/roles/etcd/tasks/config.yml
+++ b/ansible/roles/etcd/tasks/config.yml
@@ -1,15 +1,38 @@
---
- name: Ensuring config directories exist
file:
- path: "{{ node_config_directory }}/{{ item }}"
+ path: "{{ node_config_directory }}/{{ item.key }}"
state: "directory"
recurse: yes
- with_items:
- - "etcd"
+ when:
+ - inventory_hostname in groups[item.value.group]
+ - item.value.enabled | bool
+ with_dict: "{{ etcd_services }}"
- name: Copying over config.json files for services
template:
- src: "{{ item }}.json.j2"
- dest: "{{ node_config_directory }}/{{ item }}/config.json"
- with_items:
- - "etcd"
+ src: "{{ item.key }}.json.j2"
+ dest: "{{ node_config_directory }}/{{ item.key }}/config.json"
+ register: etcd_config_jsons
+ when:
+ - inventory_hostname in groups[item.value.group]
+ - item.value.enabled | bool
+ with_dict: "{{ etcd_services }}"
+ notify:
+ - Restart etcd container
+
+- name: Check etcd containers
+ kolla_docker:
+ action: "compare_container"
+ common_options: "{{ docker_common_options }}"
+ name: "{{ item.value.container_name }}"
+ image: "{{ item.value.image }}"
+ volumes: "{{ item.value.volumes }}"
+ register: check_etcd_containers
+ when:
+ - action != "config"
+ - inventory_hostname in groups[item.value.group]
+ - item.value.enabled | bool
+ with_dict: "{{ etcd_services }}"
+ notify:
+ - Restart etcd container
diff --git a/ansible/roles/etcd/tasks/deploy.yml b/ansible/roles/etcd/tasks/deploy.yml
index 98daa4021c..9eca42dec5 100644
--- a/ansible/roles/etcd/tasks/deploy.yml
+++ b/ansible/roles/etcd/tasks/deploy.yml
@@ -3,4 +3,5 @@
- include: bootstrap.yml
-- include: start.yml
+- name: Flush handlers
+ meta: flush_handlers
diff --git a/ansible/roles/etcd/tasks/pull.yml b/ansible/roles/etcd/tasks/pull.yml
index 57d5bdae51..8fa205c683 100644
--- a/ansible/roles/etcd/tasks/pull.yml
+++ b/ansible/roles/etcd/tasks/pull.yml
@@ -3,4 +3,8 @@
kolla_docker:
action: "pull_image"
common_options: "{{ docker_common_options }}"
- image: "{{ etcd_image_full }}"
+ image: "{{ item.value.image }}"
+ when:
+ - inventory_hostname in groups[item.value.group]
+ - item.value.enabled | bool
+ with_dict: "{{ etcd_services }}"
diff --git a/ansible/roles/etcd/tasks/reconfigure.yml b/ansible/roles/etcd/tasks/reconfigure.yml
index 6eece782d3..e078ef1318 100644
--- a/ansible/roles/etcd/tasks/reconfigure.yml
+++ b/ansible/roles/etcd/tasks/reconfigure.yml
@@ -1,64 +1,2 @@
---
-- name: Ensuring the containers up
- kolla_docker:
- name: "{{ item.name }}"
- action: "get_container_state"
- register: container_state
- failed_when: container_state.Running == false
- when: inventory_hostname in groups[item.group]
- with_items:
- - { name: etcd, group: etcd }
-
-- include: config.yml
-
-- name: Check the configs
- command: docker exec {{ item.name }} /usr/local/bin/kolla_set_configs --check
- changed_when: false
- failed_when: false
- register: check_results
- when: inventory_hostname in groups[item.group]
- with_items:
- - { name: etcd, group: etcd }
-
-# NOTE(jeffrey4l): when config_strategy == 'COPY_ALWAYS'
-# and container env['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE',
-# just remove the container and start again
-- name: Containers config strategy
- kolla_docker:
- name: "{{ item.name }}"
- action: "get_container_env"
- register: container_envs
- when: inventory_hostname in groups[item.group]
- with_items:
- - { name: etcd, group: etcd }
-
-- name: Remove the containers
- kolla_docker:
- name: "{{ item[0]['name'] }}"
- action: "remove_container"
- register: remove_containers
- when:
- - inventory_hostname in groups[item[0]['group']]
- - config_strategy == "COPY_ONCE" or item[1]['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE'
- - item[2]['rc'] == 1
- with_together:
- - [{ name: etcd, group: etcd }]
- - "{{ container_envs.results }}"
- - "{{ check_results.results }}"
-
-- include: start.yml
- when: remove_containers.changed
-
-- name: Restart containers
- kolla_docker:
- name: "{{ item[0]['name'] }}"
- action: "restart_container"
- when:
- - inventory_hostname in groups[item[0]['group']]
- - config_strategy == 'COPY_ALWAYS'
- - item[1]['KOLLA_CONFIG_STRATEGY'] != 'COPY_ONCE'
- - item[2]['rc'] == 1
- with_together:
- - [{ name: etcd, group: etcd }]
- - "{{ container_envs.results }}"
- - "{{ check_results.results }}"
+- include: deploy.yml
diff --git a/ansible/roles/etcd/tasks/start.yml b/ansible/roles/etcd/tasks/start.yml
deleted file mode 100644
index 9b23eaf518..0000000000
--- a/ansible/roles/etcd/tasks/start.yml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-- name: Starting etcd container
- kolla_docker:
- action: "start_container"
- common_options: "{{ docker_common_options }}"
- environment:
- ETCD_DATA_DIR: "/var/lib/etcd"
- ETCD_NAME: "{{ ansible_hostname }}"
- ETCD_ADVERTISE_CLIENT_URLS: "{{ internal_protocol }}://{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ etcd_client_port }}"
- ETCD_LISTEN_CLIENT_URLS: "{{ internal_protocol }}://{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ etcd_client_port }}"
- ETCD_INITIAL_ADVERTISE_PEER_URLS: "{{ internal_protocol }}://{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ etcd_peer_port }}"
- ETCD_LISTEN_PEER_URLS: "{{ internal_protocol }}://{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ etcd_peer_port }}"
- ETCD_INITIAL_CLUSTER_TOKEN: "{{ etcd_cluster_token }}"
- ETCD_INITIAL_CLUSTER: "{% for host in groups['etcd'] %}{{ hostvars[host]['ansible_hostname'] }}={{ internal_protocol }}://{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ etcd_peer_port }}{% if not loop.last %},{% endif %}{% endfor %}"
- ETCD_INITIAL_CLUSTER_STATE: "new"
- ETCD_OUT_FILE: "/var/log/kolla/etcd/etcd.log"
- KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
- image: "{{ etcd_image_full }}"
- name: "etcd"
- volumes:
- - "{{ node_config_directory }}/etcd/:{{ container_config_directory }}/:ro"
- - "/etc/localtime:/etc/localtime:ro"
- - "kolla_etcd:/var/lib/etcd/"
- - "kolla_logs:/var/log/kolla/"
diff --git a/ansible/roles/etcd/tasks/upgrade.yml b/ansible/roles/etcd/tasks/upgrade.yml
index 1f16915ad9..dd26ecc34d 100644
--- a/ansible/roles/etcd/tasks/upgrade.yml
+++ b/ansible/roles/etcd/tasks/upgrade.yml
@@ -1,4 +1,5 @@
---
- include: config.yml
-- include: start.yml
+- name: Flush handlers
+ meta: flush_handlers