openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Use absolute name to include puppet classes 

Current puppet modules uses only absolute name to include classes,
so replace relative name by absolute name in template files so that
template description can be consistent with puppet implementation.

Change-Id: I7a704d113289d61ed05f7a31d65caf2908a7994a
This commit is contained in:
Takashi Kajinami 2020-04-09 21:07:34 +09:00
parent 269450c92d
commit fffdcf0f30
106 changed files with 125 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/container-puppet.py
View File

@ -170,7 +170,7 @@ def mp_puppet_config(*args):
with tempfile.NamedTemporaryFile() as tmp_man:
with open(tmp_man.name, 'w') as man_file:
man_file.write('include ::tripleo::packages\n')
man_file.write('include tripleo::packages\n')
man_file.write(manifest)
uname = RUNNER.unique_container_name(

2
deployment/auditd/auditd-baremetal-puppet.yaml
View File

@ -43,5 +43,5 @@ outputs:
config_settings:
auditd::rules: {get_param: AuditdRules}
step_config: |
include ::tripleo::profile::base::auditd
include tripleo::profile::base::auditd
upgrade_tasks: []

2
deployment/barbican/barbican-api-container-puppet.yaml
View File

@ -305,7 +305,7 @@ outputs:
step_config:
list_join:
- "\n"
- - "include ::tripleo::profile::base::barbican::api"
- - "include tripleo::profile::base::barbican::api"
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: ContainerBarbicanConfigImage}
kolla_config:

2
deployment/cavium/liquidio-compute-config-container-puppet.yaml
View File

@ -87,7 +87,7 @@ outputs:
config_volume: liquidio
puppet_tags: liquidio_config
step_config: |
include ::tripleo::host::liquidio::compute
include tripleo::host::liquidio::compute
config_image: {get_param: ContainerLiquidioConfigImage}
kolla_config:
/var/lib/kolla/config_files/liquidio_config.json:

2
deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
View File

@ -104,7 +104,7 @@ outputs:
config_volume: ceilometer
puppet_tags: ceilometer_config
step_config: |
include ::tripleo::profile::base::ceilometer::agent::polling
include tripleo::profile::base::ceilometer::agent::polling
config_image: {get_param: ContainerCeilometerConfigImage}
kolla_config:
/var/lib/kolla/config_files/ceilometer_agent_central.json:

2
deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
View File

@ -84,7 +84,7 @@ outputs:
config_volume: ceilometer
puppet_tags: ceilometer_config
step_config:
include ::tripleo::profile::base::ceilometer::agent::polling
include tripleo::profile::base::ceilometer::agent::polling
config_image: {get_param: ContainerCeilometerConfigImage}
kolla_config:
/var/lib/kolla/config_files/ceilometer_agent_compute.json:

2
deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
View File

@ -94,7 +94,7 @@ outputs:
config_volume: ceilometer
puppet_tags: ceilometer_config
step_config: |
include ::tripleo::profile::base::ceilometer::agent::polling
include tripleo::profile::base::ceilometer::agent::polling
config_image: {get_param: ContainerCeilometerConfigImage}
kolla_config:
/var/lib/kolla/config_files/ceilometer-agent-ipmi.json:

2
deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
View File

@ -159,7 +159,7 @@ outputs:
config_volume: ceilometer
puppet_tags: ceilometer_config
step_config: |
include ::tripleo::profile::base::ceilometer::agent::notification
include tripleo::profile::base::ceilometer::agent::notification
config_image: {get_param: ContainerCeilometerConfigImage}
kolla_config:
/var/lib/kolla/config_files/ceilometer_agent_notification.json:

2
deployment/ceph-ansible/ceph-nfs.yaml
View File

@ -72,7 +72,7 @@ outputs:
# We support only NFS 4.1 to start
- 2049
upgrade_tasks: []
step_config: 'include ::tripleo::profile::pacemaker::ceph_nfs'
step_config: 'include tripleo::profile::pacemaker::ceph_nfs'
puppet_config:
config_image: ''
config_volume: ''

2
deployment/certs/ca-certs-baremetal-puppet.yaml
View File

@ -44,4 +44,4 @@ outputs:
config_settings:
tripleo::trusted_cas::ca_map: {get_param: CAMap}
step_config: |
include ::tripleo::trusted_cas
include tripleo::trusted_cas

2
deployment/certs/certmonger-user-baremetal-puppet.yaml
View File

@ -71,4 +71,4 @@ outputs:
certmonger_ca_qemu: {get_param: CertmongerQemuCA}
- {}
step_config: |
include ::tripleo::profile::base::certmonger_user
include tripleo::profile::base::certmonger_user

4
deployment/cinder/cinder-api-container-puppet.yaml
View File

@ -243,7 +243,7 @@ outputs:
step_config:
list_join:
- "\n"
- - "include ::tripleo::profile::base::cinder::api"
- - "include tripleo::profile::base::cinder::api"
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: ContainerCinderConfigImage}
kolla_config:
@ -359,7 +359,7 @@ outputs:
step_4:
config_volume: 'cinder_init_tasks'
puppet_tags: cinder_config,cinder_type,file,concat,file_line
step_config: 'include ::tripleo::profile::base::cinder::api'
step_config: 'include tripleo::profile::base::cinder::api'
config_image: *cinder_api_image
volumes:
- /var/lib/config-data/cinder/etc/cinder/:/etc/cinder/:ro

2
deployment/cinder/cinder-backup-container-puppet.yaml
View File

@ -144,7 +144,7 @@ outputs:
- - {get_attr: [CinderBase, role_data, step_config]}
-
str_replace:
template: "include ::tripleo::profile::base::cinder::backup::DRIVER"
template: "include tripleo::profile::base::cinder::backup::DRIVER"
params:
DRIVER: {get_param: CinderBackupBackend}
- {get_attr: [MySQLClient, role_data, step_config]}

4
deployment/cinder/cinder-backup-pacemaker-puppet.yaml
View File

@ -145,7 +145,7 @@ outputs:
list_join:
- "\n"
- - {get_attr: [CinderBackupBase, role_data, puppet_config, step_config]}
- "include ::tripleo::profile::pacemaker::cinder::backup"
- "include tripleo::profile::pacemaker::cinder::backup"
config_image: {get_param: ContainerCinderConfigImage}
kolla_config:
/var/lib/kolla/config_files/cinder_backup.json:
@ -194,7 +194,7 @@ outputs:
- - '/container_puppet_apply.sh'
- '5'
- 'file,file_line,concat,augeas,pacemaker::resource::bundle,pacemaker::property,pacemaker::constraint::location'
- 'include ::tripleo::profile::base::pacemaker;include ::tripleo::profile::pacemaker::cinder::backup_bundle'
- 'include tripleo::profile::base::pacemaker;include tripleo::profile::pacemaker::cinder::backup_bundle'
- if:
- puppet_debug_enabled
- - '--debug --verbose'

