4320ee55ba
The mechanism to pass config files to the neutron-ovs-agent container was overly complex and not at all justified. This commit removes a few useless parameters and aligns the neutron-ovs-agents with the rest of the containers. Change-Id: Ib9a5985ac9d098731c2fb798d6c9e03cba4b87dd
232 lines
6.9 KiB
YAML
232 lines
6.9 KiB
YAML
heat_template_version: ocata
|
|
|
|
description: >
|
|
Post-deploy configuration steps via puppet for all roles,
|
|
as defined in ../roles_data.yaml
|
|
|
|
parameters:
|
|
servers:
|
|
type: json
|
|
description: Mapping of Role name e.g Controller to a list of servers
|
|
|
|
role_data:
|
|
type: json
|
|
description: Mapping of Role name e.g Controller to the per-role data
|
|
|
|
DeployIdentifier:
|
|
default: ''
|
|
type: string
|
|
description: >
|
|
Setting this to a unique value will re-run any deployment tasks which
|
|
perform configuration on a Heat stack-update.
|
|
|
|
DockerNamespace:
|
|
description: namespace
|
|
default: 'tripleoupstream'
|
|
type: string
|
|
|
|
LibvirtConfig:
|
|
type: string
|
|
default: "/etc/libvirt/libvirtd.conf"
|
|
|
|
NovaConfig:
|
|
type: string
|
|
default: "/etc/nova/nova.conf,/etc/nova/rootwrap.conf"
|
|
|
|
NeutronOpenvswitchAgentConfig:
|
|
type: string
|
|
default: "/etc/neutron/neutron.conf,/etc/neutron/plugins/ml2/openvswitch_agent.ini"
|
|
|
|
resources:
|
|
|
|
{% for role in roles %}
|
|
# Post deployment steps for all roles
|
|
# A single config is re-applied with an incrementing step number
|
|
# {{role.name}} Role steps
|
|
{{role.name}}ArtifactsConfig:
|
|
type: ../puppet/deploy-artifacts.yaml
|
|
|
|
{{role.name}}ArtifactsDeploy:
|
|
type: OS::Heat::StructuredDeploymentGroup
|
|
properties:
|
|
servers: {get_param: [servers, {{role.name}}]}
|
|
config: {get_resource: {{role.name}}ArtifactsConfig}
|
|
|
|
{{role.name}}PreConfig:
|
|
type: OS::TripleO::Tasks::{{role.name}}PreConfig
|
|
properties:
|
|
servers: {get_param: [servers, {{role.name}}]}
|
|
input_values:
|
|
update_identifier: {get_param: DeployIdentifier}
|
|
|
|
{{role.name}}Config:
|
|
type: OS::TripleO::{{role.name}}Config
|
|
properties:
|
|
StepConfig: {get_param: [role_data, {{role.name}}, step_config]}
|
|
{% if role.name.lower() == 'compute' %}
|
|
PuppetTags: {get_param: [role_data, {{role.name}}, puppet_tags]}
|
|
{% endif %}
|
|
|
|
# Step through a series of configuration steps
|
|
{{role.name}}Deployment_Step1:
|
|
type: OS::Heat::StructuredDeploymentGroup
|
|
depends_on: [{{role.name}}PreConfig, {{role.name}}ArtifactsDeploy]
|
|
properties:
|
|
name: {{role.name}}Deployment_Step1
|
|
servers: {get_param: [servers, {{role.name}}]}
|
|
config: {get_resource: {{role.name}}Config}
|
|
input_values:
|
|
step: 1
|
|
update_identifier: {get_param: DeployIdentifier}
|
|
|
|
{{role.name}}Deployment_Step2:
|
|
type: OS::Heat::StructuredDeploymentGroup
|
|
depends_on:
|
|
{% for dep in roles %}
|
|
- {{dep.name}}Deployment_Step1
|
|
{% endfor %}
|
|
properties:
|
|
name: {{role.name}}Deployment_Step2
|
|
servers: {get_param: [servers, {{role.name}}]}
|
|
config: {get_resource: {{role.name}}Config}
|
|
input_values:
|
|
step: 2
|
|
update_identifier: {get_param: DeployIdentifier}
|
|
|
|
{{role.name}}Deployment_Step3:
|
|
type: OS::Heat::StructuredDeploymentGroup
|
|
depends_on:
|
|
{% for dep in roles %}
|
|
- {{dep.name}}Deployment_Step2
|
|
{% endfor %}
|
|
properties:
|
|
name: {{role.name}}Deployment_Step3
|
|
servers: {get_param: [servers, {{role.name}}]}
|
|
config: {get_resource: {{role.name}}Config}
|
|
input_values:
|
|
step: 3
|
|
update_identifier: {get_param: DeployIdentifier}
|
|
|
|
{{role.name}}Deployment_Step4:
|
|
type: OS::Heat::StructuredDeploymentGroup
|
|
depends_on:
|
|
{% for dep in roles %}
|
|
- {{dep.name}}Deployment_Step3
|
|
{% endfor %}
|
|
properties:
|
|
name: {{role.name}}Deployment_Step4
|
|
servers: {get_param: [servers, {{role.name}}]}
|
|
config: {get_resource: {{role.name}}Config}
|
|
input_values:
|
|
step: 4
|
|
update_identifier: {get_param: DeployIdentifier}
|
|
|
|
{{role.name}}Deployment_Step5:
|
|
type: OS::Heat::StructuredDeploymentGroup
|
|
depends_on:
|
|
{% for dep in roles %}
|
|
- {{dep.name}}Deployment_Step4
|
|
{% endfor %}
|
|
properties:
|
|
name: {{role.name}}Deployment_Step5
|
|
servers: {get_param: [servers, {{role.name}}]}
|
|
config: {get_resource: {{role.name}}Config}
|
|
input_values:
|
|
step: 5
|
|
update_identifier: {get_param: DeployIdentifier}
|
|
|
|
{{role.name}}PostConfig:
|
|
type: OS::TripleO::Tasks::{{role.name}}PostConfig
|
|
depends_on:
|
|
{% for dep in roles %}
|
|
- {{dep.name}}Deployment_Step5
|
|
{% endfor %}
|
|
properties:
|
|
servers: {get_param: servers}
|
|
input_values:
|
|
update_identifier: {get_param: DeployIdentifier}
|
|
|
|
# Note, this should come last, so use depends_on to ensure
|
|
# this is created after any other resources.
|
|
{{role.name}}ExtraConfigPost:
|
|
depends_on:
|
|
{% for dep in roles %}
|
|
- {{dep.name}}PostConfig
|
|
{% endfor %}
|
|
type: OS::TripleO::NodeExtraConfigPost
|
|
properties:
|
|
servers: {get_param: [servers, {{role.name}}]}
|
|
|
|
{% if role.name.lower() == 'compute' %}
|
|
CopyEtcConfig:
|
|
type: OS::Heat::SoftwareConfig
|
|
depends_on: {{role.name}}PostConfig
|
|
properties:
|
|
group: script
|
|
outputs:
|
|
- name: result
|
|
config: {get_file: ../docker/copy-etc.sh}
|
|
|
|
CopyEtcDeployment:
|
|
type: OS::Heat::SoftwareDeploymentGroup
|
|
properties:
|
|
name: CopyEtcDeployment
|
|
servers: {get_param: [servers, {{role.name}}]}
|
|
config: {get_resource: CopyEtcConfig}
|
|
|
|
CopyJsonConfig:
|
|
type: OS::Heat::SoftwareConfig
|
|
properties:
|
|
group: script
|
|
inputs:
|
|
- name: libvirt_config
|
|
- name: nova_config
|
|
- name: neutron_openvswitch_agent_config
|
|
config: {get_file: ../docker/copy-json.py}
|
|
|
|
CopyJsonDeployment:
|
|
type: OS::Heat::SoftwareDeploymentGroup
|
|
depends_on: CopyEtcDeployment
|
|
properties:
|
|
name: CopyJsonDeployment
|
|
config: {get_resource: CopyJsonConfig}
|
|
servers: {get_param: [servers, {{role.name}}]}
|
|
input_values:
|
|
libvirt_config: {get_param: LibvirtConfig}
|
|
nova_config: {get_param: NovaConfig}
|
|
neutron_openvswitch_agent_config: {get_param: NeutronOpenvswitchAgentConfig}
|
|
|
|
{{role.name}}ContainersConfig_Step1:
|
|
type: OS::Heat::StructuredConfig
|
|
depends_on: CopyJsonDeployment
|
|
properties:
|
|
group: docker-cmd
|
|
config:
|
|
{get_param: [role_data, {{role.name}}, docker_config, step_1]}
|
|
|
|
{{role.name}}ContainersConfig_Step2:
|
|
type: OS::Heat::StructuredConfig
|
|
depends_on: CopyJsonDeployment
|
|
properties:
|
|
group: docker-cmd
|
|
config:
|
|
{get_param: [role_data, {{role.name}}, docker_config, step_2]}
|
|
|
|
{{role.name}}ContainersDeployment_Step1:
|
|
type: OS::Heat::StructuredDeploymentGroup
|
|
depends_on: [{{role.name}}PreConfig, {{role.name}}ArtifactsDeploy]
|
|
properties:
|
|
name: {{role.name}}ContainersDeployment_Step1
|
|
servers: {get_param: [servers, {{role.name}}]}
|
|
config: {get_resource: {{role.name}}ContainersConfig_Step1}
|
|
|
|
{{role.name}}ContainersDeployment_Step2:
|
|
type: OS::Heat::StructuredDeploymentGroup
|
|
depends_on: {{role.name}}ContainersDeployment_Step1
|
|
properties:
|
|
name: {{role.name}}ContainersDeployment_Step2
|
|
servers: {get_param: [servers, {{role.name}}]}
|
|
config: {get_resource: {{role.name}}ContainersConfig_Step2}
|
|
{% endif %}
|
|
{% endfor %}
|