openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Use list_concat in place of yaql"

Browse Source
This commit is contained in:
Jenkins 2017-09-01 18:27:28 +00:00 committed by Gerrit Code Review
commit e80b2f0191
12 changed files with 276 additions and 311 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/deploy-steps.j2
View File

@ -182,11 +182,9 @@ resources:
puppet_step_config: {get_param: [role_data, {{role.name}}, step_config]}
tasks:
# Join host_prep_tasks with the other per-host configuration
yaql:
expression: $.data.host_prep_tasks + $.data.template_tasks
data:
host_prep_tasks: {get_param: [role_data, {{role.name}}, host_prep_tasks]}
template_tasks:
list_concat:
- {get_param: [role_data, {{role.name}}, host_prep_tasks]}
-
{%- raw %}
# Write the manifest for baremetal puppet configuration
- name: Create /var/lib/tripleo-config directory

9
puppet/services/aodh-api.yaml
View File

@ -116,12 +116,9 @@ outputs:
metadata_settings:
get_attr: [ApacheServiceBase, role_data, metadata_settings]
upgrade_tasks:
yaql:
expression: $.data.apache_upgrade + $.data.aodh_api_upgrade
data:
apache_upgrade:
get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
aodh_api_upgrade:
list_concat:
- get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
-
- name: Stop aodh_api service (running under httpd)
tags: step1
service: name=httpd state=stopped

9
puppet/services/barbican-api.yaml
View File

@ -186,12 +186,9 @@ outputs:
metadata_settings:
get_attr: [ApacheServiceBase, role_data, metadata_settings]
upgrade_tasks:
yaql:
expression: $.data.apache_upgrade + $.data.barbican_api_upgrade
data:
apache_upgrade:
get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
barbican_api_upgrade:
list_concat:
- get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
-
- name: Check if barbican_api is deployed
command: systemctl is-enabled openstack-barbican-api
tags: common

9
puppet/services/ceilometer-api.yaml
View File

@ -118,12 +118,9 @@ outputs:
metadata_settings:
get_attr: [ApacheServiceBase, role_data, metadata_settings]
upgrade_tasks:
yaql:
expression: $.data.apache_upgrade + $.data.ceilometer_api_upgrade
data:
apache_upgrade:
get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
ceilometer_api_upgrade:
list_concat:
- get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
-
- name: Stop ceilometer_api service (running under httpd)
tags: step1
service: name=httpd state=stopped

9
puppet/services/cinder-api.yaml
View File

@ -184,12 +184,9 @@ outputs:
metadata_settings:
get_attr: [ApacheServiceBase, role_data, metadata_settings]
upgrade_tasks:
yaql:
expression: $.data.apache_upgrade + $.data.cinder_api_upgrade
data:
apache_upgrade:
get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
cinder_api_upgrade:
list_concat:
- get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
-
- name: Check if cinder_api is deployed
command: systemctl is-enabled openstack-cinder-api
tags: common

9
puppet/services/gnocchi-api.yaml
View File

@ -151,12 +151,9 @@ outputs:
metadata_settings:
get_attr: [ApacheServiceBase, role_data, metadata_settings]
upgrade_tasks:
yaql:
expression: $.data.apache_upgrade + $.data.gnocchi_api_upgrade
data:
apache_upgrade:
get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
gnocchi_api_upgrade:
list_concat:
- get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
-
- name: Stop gnocchi_api service (running under httpd)
tags: step1
service: name=httpd state=stopped

9
puppet/services/keystone.yaml
View File

@ -400,12 +400,9 @@ outputs:
metadata_settings:
get_attr: [ApacheServiceBase, role_data, metadata_settings]
upgrade_tasks:
yaql:
expression: $.data.apache_upgrade + $.data.keystone_upgrade
data:
apache_upgrade:
get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
keystone_upgrade:
list_concat:
- get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
-
- name: Stop keystone service (running under httpd)
tags: step1
service: name=httpd state=stopped

9
puppet/services/neutron-ovs-agent.yaml
View File

@ -140,12 +140,9 @@ outputs:
step_config: |
include ::tripleo::profile::base::neutron::ovs
upgrade_tasks:
yaql:
expression: $.data.ovs_upgrade + $.data.neutron_ovs_upgrade
data:
ovs_upgrade:
get_attr: [Ovs, role_data, upgrade_tasks]
neutron_ovs_upgrade:
list_concat:
- get_attr: [Ovs, role_data, upgrade_tasks]
-
- name: Check if neutron_ovs_agent is deployed
command: systemctl is-enabled neutron-openvswitch-agent
tags: common

9
puppet/services/nova-api.yaml
View File

@ -199,12 +199,9 @@ outputs:
metadata_settings:
get_attr: [ApacheServiceBase, role_data, metadata_settings]
upgrade_tasks:
yaql:
expression: $.data.apache_upgrade + $.data.nova_api_upgrade
data:
apache_upgrade:
get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
nova_api_upgrade:
list_concat:
- get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
-
- name: get bootstrap nodeid
tags: common
command: hiera bootstrap_nodeid

9
puppet/services/opendaylight-ovs.yaml
View File

@ -141,12 +141,9 @@ outputs:
step_config: |
include tripleo::profile::base::neutron::plugins::ovs::opendaylight
upgrade_tasks:
yaql:
expression: $.data.ovs_upgrade + $.data.opendaylight_upgrade
data:
ovs_upgrade:
get_attr: [Ovs, role_data, upgrade_tasks]
opendaylight_upgrade:
list_concat:
- get_attr: [Ovs, role_data, upgrade_tasks]
-
- name: Check if openvswitch is deployed
command: systemctl is-enabled openvswitch
tags: common

9
puppet/services/panko-api.yaml
View File

@ -112,12 +112,9 @@ outputs:
metadata_settings:
get_attr: [ApacheServiceBase, role_data, metadata_settings]
upgrade_tasks:
yaql:
expression: $.data.apache_upgrade + $.data.panko_api_upgrade
data:
apache_upgrade:
get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
panko_api_upgrade:
list_concat:
- get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
-
- name: Check if httpd is deployed
command: systemctl is-enabled httpd
tags: common

9
puppet/services/zaqar-api.yaml
View File

@ -184,12 +184,9 @@ outputs:
metadata_settings:
get_attr: [ApacheServiceBase, role_data, metadata_settings]
upgrade_tasks:
yaql:
expression: $.data.apache_upgrade + $.data.zaqar_upgrade
data:
apache_upgrade:
get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
zaqar_upgrade:
list_concat:
- get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
-
- name: Check if zaqar is deployed
command: systemctl is-enabled openstack-zaqar
tags: common