2
deployment/cinder/cinder-scheduler-container-puppet.yaml
View File

@ -86,7 +86,7 @@ outputs:
step_config:
list_join:
- "\n"
- - "include ::tripleo::profile::base::cinder::scheduler"
- - "include tripleo::profile::base::cinder::scheduler"
- - {get_attr: [CinderBase, role_data, step_config]}
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: ContainerCinderConfigImage}

4
deployment/cinder/cinder-volume-container-puppet.yaml
View File

@ -278,8 +278,8 @@ outputs:
step_config:
list_join:
- "\n"
- - "include ::tripleo::profile::base::lvm"
- "include ::tripleo::profile::base::cinder::volume"
- - "include tripleo::profile::base::lvm"
- "include tripleo::profile::base::cinder::volume"
- get_attr: [MySQLClient, role_data, step_config]
config_image: {get_param: ContainerCinderConfigImage}
kolla_config:

6
deployment/cinder/cinder-volume-pacemaker-puppet.yaml
View File

@ -132,8 +132,8 @@ outputs:
step_config:
list_join:
- "\n"
- - "include ::tripleo::profile::base::lvm"
- - "include ::tripleo::profile::pacemaker::cinder::volume"
- - "include tripleo::profile::base::lvm"
- - "include tripleo::profile::pacemaker::cinder::volume"
- get_attr: [MySQLClient, role_data, step_config]
config_image: {get_param: ContainerCinderConfigImage}
kolla_config:
@ -180,7 +180,7 @@ outputs:
- - '/container_puppet_apply.sh'
- '5'
- 'file,file_line,concat,augeas,pacemaker::resource::bundle,pacemaker::property,pacemaker::constraint::location'
- 'include ::tripleo::profile::base::pacemaker;include ::tripleo::profile::pacemaker::cinder::volume_bundle'
- 'include tripleo::profile::base::pacemaker;include tripleo::profile::pacemaker::cinder::volume_bundle'
- if:
- puppet_debug_enabled
- - '--debug --verbose'

2
deployment/database/mysql-base.yaml
View File

@ -144,7 +144,7 @@ outputs:
NETWORK: {get_param: [ServiceNetMap, MysqlNetwork]}
- {}
step_config: |
include ::tripleo::profile::base::database::mysql
include tripleo::profile::base::database::mysql
metadata_settings:
if:
- internal_tls_enabled

2
deployment/database/mysql-client.yaml
View File

@ -54,4 +54,4 @@ outputs:
tripleo::profile::base::database::mysql::client::enable_ssl: {get_param: EnableInternalTLS}
tripleo::profile::base::database::mysql::client::ssl_ca: {get_param: InternalTLSCAFile}
step_config: |
include ::tripleo::profile::base::database::mysql::client
include tripleo::profile::base::database::mysql::client

2
deployment/database/mysql-container-puppet.yaml
View File

@ -222,7 +222,7 @@ outputs:
step_2:
config_volume: 'mysql_init_tasks'
puppet_tags: 'mysql_database,mysql_grant,mysql_user'
step_config: 'include ::tripleo::profile::base::database::mysql'
step_config: 'include tripleo::profile::base::database::mysql'
config_image: *mysql_config_image
volumes:
list_concat:

4
deployment/database/mysql-pacemaker-puppet.yaml
View File

@ -175,7 +175,7 @@ outputs:
- "\n"
- - "['Mysql_datadir', 'Mysql_user', 'Mysql_database', 'Mysql_grant', 'Mysql_plugin'].each |String $val| { noop_resource($val) }"
- "exec {'wait-for-settle': command => '/bin/true' }"
- "include ::tripleo::profile::pacemaker::database::mysql_bundle"
- "include tripleo::profile::pacemaker::database::mysql_bundle"
config_image: {get_param: ContainerMysqlConfigImage}
kolla_config:
/var/lib/kolla/config_files/mysql.json:
@ -273,7 +273,7 @@ outputs:
- - '/container_puppet_apply.sh'
- '2'
- 'file,file_line,concat,augeas,pacemaker::resource::bundle,pacemaker::property,pacemaker::resource::ocf,pacemaker::constraint::order,pacemaker::constraint::colocation,galera_ready,mysql_database,mysql_grant,mysql_user'
- 'include ::tripleo::profile::base::pacemaker;include ::tripleo::profile::pacemaker::database::mysql_bundle'
- 'include tripleo::profile::base::pacemaker;include tripleo::profile::pacemaker::database::mysql_bundle'
- if:
- puppet_debug_enabled
- - '--debug'

2
deployment/database/redis-container-puppet.yaml
View File

@ -125,7 +125,7 @@ outputs:
step_config:
list_join:
- "\n"
- - include ::tripleo::profile::base::database::redis
- - include tripleo::profile::base::database::redis
- {get_attr: [RedisBase, role_data, step_config]}
config_image: {get_param: ContainerRedisConfigImage}
kolla_config:

4
deployment/database/redis-pacemaker-puppet.yaml
View File

@ -167,7 +167,7 @@ outputs:
# https://github.com/arioch/puppet-redis/commit/1c004143223e660cbd433422ff8194508aab9763
puppet_tags: 'exec'
step_config: |
include ::tripleo::profile::pacemaker::database::redis_bundle
include tripleo::profile::pacemaker::database::redis_bundle
config_image: &redis_config_image {get_param: ContainerRedisConfigImage}
kolla_config:
/var/lib/kolla/config_files/redis.json:
@ -229,7 +229,7 @@ outputs:
- - '/container_puppet_apply.sh'
- '2'
- 'file,file_line,concat,augeas,pacemaker::resource::bundle,pacemaker::property,pacemaker::resource::ocf,pacemaker::constraint::order,pacemaker::constraint::colocation'
- 'include ::tripleo::profile::base::pacemaker;include ::tripleo::profile::pacemaker::database::redis_bundle'
- 'include tripleo::profile::base::pacemaker;include tripleo::profile::pacemaker::database::redis_bundle'
- if:
- puppet_debug_enabled
- - '--debug'

2
deployment/deprecated/neutron/neutron-sriov-host-config.yaml
View File

