openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Add spacing for readability"

This commit is contained in:
Zuul 2018-04-10 03:54:22 +00:00 committed by Gerrit Code Review
parent 6f8322b52f 0b23ff7ec9
commit 3fdb4c85a9
2 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
common/deploy-steps-tasks.yaml
View File

@ -3,12 +3,14 @@
################################################## ##################################################
# Step 1 block, write data for subsequent steps # Step 1 block, write data for subsequent steps
################################################## ##################################################
- name: Write config data at the start of step 1 - name: Write config data at the start of step 1
when: step == "1" when: step == "1"
become: true become: true
block: block:
- name: Create /var/lib/tripleo-config directory - name: Create /var/lib/tripleo-config directory
file: path=/var/lib/tripleo-config state=directory setype=svirt_sandbox_file_t selevel=s0 recurse=true file: path=/var/lib/tripleo-config state=directory setype=svirt_sandbox_file_t selevel=s0 recurse=true
# Puppet manifest for baremetal host configuration # Puppet manifest for baremetal host configuration
- name: Check if puppet step_config.pp manifest exists - name: Check if puppet step_config.pp manifest exists
delegate_to: localhost delegate_to: localhost
@ -16,33 +18,39 @@
stat: stat:
path: "{{ role_name + '/step_config.pp' }}" path: "{{ role_name + '/step_config.pp' }}"
register: stat_step_config register: stat_step_config
- name: Set fact when file existed - name: Set fact when file existed
no_log: True no_log: True
set_fact: set_fact:
role_data_step_config: "{{lookup('file', role_name + '/step_config.pp')}}" role_data_step_config: "{{lookup('file', role_name + '/step_config.pp')}}"
when: stat_step_config.stat.exists when: stat_step_config.stat.exists
- name: Write the puppet step_config manifest - name: Write the puppet step_config manifest
copy: content="{{role_data_step_config}}" dest=/var/lib/tripleo-config/puppet_step_config.pp force=yes mode=0600 copy: content="{{role_data_step_config}}" dest=/var/lib/tripleo-config/puppet_step_config.pp force=yes mode=0600
# Config file for our docker-puppet.py script, used to generate container configs # Config file for our docker-puppet.py script, used to generate container configs
- name: Create /var/lib/docker-puppet - name: Create /var/lib/docker-puppet
file: path=/var/lib/docker-puppet state=directory setype=svirt_sandbox_file_t selevel=s0 recurse=true file: path=/var/lib/docker-puppet state=directory setype=svirt_sandbox_file_t selevel=s0 recurse=true
- name: Check if docker-puppet puppet_config.yaml configuration file exists - name: Check if docker-puppet puppet_config.yaml configuration file exists
delegate_to: localhost delegate_to: localhost
become: false become: false
stat: stat:
path: "{{ role_name + '/puppet_config.yaml' }}" path: "{{ role_name + '/puppet_config.yaml' }}"
register: stat_puppet_config register: stat_puppet_config
- name: Set fact when file existed - name: Set fact when file existed
no_log: True no_log: True
set_fact: set_fact:
role_data_puppet_config: "{{lookup('file', role_name + '/puppet_config.yaml') | from_yaml | to_json}}" role_data_puppet_config: "{{lookup('file', role_name + '/puppet_config.yaml') | from_yaml | to_json}}"
when: stat_puppet_config.stat.exists when: stat_puppet_config.stat.exists
- name: Write docker-puppet.json file - name: Write docker-puppet.json file
copy: content="{{role_data_puppet_config}}" dest=/var/lib/docker-puppet/docker-puppet.json force=yes mode=0600 copy: content="{{role_data_puppet_config}}" dest=/var/lib/docker-puppet/docker-puppet.json force=yes mode=0600
- name: Create /var/lib/docker-config-scripts - name: Create /var/lib/docker-config-scripts
file: path=/var/lib/docker-config-scripts state=directory file: path=/var/lib/docker-config-scripts state=directory
# The container config files # The container config files
# /var/lib/docker-container-startup-configs.json is removed as we now write # /var/lib/docker-container-startup-configs.json is removed as we now write
# per-step files instead # per-step files instead
@ -50,20 +58,24 @@
file: file:
path: /var/lib/docker-container-startup-configs.json path: /var/lib/docker-container-startup-configs.json
state: absent state: absent
- name: Check if docker_config_scripts.yaml file exists - name: Check if docker_config_scripts.yaml file exists
delegate_to: localhost delegate_to: localhost
become: false become: false
stat: stat:
path: "{{ role_name + '/docker_config_scripts.yaml' }}" path: "{{ role_name + '/docker_config_scripts.yaml' }}"
register: stat_docker_config_scripts register: stat_docker_config_scripts
- name: Set fact when file existed - name: Set fact when file existed
no_log: True no_log: True
set_fact: set_fact:
role_data_docker_config_scripts: "{{lookup('file', role_name + '/docker_config_scripts.yaml') | from_yaml}}" role_data_docker_config_scripts: "{{lookup('file', role_name + '/docker_config_scripts.yaml') | from_yaml}}"
when: stat_docker_config_scripts.stat.exists when: stat_docker_config_scripts.stat.exists
- name: Write docker config scripts - name: Write docker config scripts
copy: content="{{item.value.content}}" dest="/var/lib/docker-config-scripts/{{item.key}}" force=yes mode="{{item.value.mode|default('0600', true)}}" copy: content="{{item.value.content}}" dest="/var/lib/docker-config-scripts/{{item.key}}" force=yes mode="{{item.value.mode|default('0600', true)}}"
with_dict: "{{role_data_docker_config_scripts}}" with_dict: "{{role_data_docker_config_scripts}}"
# Here we are dumping all the docker container startup configuration data # Here we are dumping all the docker container startup configuration data
# so that we can have access to how they are started outside of heat # so that we can have access to how they are started outside of heat
# and docker-cmd. This lets us create command line tools to test containers. # and docker-cmd. This lets us create command line tools to test containers.
@ -74,45 +86,56 @@
set_fact: set_fact:
docker_config_default: "{{ docker_config_default|default({}) | combine( {'step_'+item: {}} ) }}" docker_config_default: "{{ docker_config_default|default({}) | combine( {'step_'+item: {}} ) }}"
with_sequence: count={{deploy_steps_max}} with_sequence: count={{deploy_steps_max}}
- name: Check if docker_config.yaml file exists - name: Check if docker_config.yaml file exists
delegate_to: localhost delegate_to: localhost
become: false become: false
stat: stat:
path: "{{ role_name + '/docker_config.yaml' }}" path: "{{ role_name + '/docker_config.yaml' }}"
register: stat_docker_config register: stat_docker_config
- name: Set fact when file existed - name: Set fact when file existed
no_log: True no_log: True
set_fact: set_fact:
role_data_docker_config: "{{lookup('file', role_name + '/docker_config.yaml') | from_yaml}}" role_data_docker_config: "{{lookup('file', role_name + '/docker_config.yaml') | from_yaml}}"
when: stat_docker_config.stat.exists when: stat_docker_config.stat.exists
- name: Set docker_startup_configs_with_default fact - name: Set docker_startup_configs_with_default fact
no_log: True no_log: True
set_fact: set_fact:
docker_config_with_default: "{{docker_config_default | combine(role_data_docker_config)}}" docker_config_with_default: "{{docker_config_default | combine(role_data_docker_config)}}"
- name: Write docker-container-startup-configs - name: Write docker-container-startup-configs
copy: content="{{docker_config_with_default | to_json }}" dest=/var/lib/docker-container-startup-configs.json force=yes mode=0600 copy: content="{{docker_config_with_default | to_json }}" dest=/var/lib/docker-container-startup-configs.json force=yes mode=0600
- name: Write per-step docker-container-startup-configs - name: Write per-step docker-container-startup-configs
copy: content="{{item.value|to_json}}" dest="/var/lib/tripleo-config/docker-container-startup-config-{{item.key}}.json" force=yes mode=0600 copy: content="{{item.value|to_json}}" dest="/var/lib/tripleo-config/docker-container-startup-config-{{item.key}}.json" force=yes mode=0600
with_dict: "{{docker_config_with_default}}" with_dict: "{{docker_config_with_default}}"
- name: Create /var/lib/kolla/config_files directory - name: Create /var/lib/kolla/config_files directory
file: path=/var/lib/kolla/config_files state=directory setype=svirt_sandbox_file_t selevel=s0 recurse=true file: path=/var/lib/kolla/config_files state=directory setype=svirt_sandbox_file_t selevel=s0 recurse=true
- name: Check if kolla_config.yaml file exists - name: Check if kolla_config.yaml file exists
delegate_to: localhost delegate_to: localhost
become: false become: false
stat: stat:
path: "{{ role_name + '/kolla_config.yaml' }}" path: "{{ role_name + '/kolla_config.yaml' }}"
register: stat_kolla_config register: stat_kolla_config
- name: Set fact when file existed - name: Set fact when file existed
no_log: True no_log: True
set_fact: set_fact:
role_data_kolla_config: "{{lookup('file', role_name + '/kolla_config.yaml') | from_yaml}}" role_data_kolla_config: "{{lookup('file', role_name + '/kolla_config.yaml') | from_yaml}}"
when: stat_kolla_config.stat.exists when: stat_kolla_config.stat.exists
- name: Write kolla config json files - name: Write kolla config json files
copy: content="{{item.value|to_json}}" dest="{{item.key}}" force=yes mode=0600 copy: content="{{item.value|to_json}}" dest="{{item.key}}" force=yes mode=0600
with_dict: "{{role_data_kolla_config}}" with_dict: "{{role_data_kolla_config}}"
######################################################## ########################################################
# Bootstrap tasks, only performed on bootstrap_server_id # Bootstrap tasks, only performed on bootstrap_server_id
######################################################## ########################################################
- name: Clean /var/lib/docker-puppet/docker-puppet-tasks*.json files - name: Clean /var/lib/docker-puppet/docker-puppet-tasks*.json files
file: file:
path: "{{item}}" path: "{{item}}"
@ -120,17 +143,20 @@
with_fileglob: with_fileglob:
- /var/lib/docker-puppet/docker-puppet-tasks*.json - /var/lib/docker-puppet/docker-puppet-tasks*.json
when: deploy_server_id == bootstrap_server_id when: deploy_server_id == bootstrap_server_id
- name: Check if docker_puppet_tasks.yaml file exists - name: Check if docker_puppet_tasks.yaml file exists
delegate_to: localhost delegate_to: localhost
become: false become: false
stat: stat:
path: "{{ role_name + '/docker_puppet_tasks.yaml' }}" path: "{{ role_name + '/docker_puppet_tasks.yaml' }}"
register: stat_docker_puppet_tasks register: stat_docker_puppet_tasks
- name: Set fact when file existed - name: Set fact when file existed
no_log: True no_log: True
set_fact: set_fact:
role_data_docker_puppet_tasks: "{{lookup('file', role_name + '/docker_puppet_tasks.yaml') | from_yaml}}" role_data_docker_puppet_tasks: "{{lookup('file', role_name + '/docker_puppet_tasks.yaml') | from_yaml}}"
when: stat_docker_puppet_tasks.stat.exists when: stat_docker_puppet_tasks.stat.exists
- name: Write docker-puppet-tasks json files - name: Write docker-puppet-tasks json files
copy: content="{{item.value|to_json}}" dest=/var/lib/docker-puppet/docker-puppet-tasks{{item.key.replace("step_", "")}}.json force=yes mode=0600 copy: content="{{item.value|to_json}}" dest=/var/lib/docker-puppet/docker-puppet-tasks{{item.key.replace("step_", "")}}.json force=yes mode=0600
with_dict: "{{role_data_docker_puppet_tasks}}" with_dict: "{{role_data_docker_puppet_tasks}}"
@ -139,15 +165,18 @@
##################################################### #####################################################
# Per step puppet configuration of the baremetal host # Per step puppet configuration of the baremetal host
##################################################### #####################################################
- name: Set host puppet debugging fact string - name: Set host puppet debugging fact string
set_fact: set_fact:
host_puppet_config_debug: "--debug --verbose" host_puppet_config_debug: "--debug --verbose"
when: when:
- enable_puppet|default(true)|bool - enable_puppet|default(true)|bool
- enable_debug|default(false)|bool - enable_debug|default(false)|bool
- name: Write the config_step hieradata - name: Write the config_step hieradata
copy: content="{{dict(step=step|int)|to_json}}" dest=/etc/puppet/hieradata/config_step.json force=true mode=0600 copy: content="{{dict(step=step|int)|to_json}}" dest=/etc/puppet/hieradata/config_step.json force=true mode=0600
become: true become: true
- name: Run puppet host configuration for step {{step}} - name: Run puppet host configuration for step {{step}}
when: enable_puppet|default(true)|bool when: enable_puppet|default(true)|bool
command: >- command: >-
@ -163,15 +192,18 @@
failed_when: false failed_when: false
no_log: true no_log: true
become: true become: true
- name: "Debug output for task which failed: Run puppet host configuration for step {{step}}" - name: "Debug output for task which failed: Run puppet host configuration for step {{step}}"
debug: var=outputs.stdout_lines|default([])|union(outputs.stderr_lines|default([])) debug: var=outputs.stdout_lines|default([])|union(outputs.stderr_lines|default([]))
when: when:
- enable_puppet|default(true)|bool - enable_puppet|default(true)|bool
- outputs.rc is defined - outputs.rc is defined
failed_when: outputs.rc not in [0, 2] failed_when: outputs.rc not in [0, 2]
###################################### ######################################
# Generate config via docker-puppet.py # Generate config via docker-puppet.py
###################################### ######################################
- name: Run docker-puppet tasks (generate config) during step {{step}} - name: Run docker-puppet tasks (generate config) during step {{step}}
shell: python /var/lib/docker-puppet/docker-puppet.py shell: python /var/lib/docker-puppet/docker-puppet.py
environment: environment:
@ -185,13 +217,16 @@
failed_when: false failed_when: false
no_log: true no_log: true
become: true become: true
- name: "Debug output for task which failed: Run docker-puppet tasks (generate config) during step {{step}}" - name: "Debug output for task which failed: Run docker-puppet tasks (generate config) during step {{step}}"
debug: var=outputs.stdout_lines|default([])|union(outputs.stderr_lines|default([])) debug: var=outputs.stdout_lines|default([])|union(outputs.stderr_lines|default([]))
when: outputs.rc is defined when: outputs.rc is defined
failed_when: outputs.rc != 0 failed_when: outputs.rc != 0
################################################## ##################################################
# Per step starting of the containers using paunch # Per step starting of the containers using paunch
################################################## ##################################################
# Note docker-puppet.py generates the hashed-*.json file, which is a copy of # Note docker-puppet.py generates the hashed-*.json file, which is a copy of
# the *step_n.json with a hash of the generated external config added # the *step_n.json with a hash of the generated external config added
# This acts as a salt to enable restarting the container if config changes # This acts as a salt to enable restarting the container if config changes
@ -206,18 +241,22 @@
failed_when: false failed_when: false
no_log: true no_log: true
become: true become: true
- name: "Debug output for task which failed: Start containers for step {{step}}" - name: "Debug output for task which failed: Start containers for step {{step}}"
debug: var=outputs.stdout_lines|default([])|union(outputs.stderr_lines|default([])) debug: var=outputs.stdout_lines|default([])|union(outputs.stderr_lines|default([]))
when: outputs.rc is defined when: outputs.rc is defined
failed_when: outputs.rc != 0 failed_when: outputs.rc != 0
######################################################## ########################################################
# Bootstrap tasks, only performed on bootstrap_server_id # Bootstrap tasks, only performed on bootstrap_server_id
######################################################## ########################################################
- name: Check if /var/lib/docker-puppet/docker-puppet-tasks{{step}}.json exists - name: Check if /var/lib/docker-puppet/docker-puppet-tasks{{step}}.json exists
stat: stat:
path: /var/lib/docker-puppet/docker-puppet-tasks{{step}}.json path: /var/lib/docker-puppet/docker-puppet-tasks{{step}}.json
register: docker_puppet_tasks_json register: docker_puppet_tasks_json
become: true become: true
- name: Run docker-puppet tasks (bootstrap tasks) for step {{step}} - name: Run docker-puppet tasks (bootstrap tasks) for step {{step}}
shell: python /var/lib/docker-puppet/docker-puppet.py shell: python /var/lib/docker-puppet/docker-puppet.py
environment: environment:
@ -232,7 +271,9 @@
failed_when: false failed_when: false
no_log: true no_log: true
become: true become: true
- name: "Debug output for task which failed: Run docker-puppet tasks (bootstrap tasks) for step {{step}}" - name: "Debug output for task which failed: Run docker-puppet tasks (bootstrap tasks) for step {{step}}"
debug: var=outputs.stdout_lines|default([])|union(outputs.stderr_lines|default([])) debug: var=outputs.stdout_lines|default([])|union(outputs.stderr_lines|default([]))
when: outputs.rc is defined when: outputs.rc is defined
failed_when: outputs.rc != 0 failed_when: outputs.rc != 0

