Optimize reconfiguration for magnum
Co-Authored-By: caoyuan <cao.yuan@99cloud.net> Change-Id: I478bc30b4fcf61507298f16001370de3e129a11f Partially-implements: blueprint better-reconfigure
This commit is contained in:
parent
7f3d7a30d9
commit
5a47049615
@ -1,6 +1,28 @@
|
|||||||
---
|
---
|
||||||
project_name: "magnum"
|
project_name: "magnum"
|
||||||
|
|
||||||
|
magnum_services:
|
||||||
|
magnum-api:
|
||||||
|
container_name: magnum_api
|
||||||
|
group: magnum-api
|
||||||
|
enabled: true
|
||||||
|
image: "{{ magnum_api_image_full }}"
|
||||||
|
volumes:
|
||||||
|
- "{{ node_config_directory }}/magnum-api/:{{ container_config_directory }}/:ro"
|
||||||
|
- "/etc/localtime:/etc/localtime:ro"
|
||||||
|
- "kolla_logs:/var/log/kolla/"
|
||||||
|
magnum-conductor:
|
||||||
|
container_name: magnum_conductor
|
||||||
|
group: magnum-conductor
|
||||||
|
enabled: true
|
||||||
|
image: "{{ magnum_conductor_image_full }}"
|
||||||
|
volumes:
|
||||||
|
- "{{ node_config_directory }}/magnum-conductor/:{{ container_config_directory }}/:ro"
|
||||||
|
- "/etc/localtime:/etc/localtime:ro"
|
||||||
|
- "magnum:/var/lib/magnum/"
|
||||||
|
- "kolla_logs:/var/log/kolla/"
|
||||||
|
|
||||||
|
|
||||||
####################
|
####################
|
||||||
# Database
|
# Database
|
||||||
####################
|
####################
|
||||||
|
46
ansible/roles/magnum/handlers/main.yml
Normal file
46
ansible/roles/magnum/handlers/main.yml
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
---
|
||||||
|
- name: Restart magnum-api container
|
||||||
|
vars:
|
||||||
|
service_name: "magnum-api"
|
||||||
|
service: "{{ magnum_services[service_name] }}"
|
||||||
|
config_json: "{{ magnum_config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
|
||||||
|
magnum_conf: "{{ magnum_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
|
||||||
|
policy_json: "{{ magnum_policy_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
|
||||||
|
magnum_api_container: "{{ check_magnum_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 magnum_conf.changed | bool
|
||||||
|
or policy_json.changed | bool
|
||||||
|
or magnum_api_container.changed | bool
|
||||||
|
|
||||||
|
- name: Restart magnum-conductor container
|
||||||
|
vars:
|
||||||
|
service_name: "magnum-conductor"
|
||||||
|
service: "{{ magnum_services[service_name] }}"
|
||||||
|
config_json: "{{ magnum_config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
|
||||||
|
magnum_conf: "{{ magnum_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
|
||||||
|
policy_json: "{{ magnum_policy_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
|
||||||
|
magnum_conductor_container: "{{ check_magnum_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 magnum_conf.changed | bool
|
||||||
|
or policy_json.changed | bool
|
||||||
|
or magnum_conductor_container.changed | bool
|
@ -1,5 +1,7 @@
|
|||||||
---
|
---
|
||||||
- name: Running Magnum bootstrap container
|
- name: Running Magnum bootstrap container
|
||||||
|
vars:
|
||||||
|
magnum_api: "{{ magnum_services['magnum-api'] }}"
|
||||||
kolla_docker:
|
kolla_docker:
|
||||||
action: "start_container"
|
action: "start_container"
|
||||||
common_options: "{{ docker_common_options }}"
|
common_options: "{{ docker_common_options }}"
|
||||||
@ -7,14 +9,11 @@
|
|||||||
environment:
|
environment:
|
||||||
KOLLA_BOOTSTRAP:
|
KOLLA_BOOTSTRAP:
|
||||||
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
|
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
|
||||||
image: "{{ magnum_api_image_full }}"
|
image: "{{ magnum_api.image }}"
|
||||||
labels:
|
labels:
|
||||||
BOOTSTRAP:
|
BOOTSTRAP:
|
||||||
name: "bootstrap_magnum"
|
name: "bootstrap_magnum"
|
||||||
restart_policy: "never"
|
restart_policy: "never"
|
||||||
volumes:
|
volumes: "{{ magnum_api.volumes }}"
|
||||||
- "{{ node_config_directory }}/magnum-api/:{{ container_config_directory }}/:ro"
|
|
||||||
- "/etc/localtime:/etc/localtime:ro"
|
|
||||||
- "kolla_logs:/var/log/kolla"
|
|
||||||
run_once: True
|
run_once: True
|
||||||
delegate_to: "{{ groups['magnum-api'][0] }}"
|
delegate_to: "{{ groups[magnum_api.group][0] }}"
|
||||||
|
@ -1,37 +1,46 @@
|
|||||||
---
|
---
|
||||||
- name: Ensuring config directories exist
|
- name: Ensuring config directories exist
|
||||||
file:
|
file:
|
||||||
path: "{{ node_config_directory }}/{{ item }}"
|
path: "{{ node_config_directory }}/{{ item.key }}"
|
||||||
state: "directory"
|
state: "directory"
|
||||||
recurse: yes
|
recurse: yes
|
||||||
with_items:
|
when: inventory_hostname in groups[item.value.group]
|
||||||
- "magnum-api"
|
with_dict: "{{ magnum_services }}"
|
||||||
- "magnum-conductor"
|
|
||||||
|
|
||||||
- name: Copying over config.json files for services
|
- name: Copying over config.json files for services
|
||||||
template:
|
template:
|
||||||
src: "{{ item }}.json.j2"
|
src: "{{ item.key }}.json.j2"
|
||||||
dest: "{{ node_config_directory }}/{{ item }}/config.json"
|
dest: "{{ node_config_directory }}/{{ item.key }}/config.json"
|
||||||
with_items:
|
register: magnum_config_jsons
|
||||||
- "magnum-api"
|
when:
|
||||||
- "magnum-conductor"
|
- inventory_hostname in groups[item.value.group]
|
||||||
|
- item.value.enabled | bool
|
||||||
|
with_dict: "{{ magnum_services }}"
|
||||||
|
notify:
|
||||||
|
- Restart magnum-api container
|
||||||
|
- Restart magnum-conductor container
|
||||||
|
|
||||||
- name: Copying over magnum.conf
|
- name: Copying over magnum.conf
|
||||||
merge_configs:
|
merge_configs:
|
||||||
vars:
|
vars:
|
||||||
service_name: "magnum-api"
|
service_name: "{{ item.key }}"
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/magnum.conf.j2"
|
- "{{ role_path }}/templates/magnum.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
- "{{ node_custom_config }}/database.conf"
|
- "{{ node_custom_config }}/database.conf"
|
||||||
- "{{ node_custom_config }}/messaging.conf"
|
- "{{ node_custom_config }}/messaging.conf"
|
||||||
- "{{ node_custom_config }}/magnum.conf"
|
- "{{ node_custom_config }}/magnum.conf"
|
||||||
- "{{ node_custom_config }}/magnum/{{ item }}.conf"
|
- "{{ node_custom_config }}/magnum/{{ item.key }}.conf"
|
||||||
- "{{ node_custom_config }}/magnum/{{ inventory_hostname }}/magnum.conf"
|
- "{{ node_custom_config }}/magnum/{{ inventory_hostname }}/magnum.conf"
|
||||||
dest: "{{ node_config_directory }}/{{ item }}/magnum.conf"
|
dest: "{{ node_config_directory }}/{{ item.key }}/magnum.conf"
|
||||||
with_items:
|
register: magnum_confs
|
||||||
- "magnum-api"
|
when:
|
||||||
- "magnum-conductor"
|
- inventory_hostname in groups[item.value.group]
|
||||||
|
- item.value.enabled | bool
|
||||||
|
with_dict: "{{ magnum_services }}"
|
||||||
|
notify:
|
||||||
|
- Restart magnum-api container
|
||||||
|
- Restart magnum-conductor container
|
||||||
|
|
||||||
- name: Check if policies shall be overwritten
|
- name: Check if policies shall be overwritten
|
||||||
local_action: stat path="{{ node_custom_config }}/magnum/policy.json"
|
local_action: stat path="{{ node_custom_config }}/magnum/policy.json"
|
||||||
@ -40,9 +49,30 @@
|
|||||||
- name: Copying over existing policy.json
|
- name: Copying over existing policy.json
|
||||||
template:
|
template:
|
||||||
src: "{{ node_custom_config }}/magnum/policy.json"
|
src: "{{ node_custom_config }}/magnum/policy.json"
|
||||||
dest: "{{ node_config_directory }}/{{ item }}/policy.json"
|
dest: "{{ node_config_directory }}/{{ item.key }}/policy.json"
|
||||||
with_items:
|
register: magnum_policy_jsons
|
||||||
- "magnum-api"
|
|
||||||
- "magnum-conductor"
|
|
||||||
when:
|
when:
|
||||||
magnum_policy.stat.exists
|
- magnum_policy.stat.exists
|
||||||
|
- inventory_hostname in groups[item.value.group]
|
||||||
|
- item.value.enabled | bool
|
||||||
|
with_dict: "{{ magnum_services }}"
|
||||||
|
notify:
|
||||||
|
- Restart magnum-api container
|
||||||
|
- Restart magnum-conductor container
|
||||||
|
|
||||||
|
- name: Check magnum 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_magnum_containers
|
||||||
|
when:
|
||||||
|
- action != "config"
|
||||||
|
- inventory_hostname in groups[item.value.group]
|
||||||
|
- item.value.enabled | bool
|
||||||
|
with_dict: "{{ magnum_services }}"
|
||||||
|
notify:
|
||||||
|
- Restart magnum-api container
|
||||||
|
- Restart magnum-conductor container
|
||||||
|
@ -9,6 +9,5 @@
|
|||||||
- include: bootstrap.yml
|
- include: bootstrap.yml
|
||||||
when: inventory_hostname in groups['magnum-api']
|
when: inventory_hostname in groups['magnum-api']
|
||||||
|
|
||||||
- include: start.yml
|
- name: Flush handlers
|
||||||
when: inventory_hostname in groups['magnum-api'] or
|
meta: flush_handlers
|
||||||
inventory_hostname in groups['magnum-conductor']
|
|
||||||
|
@ -1,14 +1,10 @@
|
|||||||
---
|
---
|
||||||
- name: Pulling magnum-api image
|
- name: Pulling magnum images
|
||||||
kolla_docker:
|
kolla_docker:
|
||||||
action: "pull_image"
|
action: "pull_image"
|
||||||
common_options: "{{ docker_common_options }}"
|
common_options: "{{ docker_common_options }}"
|
||||||
image: "{{ magnum_api_image_full }}"
|
image: "{{ item.value.image }}"
|
||||||
when: inventory_hostname in groups['magnum-api']
|
when:
|
||||||
|
- inventory_hostname in groups[item.value.group]
|
||||||
- name: Pulling magnum-conductor image
|
- item.value.enabled | bool
|
||||||
kolla_docker:
|
with_dict: "{{ magnum_services }}"
|
||||||
action: "pull_image"
|
|
||||||
common_options: "{{ docker_common_options }}"
|
|
||||||
image: "{{ magnum_conductor_image_full }}"
|
|
||||||
when: inventory_hostname in groups['magnum-conductor']
|
|
||||||
|
@ -1,69 +1,2 @@
|
|||||||
---
|
---
|
||||||
- name: Ensuring the containers up
|
- include: deploy.yml
|
||||||
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: magnum_api, group: magnum-api }
|
|
||||||
- { name: magnum_conductor, group: magnum-conductor }
|
|
||||||
|
|
||||||
- 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: magnum_api, group: magnum-api }
|
|
||||||
- { name: magnum_conductor, group: magnum-conductor }
|
|
||||||
|
|
||||||
# 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: magnum_api, group: magnum-api }
|
|
||||||
- { name: magnum_conductor, group: magnum-conductor }
|
|
||||||
|
|
||||||
- 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: magnum_api, group: magnum-api },
|
|
||||||
{ name: magnum_conductor, group: magnum-conductor }]
|
|
||||||
- "{{ 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: magnum_api, group: magnum-api },
|
|
||||||
{ name: magnum_conductor, group: magnum-conductor }]
|
|
||||||
- "{{ container_envs.results }}"
|
|
||||||
- "{{ check_results.results }}"
|
|
||||||
|
@ -1,25 +0,0 @@
|
|||||||
---
|
|
||||||
- name: Starting magnum-api container
|
|
||||||
kolla_docker:
|
|
||||||
action: "start_container"
|
|
||||||
common_options: "{{ docker_common_options }}"
|
|
||||||
image: "{{ magnum_api_image_full }}"
|
|
||||||
name: "magnum_api"
|
|
||||||
volumes:
|
|
||||||
- "{{ node_config_directory }}/magnum-api/:{{ container_config_directory }}/:ro"
|
|
||||||
- "/etc/localtime:/etc/localtime:ro"
|
|
||||||
- "kolla_logs:/var/log/kolla/"
|
|
||||||
when: inventory_hostname in groups['magnum-api']
|
|
||||||
|
|
||||||
- name: Starting magnum-conductor container
|
|
||||||
kolla_docker:
|
|
||||||
action: "start_container"
|
|
||||||
common_options: "{{ docker_common_options }}"
|
|
||||||
image: "{{ magnum_conductor_image_full }}"
|
|
||||||
name: "magnum_conductor"
|
|
||||||
volumes:
|
|
||||||
- "{{ node_config_directory }}/magnum-conductor/:{{ container_config_directory }}/:ro"
|
|
||||||
- "/etc/localtime:/etc/localtime:ro"
|
|
||||||
- "magnum:/var/lib/magnum/"
|
|
||||||
- "kolla_logs:/var/log/kolla/"
|
|
||||||
when: inventory_hostname in groups['magnum-conductor']
|
|
@ -3,4 +3,5 @@
|
|||||||
|
|
||||||
- include: bootstrap_service.yml
|
- include: bootstrap_service.yml
|
||||||
|
|
||||||
- include: start.yml
|
- name: Flush handlers
|
||||||
|
meta: flush_handlers
|
||||||
|
Loading…
Reference in New Issue
Block a user