@ -87,6 +87,6 @@ outputs:
- get_attr: [NeutronBase, role_data, config_settings]
- get_attr: [RoleParametersValue, value]
step_config: |
include ::tripleo::host::sriov
include tripleo::host::sriov
metadata_settings:
get_attr: [NeutronBase, role_data, metadata_settings]

2
deployment/deprecated/tripleo-firewall/tripleo-firewall-baremetal-puppet.yaml
View File

@ -64,7 +64,7 @@ outputs:
tripleo::firewall::manage_firewall: {get_param: ManageFirewall}
tripleo::firewall::purge_firewall_rules: {get_param: PurgeFirewallRules}
step_config: |
include ::tripleo::firewall
include tripleo::firewall
host_prep_tasks:
if:

4
deployment/etcd/etcd-container-puppet.yaml
View File

@ -124,7 +124,7 @@ outputs:
list_join:
- "\n"
- - "['Etcd_key'].each |String $val| { noop_resource($val) }"
- "include ::tripleo::profile::base::etcd"
- "include tripleo::profile::base::etcd"
kolla_config:
/var/lib/kolla/config_files/etcd.json:
command: /usr/bin/etcd --config-file /etc/etcd/etcd.yml
@ -159,7 +159,7 @@ outputs:
config_volume: 'etcd_init_tasks'
puppet_tags: 'etcd_key'
step_config: |
include ::tripleo::profile::base::etcd
include tripleo::profile::base::etcd
config_image: *etcd_config_image
volumes:
- /var/lib/config-data/etcd/etc/etcd/:/etc/etcd:ro

4
deployment/glance/glance-api-container-puppet.yaml
View File

@ -526,10 +526,10 @@ outputs:
step_config:
list_join:
- "\n"
- - include ::tripleo::profile::base::glance::api
- - include tripleo::profile::base::glance::api
- if:
- glance_netapp_nfs_enabled
- include ::tripleo::profile::base::glance::netapp
- include tripleo::profile::base::glance::netapp
- ''
- if:
- glance_cache_enabled

2
deployment/gnocchi/gnocchi-api-container-puppet.yaml
View File

@ -232,7 +232,7 @@ outputs:
step_config:
list_join:
- "\n"
- - "include ::tripleo::profile::base::gnocchi::api"
- - "include tripleo::profile::base::gnocchi::api"
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: ContainerGnocchiConfigImage}
kolla_config:

2
deployment/gnocchi/gnocchi-metricd-container-puppet.yaml
View File

@ -102,7 +102,7 @@ outputs:
step_config:
list_join:
- "\n"
- - "include ::tripleo::profile::base::gnocchi::metricd"
- - "include tripleo::profile::base::gnocchi::metricd"
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: ContainerGnocchiConfigImage}
kolla_config:

2
deployment/gnocchi/gnocchi-statsd-container-puppet.yaml
View File

@ -94,7 +94,7 @@ outputs:
step_config:
list_join:
- "\n"
- - "include ::tripleo::profile::base::gnocchi::statsd"
- - "include tripleo::profile::base::gnocchi::statsd"
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: ContainerGnocchiConfigImage}
kolla_config:

4
deployment/haproxy/haproxy-container-puppet.yaml
View File

@ -198,7 +198,7 @@ outputs:
config_volume: haproxy
puppet_tags: haproxy_config
step_config: |
class {'::tripleo::profile::base::haproxy': manage_firewall => false}
class {'tripleo::profile::base::haproxy': manage_firewall => false}
config_image: {get_param: ContainerHAProxyConfigImage}
volumes:
list_concat:
@ -331,7 +331,7 @@ outputs:
fi
exit $rc
vars:
puppet_execute: include ::tripleo::profile::base::haproxy
puppet_execute: include tripleo::profile::base::haproxy
puppet_tags: tripleo::firewall::rule
puppet_modulepath: /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules
puppet_debug:

4
deployment/haproxy/haproxy-pacemaker-puppet.yaml
View File

@ -204,7 +204,7 @@ outputs:
- - "exec {'wait-for-settle': command => '/bin/true' }"
- "class tripleo::firewall(){}; define tripleo::firewall::rule( $port = undef, $dport = undef, $sport = undef, $proto = undef, $action = undef, $state = undef, $source = undef, $iniface = undef, $chain = undef, $destination = undef, $extras = undef){}"
- "['pcmk_bundle', 'pcmk_resource', 'pcmk_property', 'pcmk_constraint', 'pcmk_resource_default'].each |String $val| { noop_resource($val) }"
- 'include ::tripleo::profile::pacemaker::haproxy_bundle'
- 'include tripleo::profile::pacemaker::haproxy_bundle'
config_image: {get_param: ContainerHAProxyConfigImage}
volumes: &deployed_cert_mount
yaql:
@ -262,7 +262,7 @@ outputs:
- - '/container_puppet_apply.sh'
- '2'
- 'file,file_line,concat,augeas,pacemaker::resource::bundle,pacemaker::property,pacemaker::resource::ip,pacemaker::resource::ocf,pacemaker::constraint::order,pacemaker::constraint::colocation'
- 'include ::tripleo::profile::base::pacemaker; include ::tripleo::profile::pacemaker::haproxy_bundle'
- 'include tripleo::profile::base::pacemaker; include tripleo::profile::pacemaker::haproxy_bundle'
- if:
- puppet_debug_enabled
- - '--debug'

2
deployment/heat/heat-api-cfn-container-puppet.yaml
View File

@ -161,7 +161,7 @@ outputs:
config_volume: heat_api_cfn
puppet_tags: heat_config,file,concat,file_line
step_config: |
include ::tripleo::profile::base::heat::api_cfn
include tripleo::profile::base::heat::api_cfn
config_image: {get_param: ContainerHeatApiCfnConfigImage}
kolla_config:
/var/lib/kolla/config_files/heat_api_cfn.json:

2
deployment/heat/heat-api-container-puppet.yaml
View File

@ -191,7 +191,7 @@ outputs:
config_volume: heat_api
puppet_tags: heat_config,file,concat,file_line
step_config: |
include ::tripleo::profile::base::heat::api
include tripleo::profile::base::heat::api
config_image: {get_param: ContainerHeatApiConfigImage}
kolla_config:
/var/lib/kolla/config_files/heat_api.json:

2
deployment/heat/heat-engine-container-puppet.yaml
View File

@ -229,7 +229,7 @@ outputs:
step_config:
list_join:
- "\n"
- - include ::tripleo::profile::base::heat::engine
- - include tripleo::profile::base::heat::engine
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: ContainerHeatConfigImage}
kolla_config:

2
deployment/horizon/horizon-container-puppet.yaml
View File