12
common/deploy-steps.j2
View File

@ -389,11 +389,13 @@ outputs:
become: false become: false
tags: tags:
- facts - facts
- hosts: overcloud - hosts: overcloud
name: Gather facts overcloud name: Gather facts overcloud
gather_facts: yes gather_facts: yes
tags: tags:
- facts - facts
- hosts: all - hosts: all
name: Load global variables name: Load global variables
gather_facts: no gather_facts: no
@ -401,6 +403,7 @@ outputs:
- include_vars: global_vars.yaml - include_vars: global_vars.yaml
tags: tags:
- always - always
- hosts: overcloud - hosts: overcloud
name: Common roles for TripleO servers name: Common roles for TripleO servers
gather_facts: no gather_facts: no
@ -410,6 +413,7 @@ outputs:
- tripleo-ssh-known-hosts - tripleo-ssh-known-hosts
tags: tags:
- common_roles - common_roles
- hosts: overcloud - hosts: overcloud
name: Overcloud deploy step tasks for step 0 name: Overcloud deploy step tasks for step 0
gather_facts: no gather_facts: no
@ -440,6 +444,7 @@ outputs:
tags: tags:
- overcloud - overcloud
- pre_deploy_steps - pre_deploy_steps
- hosts: overcloud - hosts: overcloud
name: Host prep steps name: Host prep steps
gather_facts: no gather_facts: no
@ -455,7 +460,9 @@ outputs:
tags: tags:
- overcloud - overcloud
- host_prep_steps - host_prep_steps
{%- for step in range(1,deploy_steps_max) %} {%- for step in range(1,deploy_steps_max) %}
- hosts: undercloud - hosts: undercloud
name: External deployment step {{step}} name: External deployment step {{step}}
gather_facts: no gather_facts: no
@ -468,6 +475,7 @@ outputs:
tags: tags:
- external - external
- external_deploy_steps - external_deploy_steps
- hosts: overcloud - hosts: overcloud
name: Overcloud deploy step tasks for {{step}} name: Overcloud deploy step tasks for {{step}}
gather_facts: no gather_facts: no
@ -486,6 +494,7 @@ outputs:
tags: tags:
- overcloud - overcloud
- deploy_steps - deploy_steps
- hosts: overcloud - hosts: overcloud
name: Overcloud common deploy step tasks {{step}} name: Overcloud common deploy step tasks {{step}}
gather_facts: no gather_facts: no
@ -498,6 +507,7 @@ outputs:
tags: tags:
- overcloud - overcloud
- deploy_steps - deploy_steps
{%- endfor %} {%- endfor %}
- hosts: overcloud - hosts: overcloud
name: Server Post Deployments name: Server Post Deployments
@ -514,6 +524,7 @@ outputs:
tags: tags:
- overcloud - overcloud
- post_deploy_steps - post_deploy_steps
- hosts: undercloud - hosts: undercloud
name: External deployment Post Deploy tasks name: External deployment Post Deploy tasks
gather_facts: no gather_facts: no
@ -524,6 +535,7 @@ outputs:
tags: tags:
- external - external
- external_deploy_steps - external_deploy_steps
external_deploy_steps_tasks: {get_attr: [ExternalDeployTasks, value]} external_deploy_steps_tasks: {get_attr: [ExternalDeployTasks, value]}
external_post_deploy_steps_tasks: {get_attr: [ExternalPostDeployTasks, value]} external_post_deploy_steps_tasks: {get_attr: [ExternalPostDeployTasks, value]}
update_steps_tasks: | update_steps_tasks: |