@ -207,7 +207,7 @@ outputs:
config_volume: horizon
puppet_tags: horizon_config
step_config: |
include ::tripleo::profile::base::horizon
include tripleo::profile::base::horizon
config_image: {get_param: ContainerHorizonConfigImage}
kolla_config:
/var/lib/kolla/config_files/horizon.json:

2
deployment/ironic/ironic-api-container-puppet.yaml
View File

@ -195,7 +195,7 @@ outputs:
step_config:
list_join:
- "\n"
- - include ::tripleo::profile::base::ironic::api
- - include tripleo::profile::base::ironic::api
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: ContainerIronicApiConfigImage}
kolla_config:

2
deployment/ironic/ironic-base-puppet.yaml
View File

@ -111,4 +111,4 @@ outputs:
- {}
- ironic::rpc_transport: {get_param: IronicRpcTransport}
step_config: |
include ::tripleo::profile::base::ironic
include tripleo::profile::base::ironic

2
deployment/ironic/ironic-conductor-container-puppet.yaml
View File

@ -447,7 +447,7 @@ outputs:
step_config:
list_join:
- "\n"
- - include ::tripleo::profile::base::ironic::conductor
- - include tripleo::profile::base::ironic::conductor
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: ContainerIronicConfigImage}
volumes:

2
deployment/ironic/ironic-inspector-container-puppet.yaml
View File

@ -347,7 +347,7 @@ outputs:
step_config:
list_join:
- "\n"
- - include ::tripleo::profile::base::ironic_inspector
- - include tripleo::profile::base::ironic_inspector
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: ContainerIronicInspectorConfigImage}
volumes:

2
deployment/iscsid/iscsid-container-puppet.yaml
View File

@ -54,7 +54,7 @@ outputs:
config_volume: iscsid
puppet_tags: iscsid_config
step_config: |
include ::tripleo::profile::base::iscsid
include tripleo::profile::base::iscsid
config_image: {get_param: ContainerIscsidConfigImage}
volumes:
# NOTE(bogdando) Containerized or running on baremetal services

2
deployment/keepalived/keepalived-container-puppet.yaml
View File

@ -106,7 +106,7 @@ outputs:
config_volume: 'keepalived'
puppet_tags: 'file'
step_config: |
include ::tripleo::profile::base::keepalived
include tripleo::profile::base::keepalived
config_image: {get_param: ContainerKeepalivedConfigImage}
kolla_config:
/var/lib/kolla/config_files/keepalived.json:

4
deployment/keystone/keystone-container-puppet.yaml
View File

@ -597,7 +597,7 @@ outputs:
- "\n"
- - "['Keystone_user', 'Keystone_endpoint', 'Keystone_domain', 'Keystone_tenant', 'Keystone_user_role', 'Keystone_role', 'Keystone_service'].each |String $val| { noop_resource($val) }"
- |
include ::tripleo::profile::base::keystone
include tripleo::profile::base::keystone
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: &keystone_config_image {get_param: ContainerKeystoneConfigImage}
kolla_config:
@ -774,7 +774,7 @@ outputs:
step_3:
config_volume: 'keystone_init_tasks'
puppet_tags: 'keystone_config'
step_config: 'include ::tripleo::profile::base::keystone'
step_config: 'include tripleo::profile::base::keystone'
config_image: *keystone_config_image
host_prep_tasks: {get_attr: [KeystoneLogging, host_prep_tasks]}
metadata_settings:

2
deployment/logging/rsyslog-container-puppet.yaml
View File

@ -178,7 +178,7 @@ outputs:
puppet_config:
config_volume: rsyslog
puppet_tags: 'rsyslog::generate_concat,concat::fragment'
step_config: include ::tripleo::profile::base::logging::rsyslog
step_config: include tripleo::profile::base::logging::rsyslog
config_image: {get_param: ContainerRsyslogConfigImage}
kolla_config:
/var/lib/kolla/config_files/rsyslog.json:

2
deployment/logging/rsyslog-sidecar-container-puppet.yaml
View File

@ -50,7 +50,7 @@ outputs:
config_volume: rsyslog_sidecar
puppet_tags: file
step_config: |
include ::tripleo::profile::base::rsyslog::sidecar
include tripleo::profile::base::rsyslog::sidecar
config_image: {get_param: ContainerRsyslogSidecarConfigImage}
kolla_config:
/var/lib/kolla/config_files/rsyslog_sidecar.json:

2
deployment/logrotate/logrotate-crond-container-puppet.yaml
View File

@ -125,7 +125,7 @@ outputs:
# BEGIN DOCKER SETTINGS
puppet_config:
config_volume: crond
step_config: 'include ::tripleo::profile::base::logging::logrotate'
step_config: 'include tripleo::profile::base::logging::logrotate'
config_image: {get_param: ContainerCrondConfigImage}
kolla_config:
/var/lib/kolla/config_files/logrotate-crond.json:

2
deployment/manila/manila-api-container-puppet.yaml
View File

@ -172,7 +172,7 @@ outputs:
step_config:
list_join:
- "\n"
- - "include ::tripleo::profile::base::manila::api"
- - "include tripleo::profile::base::manila::api"
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: ContainerManilaConfigImage}
kolla_config:

2
deployment/manila/manila-scheduler-container-puppet.yaml
View File

@ -71,7 +71,7 @@ outputs:
step_config:
list_join:
- "\n"
- - "include ::tripleo::profile::base::manila::scheduler"
- - "include tripleo::profile::base::manila::scheduler"
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: ContainerManilaConfigImage}
kolla_config:

2
deployment/manila/manila-share-container-puppet.yaml
View File

@ -117,7 +117,7 @@ outputs:
step_config:
list_join:
- "\n"
- - "include ::tripleo::profile::base::manila::share"
- - "include tripleo::profile::base::manila::share"
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: ContainerManilaConfigImage}
kolla_config:

4
deployment/manila/manila-share-pacemaker-puppet.yaml
View File

@ -119,7 +119,7 @@ outputs:
step_config:
list_join:
- "\n"
- - "include ::tripleo::profile::pacemaker::manila"
- - "include tripleo::profile::pacemaker::manila"
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: ContainerManilaConfigImage}
kolla_config:
@ -162,7 +162,7 @@ outputs:
- - '/container_puppet_apply.sh'
- '5'
- 'pacemaker_constraint,file,file_line,concat,augeas,pacemaker::resource::bundle,pacemaker::property,pacemaker::constraint::location'
- 'include ::tripleo::profile::base::pacemaker;include ::tripleo::profile::pacemaker::manila::share_bundle'
- 'include tripleo::profile::base::pacemaker;include tripleo::profile::pacemaker::manila::share_bundle'
- if:
- puppet_debug_enabled
- - '--debug'

2
deployment/memcached/memcached-container-puppet.yaml
View File

@ -152,7 +152,7 @@ outputs:
config_volume: 'memcached'
puppet_tags: 'file'
step_config: |
include ::tripleo::profile::base::memcached
include tripleo::profile::base::memcached
config_image: {get_param: ContainerMemcachedConfigImage}
kolla_config:
/var/lib/kolla/config_files/memcached.json:

2
deployment/messaging/rpc-qdrouterd-container-puppet.yaml
View File

@ -98,7 +98,7 @@ outputs:
puppet_config:
config_volume: qdrouterd
step_config: |
include ::tripleo::profile::base::qdr
include tripleo::profile::base::qdr
config_image: {get_param: ContainerQdrouterdConfigImage}
kolla_config:
/var/lib/kolla/config_files/qdrouterd.json:

2
deployment/metrics/collectd-container-puppet.yaml
View File

@ -645,7 +645,7 @@ outputs:
puppet_config:
config_volume: collectd
puppet_tags: collectd_client_config,exec
step_config: include ::tripleo::profile::base::metrics::collectd
step_config: include tripleo::profile::base::metrics::collectd
config_image: {get_param: ContainerCollectdConfigImage}
kolla_config:
/var/lib/kolla/config_files/collectd.json:

2
deployment/metrics/qdr-container-puppet.yaml
View File

@ -275,7 +275,7 @@ outputs:
puppet_config:
config_volume: metrics-qdr
step_config: |
include ::tripleo::profile::base::metrics::qdr
include tripleo::profile::base::metrics::qdr
config_image: {get_param: ContainerMetricsQdrConfigImage}
kolla_config:
/var/lib/kolla/config_files/metrics-qdr.json:

2
deployment/mistral/mistral-api-container-puppet.yaml
View File

@ -164,7 +164,7 @@ outputs:
step_config:
list_join:
- "\n"
- - include ::tripleo::profile::base::mistral::api
- - include tripleo::profile::base::mistral::api
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: ContainerMistralConfigImage}
kolla_config:

2
deployment/mistral/mistral-engine-container-puppet.yaml
View File

@ -95,7 +95,7 @@ outputs:
step_config:
list_join:
- "\n"
- - include ::tripleo::profile::base::mistral::engine
- - include tripleo::profile::base::mistral::engine
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: ContainerMistralConfigImage}
kolla_config:

2
deployment/mistral/mistral-event-engine-container-puppet.yaml
View File

@ -70,7 +70,7 @@ outputs:
step_config:
list_join:
- "\n"
- - include ::tripleo::profile::base::mistral
- - include tripleo::profile::base::mistral
- get_attr: [MySQLClient, role_data, step_config]
config_image: {get_param: ContainerMistralConfigImage}
kolla_config:

2
deployment/mistral/mistral-executor-container-puppet.yaml
View File

@ -127,7 +127,7 @@ outputs:
step_config:
list_join:
- "\n"
- - include ::tripleo::profile::base::mistral::executor
- - include tripleo::profile::base::mistral::executor
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: ContainerMistralConfigImage}
volumes:

2
deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml
View File

@ -55,7 +55,7 @@ outputs:
config_volume: 'neutron'
puppet_tags: neutron_bgpvpn_service_config
step_config: |
include ::tripleo::profile::base::neutron::bgpvpn
include tripleo::profile::base::neutron::bgpvpn
config_image: {get_param: ContainerNeutronConfigImage}
kolla_config: {}
docker_config: {}

2
deployment/neutron/neutron-bgpvpn-bagpipe-baremetal-puppet.yaml
View File

@ -68,4 +68,4 @@ outputs:
neutron::agents::bagpipe::ovs_bridge: {get_param: BagpipeOvsBridge}
neutron::agents::bagpipe::peers: {get_param: BagpipePeers}
step_config: |
include ::tripleo::profile::base::neutron::agents::bagpipe
include tripleo::profile::base::neutron::agents::bagpipe

2
deployment/neutron/neutron-bigswitch-agent-baremetal-puppet.yaml
View File

@ -38,4 +38,4 @@ outputs:
value:
service_name: neutron_bigswitch_agent
step_config: |
include ::tripleo::profile::base::neutron::agents::bigswitch
include tripleo::profile::base::neutron::agents::bigswitch

2
deployment/neutron/neutron-compute-plugin-nuage.yaml
View File

@ -103,4 +103,4 @@ outputs:
tripleo::profile::base::neutron::agents::nuage::nova_os_password: {get_param: NovaPassword}
tripleo::profile::base::neutron::agents::nuage::nova_auth_ip: {get_param: [EndpointMap, KeystoneInternal, host]}
step_config: |
include ::tripleo::profile::base::neutron::agents::nuage
include tripleo::profile::base::neutron::agents::nuage

2
deployment/neutron/neutron-controller-plugin-nuage.yaml
View File

@ -76,4 +76,4 @@ outputs:
nuage::vrs::disable_dhcp4: {get_param: NuageDisableDhcp4}
tripleo::profile::base::neutron::agents::nuage::enable_metadata_agent: {get_param: NuageControllerEnableMetadataAgent}
step_config: |
include ::tripleo::profile::base::neutron::agents::nuage
include tripleo::profile::base::neutron::agents::nuage

2
deployment/neutron/neutron-linuxbridge-agent-baremetal-puppet.yaml
View File

@ -90,6 +90,6 @@ outputs:
- {}
- neutron::agents::ml2::linuxbridge::firewall_driver: {get_param: NeutronLinuxbridgeFirewallDriver}
step_config: |
include ::tripleo::profile::base::neutron::linuxbridge
include tripleo::profile::base::neutron::linuxbridge
metadata_settings:
get_attr: [NeutronBase, role_data, metadata_settings]

2
deployment/neutron/neutron-mlnx-agent-container-puppet.yaml
View File

@ -116,7 +116,7 @@ outputs:
config_volume: 'neutron'
puppet_tags: neutron_plugin_ml2
step_config: |
include ::tripleo::profile::base::neutron::plugins::ml2
include tripleo::profile::base::neutron::plugins::ml2
config_image: {get_param: ContainerNeutronConfigImage}
kolla_config:
/var/lib/kolla/config_files/neutron_mlnx_agent.json:

2
deployment/neutron/neutron-ovs-agent-container-puppet.yaml
View File

@ -240,7 +240,7 @@ outputs:
config_volume: neutron
puppet_tags: neutron_config,neutron_agent_ovs,neutron_plugin_ml2
step_config: |
include ::tripleo::profile::base::neutron::ovs
include tripleo::profile::base::neutron::ovs
config_image: {get_param: ContainerNeutronConfigImage}
# We need to mount /run for puppet_config step. This is because
# puppet-vswitch runs the commands "ovs-vsctl list open_vswitch ."

2
deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml
View File

@ -71,7 +71,7 @@ outputs:
config_volume: 'neutron'
puppet_tags: neutron_plugin_ml2
step_config: |
include ::tripleo::profile::base::neutron::plugins::ml2
include tripleo::profile::base::neutron::plugins::ml2
config_image: {get_param: ContainerNeutronConfigImage}
kolla_config: {}
docker_config: {}

2
deployment/neutron/neutron-plugin-ml2-cisco-vts-container-puppet.yaml
View File

@ -94,7 +94,7 @@ outputs:
config_volume: 'neutron'
puppet_tags: neutron_plugin_ml2
step_config: |
include ::tripleo::profile::base::neutron::plugins::ml2
include tripleo::profile::base::neutron::plugins::ml2
config_image: {get_param: ContainerNeutronConfigImage}
kolla_config: {}
docker_config: {}

2
deployment/neutron/neutron-plugin-ml2-fujitsu-cfab.yaml
View File

@ -85,6 +85,6 @@ outputs:
neutron::plugins::ml2::fujitsu::cfab::pprofile_prefix: {get_param: NeutronFujitsuCfabPprofilePrefix}
neutron::plugins::ml2::fujitsu::cfab::save_config: {get_param: NeutronFujitsuCfabSaveConfig}
step_config: |
include ::tripleo::profile::base::neutron::plugins::ml2
include tripleo::profile::base::neutron::plugins::ml2
metadata_settings:
get_attr: [NeutronMl2Base, role_data, metadata_settings]

2
deployment/neutron/neutron-plugin-ml2-fujitsu-fossw.yaml
View File

@ -89,6 +89,6 @@ outputs:
neutron::plugins::ml2::fujitsu::fossw::ovsdb_vlanid_range_min: {get_param: NeutronFujitsuFosswOvsdbVlanidRangeMin}
neutron::plugins::ml2::fujitsu::fossw::ovsdb_port: {get_param: NeutronFujitsuFosswOvsdbPort}
step_config: |
include ::tripleo::profile::base::neutron::plugins::ml2
include tripleo::profile::base::neutron::plugins::ml2
metadata_settings:
get_attr: [NeutronMl2Base, role_data, metadata_settings]

2
deployment/neutron/neutron-plugin-ml2-mlnx-sdn-assist-container-puppet.yaml
View File

@ -99,7 +99,7 @@ outputs:
config_volume: 'neutron'
puppet_tags: neutron_plugin_ml2
step_config: |
include ::tripleo::profile::base::neutron::plugins::ml2
include tripleo::profile::base::neutron::plugins::ml2
config_image: {get_param: ContainerNeutronConfigImage}
kolla_config: {}
docker_config: {}

2
deployment/neutron/neutron-plugin-ml2-ovn.yaml
View File

@ -185,6 +185,6 @@ outputs:
- {}
step_config: |
include ::tripleo::profile::base::neutron::plugins::ml2
include tripleo::profile::base::neutron::plugins::ml2
metadata_settings:
get_attr: [NeutronMl2Base, role_data, metadata_settings]

2
deployment/neutron/neutron-plugin-ml2.yaml
View File

@ -131,7 +131,7 @@ outputs:
- null
step_config: |
include ::tripleo::profile::base::neutron::plugins::ml2
include tripleo::profile::base::neutron::plugins::ml2
service_config_settings:
horizon:
neutron::plugins::ml2::mechanism_drivers: {get_param: NeutronMechanismDrivers}

2
deployment/neutron/neutron-sfc-api-container-puppet.yaml
View File

@ -55,7 +55,7 @@ outputs:
config_volume: 'neutron'
puppet_tags: neutron_sfc_service_config
step_config: |
include ::tripleo::profile::base::neutron::sfc
include tripleo::profile::base::neutron::sfc
config_image: {get_param: ContainerNeutronConfigImage}
kolla_config: {}
docker_config: {}

2
deployment/neutron/neutron-sriov-agent-container-puppet.yaml
View File

@ -157,7 +157,7 @@ outputs:
config_volume: neutron
puppet_tags: neutron_config,neutron_agent_sriov_numvfs,neutron_sriov_agent_config
step_config: |
include ::tripleo::profile::base::neutron::sriov
include tripleo::profile::base::neutron::sriov
config_image: {get_param: ContainerNeutronConfigImage}
kolla_config:
/var/lib/kolla/config_files/neutron_sriov_agent.json:

2
deployment/neutron/neutron-vpp-agent-baremetal-puppet.yaml
View File

@ -58,6 +58,6 @@ outputs:
- get_attr: [NeutronBase, role_data, config_settings]
- tripleo::profile::base::neutron::agents::vpp::physnet_mapping: {get_param: NeutronVPPAgentPhysnets}
step_config: |
include ::tripleo::profile::base::neutron::agents::vpp
include tripleo::profile::base::neutron::agents::vpp
metadata_settings:
get_attr: [NeutronBase, role_data, metadata_settings]

2
deployment/nova/nova-libvirt-guests-container-puppet.yaml
View File

@ -74,5 +74,5 @@ outputs:
config_volume: nova_libvirt
puppet_tags: libvirtd_config,nova_config,file,libvirt_tls_password
step_config: |
include ::tripleo::profile::base::nova::compute::libvirt_guests
include tripleo::profile::base::nova::compute::libvirt_guests
config_image: {get_param: ContainerNovaLibvirtConfigImage}

2
deployment/nova/novajoin-container-puppet.yaml
View File

@ -176,7 +176,7 @@ outputs:
puppet_config:
config_volume: novajoin
puppet_tags: novajoin_config
step_config: include ::tripleo::profile::base::novajoin
step_config: include tripleo::profile::base::novajoin
config_image: {get_param: ContainerNovajoinConfigImage}
kolla_config:
/var/lib/kolla/config_files/novajoin_server.json:

2
deployment/ovn/ovn-controller-container-puppet.yaml
View File

@ -181,7 +181,7 @@ outputs:
puppet_tags: vs_config,exec
config_volume: ovn_controller
step_config: |
include ::tripleo::profile::base::neutron::agents::ovn
include tripleo::profile::base::neutron::agents::ovn
config_image: {get_param: ContainerOvnControllerConfigImage}
# We need to mount /run for puppet_config step. This is because
# puppet-vswitch runs the commands "ovs-vsctl set open_vswitch . external_ids:..."

2
deployment/ovn/ovn-dbs-container-puppet.yaml
View File

@ -83,7 +83,7 @@ outputs:
config_volume: ''
config_image: ''
step_config: |
include ::tripleo::profile::base::neutron::ovn_northd #unused
include tripleo::profile::base::neutron::ovn_northd #unused
kolla_config:
/var/lib/kolla/config_files/ovn_north_db_server.json:
command: /usr/local/bin/start-nb-db-server

2
deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
View File

@ -222,7 +222,7 @@ outputs:
- - '/container_puppet_apply.sh'
- '3'
- 'file,file_line,concat,augeas,pacemaker::resource::bundle,pacemaker::property,pacemaker::resource::ip,pacemaker::resource::ocf,pacemaker::constraint::order,pacemaker::constraint::colocation,ovn_dbs_remove_old_cruft'
- 'include ::tripleo::profile::base::pacemaker;include ::tripleo::profile::pacemaker::ovn_dbs_bundle'
- 'include tripleo::profile::base::pacemaker;include tripleo::profile::pacemaker::ovn_dbs_bundle'
- if:
- puppet_debug_enabled
- - '--debug'

2
deployment/ovn/ovn-metadata-container-puppet.yaml
View File

@ -289,7 +289,7 @@ outputs:
- - '/container_puppet_apply.sh'
- '4'
- 'exec'
- 'include ::tripleo::profile::base::neutron::ovn_metadata'
- 'include tripleo::profile::base::neutron::ovn_metadata'
image: {get_param: ContainerOvnMetadataImage}
volumes:
list_concat:

2
deployment/pacemaker/clustercheck-container-puppet.yaml
View File

@ -72,7 +72,7 @@ outputs:
puppet_config:
config_volume: clustercheck
puppet_tags: file # set this even though file is the default
step_config: "include ::tripleo::profile::pacemaker::clustercheck"
step_config: "include tripleo::profile::pacemaker::clustercheck"
config_image: {get_param: ContainerClustercheckConfigImage}
kolla_config:
/var/lib/kolla/config_files/clustercheck.json:

2
deployment/pacemaker/compute-instanceha-baremetal-puppet.yaml
View File

@ -45,4 +45,4 @@ outputs:
global_config_settings:
tripleo::instanceha: {get_param: EnableInstanceHA}
step_config: |
include ::tripleo::profile::pacemaker::compute_instanceha
include tripleo::profile::pacemaker::compute_instanceha

2
deployment/pacemaker/ovn-dbs-baremetal-puppet.yaml
View File

@ -63,4 +63,4 @@ outputs:
tripleo::profile::pacemaker::ovn_northd::nb_db_port: {get_param: OVNNorthboundServerPort}
tripleo::profile::pacemaker::ovn_northd::sb_db_port: {get_param: OVNSouthboundServerPort}
step_config: |
include ::tripleo::profile::pacemaker::ovn_northd
include tripleo::profile::pacemaker::ovn_northd

2
deployment/pacemaker/pacemaker-baremetal-puppet.yaml
View File

@ -193,7 +193,7 @@ outputs:
tripleo_logging_sources_pacemaker:
- {get_param: PacemakerLoggingSource}
step_config: |
include ::tripleo::profile::base::pacemaker
include tripleo::profile::base::pacemaker
upgrade_tasks:
- name: upgrade step 0
when: step|int == 0

2
deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml
View File

@ -119,4 +119,4 @@ outputs:
tripleo_logging_sources_pacemaker_remote:
- {get_param: PacemakerRemoteLoggingSource}
step_config: |
include ::tripleo::profile::base::pacemaker_remote
include tripleo::profile::base::pacemaker_remote

2
deployment/qdr/qdrouterd-container-puppet.yaml
View File

@ -89,7 +89,7 @@ outputs:
puppet_config:
config_volume: qdrouterd
step_config: |
include ::tripleo::profile::base::qdr
include tripleo::profile::base::qdr
config_image: {get_param: ContainerQdrouterdConfigImage}
kolla_config:
/var/lib/kolla/config_files/qdrouterd.json:

4
deployment/rabbitmq/rabbitmq-container-puppet.yaml
View File

@ -220,7 +220,7 @@ outputs:
list_join:
- "\n"
- - "['Rabbitmq_policy', 'Rabbitmq_user'].each |String $val| { noop_resource($val) }"
- "include ::tripleo::profile::base::rabbitmq"
- "include tripleo::profile::base::rabbitmq"
config_image: &rabbitmq_config_image {get_param: ContainerRabbitmqConfigImage}
kolla_config:
/var/lib/kolla/config_files/rabbitmq.json:
@ -320,7 +320,7 @@ outputs:
step_2:
config_volume: 'rabbit_init_tasks'
puppet_tags: 'rabbitmq_policy,rabbitmq_user'
step_config: 'include ::tripleo::profile::base::rabbitmq'
step_config: 'include tripleo::profile::base::rabbitmq'
config_image: *rabbitmq_config_image
volumes:
- /var/lib/config-data/rabbitmq/etc/rabbitmq/:/etc/rabbitmq/:ro

4
deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml
View File

@ -165,7 +165,7 @@ outputs:
list_join:
- "\n"
- - "['Rabbitmq_policy', 'Rabbitmq_user'].each |String $val| { noop_resource($val) }"
- "include ::tripleo::profile::base::rabbitmq"
- "include tripleo::profile::base::rabbitmq"
config_image: &rabbitmq_config_image {get_param: ContainerRabbitmqConfigImage}
kolla_config:
/var/lib/kolla/config_files/rabbitmq.json:
@ -266,7 +266,7 @@ outputs:
step_2:
config_volume: 'rabbit_init_tasks'
puppet_tags: 'rabbitmq_policy,rabbitmq_user'
step_config: 'include ::tripleo::profile::base::rabbitmq'
step_config: 'include tripleo::profile::base::rabbitmq'
config_image: *rabbitmq_config_image
volumes:
- /var/lib/config-data/rabbitmq/etc/rabbitmq/:/etc/rabbitmq/:ro

4
deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
View File

@ -124,7 +124,7 @@ outputs:
list_join:
- "\n"
- - "['Rabbitmq_policy', 'Rabbitmq_user'].each |String $val| { noop_resource($val) }"
- "include ::tripleo::profile::base::rabbitmq"
- "include tripleo::profile::base::rabbitmq"
config_image: {get_param: ContainerRabbitmqConfigImage}
kolla_config:
/var/lib/kolla/config_files/rabbitmq.json:
@ -203,7 +203,7 @@ outputs:
- - '/container_puppet_apply.sh'
- '2'
- 'file,file_line,concat,augeas,pacemaker::resource::bundle,pacemaker::property,pacemaker::resource::ocf,pacemaker::constraint::order,pacemaker::constraint::colocation,rabbitmq_policy,rabbitmq_user,rabbitmq_ready'
- 'include ::tripleo::profile::base::pacemaker;include ::tripleo::profile::pacemaker::rabbitmq_bundle'
- 'include tripleo::profile::base::pacemaker;include tripleo::profile::pacemaker::rabbitmq_bundle'
- if:
- puppet_debug_enabled
- - '--debug'

4
deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
View File

@ -124,7 +124,7 @@ outputs:
list_join:
- "\n"
- - "['Rabbitmq_policy', 'Rabbitmq_user'].each |String $val| { noop_resource($val) }"
- "include ::tripleo::profile::pacemaker::rabbitmq_bundle"
- "include tripleo::profile::pacemaker::rabbitmq_bundle"
config_image: {get_param: ContainerRabbitmqConfigImage}
kolla_config:
/var/lib/kolla/config_files/rabbitmq.json:
@ -203,7 +203,7 @@ outputs:
- - '/container_puppet_apply.sh'
- '2'
- 'file,file_line,concat,augeas,pacemaker::resource::bundle,pacemaker::property,pacemaker::resource::ocf,pacemaker::constraint::order,pacemaker::constraint::colocation,rabbitmq_policy,rabbitmq_user,rabbitmq_ready'
- 'include ::tripleo::profile::base::pacemaker;include ::tripleo::profile::pacemaker::rabbitmq_bundle'
- 'include tripleo::profile::base::pacemaker;include tripleo::profile::pacemaker::rabbitmq_bundle'
- if:
- puppet_debug_enabled
- - '--debug'

4
deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml
View File

@ -165,7 +165,7 @@ outputs:
list_join:
- "\n"
- - "['Rabbitmq_policy', 'Rabbitmq_user'].each |String $val| { noop_resource($val) }"
- "include ::tripleo::profile::base::rabbitmq"
- "include tripleo::profile::base::rabbitmq"
config_image: &rabbitmq_config_image {get_param: ContainerRabbitmqConfigImage}
kolla_config:
/var/lib/kolla/config_files/rabbitmq.json:
@ -266,7 +266,7 @@ outputs:
step_2:
config_volume: 'rabbit_init_tasks'
puppet_tags: 'rabbitmq_policy,rabbitmq_user'
step_config: 'include ::tripleo::profile::base::rabbitmq'
step_config: 'include tripleo::profile::base::rabbitmq'
config_image: *rabbitmq_config_image
volumes:
- /var/lib/config-data/rabbitmq/etc/rabbitmq/:/etc/rabbitmq/:ro

4
deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
View File

@ -124,7 +124,7 @@ outputs:
list_join:
- "\n"
- - "['Rabbitmq_policy', 'Rabbitmq_user'].each |String $val| { noop_resource($val) }"
- "include ::tripleo::profile::pacemaker::rabbitmq_bundle"
- "include tripleo::profile::pacemaker::rabbitmq_bundle"
config_image: {get_param: ContainerRabbitmqConfigImage}
kolla_config:
/var/lib/kolla/config_files/rabbitmq.json:
@ -203,7 +203,7 @@ outputs:
- - '/container_puppet_apply.sh'
- '2'
- 'file,file_line,concat,augeas,pacemaker::resource::bundle,pacemaker::property,pacemaker::resource::ocf,pacemaker::constraint::order,pacemaker::constraint::colocation,rabbitmq_policy,rabbitmq_user,rabbitmq_ready'
- 'include ::tripleo::profile::base::pacemaker;include ::tripleo::profile::pacemaker::rabbitmq_bundle'
- 'include tripleo::profile::base::pacemaker;include tripleo::profile::pacemaker::rabbitmq_bundle'
- if:
- puppet_debug_enabled
- - '--debug'

2
deployment/sahara/sahara-api-container-puppet.yaml
View File

@ -146,7 +146,7 @@ outputs:
step_config:
list_join:
- "\n"
- - include ::tripleo::profile::base::sahara::api
- - include tripleo::profile::base::sahara::api
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: ContainerSaharaConfigImage}
kolla_config:

2
deployment/sahara/sahara-engine-container-puppet.yaml
View File

@ -84,7 +84,7 @@ outputs:
step_config:
list_join:
- "\n"
- - include ::tripleo::profile::base::sahara::engine
- - include tripleo::profile::base::sahara::engine
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: ContainerSaharaConfigImage}
kolla_config:

2
deployment/snmp/snmp-baremetal-puppet.yaml
View File

@ -87,7 +87,7 @@ outputs:
snmp::agentaddress: {get_param: SnmpdBindHost}
snmp::snmpd_options: {get_param: SnmpdOptions}
step_config: |
include ::tripleo::profile::base::snmp
include tripleo::profile::base::snmp
upgrade_tasks:
- when: step|int == 0
block:

2
deployment/sshd/sshd-baremetal-puppet.yaml
View File

@ -90,4 +90,4 @@ outputs:
tripleo::profile::base::sshd::options: {get_param: SshServerOptions}
tripleo::profile::base::sshd::password_authentication: {get_param: PasswordAuthentication}
step_config: |
include ::tripleo::profile::base::sshd
include tripleo::profile::base::sshd

2
deployment/swift/swift-dispersion-baremetal-puppet.yaml
View File

@ -47,4 +47,4 @@ outputs:
swift::dispersion::auth_pass: {get_param: SwiftPassword}
swift::dispersion::auth_url: {get_param: [EndpointMap, KeystoneV3Internal, uri]}
step_config: |
include ::tripleo::profile::base::swift::dispersion
include tripleo::profile::base::swift::dispersion

2
deployment/swift/swift-proxy-container-puppet.yaml
View File

@ -274,7 +274,7 @@ outputs:
config_volume: swift
puppet_tags: swift_config,swift_proxy_config,swift_keymaster_config
step_config: |
include ::tripleo::profile::base::swift::proxy
include tripleo::profile::base::swift::proxy
config_image: {get_param: ContainerSwiftConfigImage}
kolla_config:
/var/lib/kolla/config_files/swift_proxy.json:

Some files were not shown because too many files have changed in this diff Show More