From fffdcf0f3059a4f1146ec533f51a65442a105092 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 9 Apr 2020 21:07:34 +0900 Subject: [PATCH] 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 --- common/container-puppet.py | 2 +- deployment/auditd/auditd-baremetal-puppet.yaml | 2 +- deployment/barbican/barbican-api-container-puppet.yaml | 2 +- .../cavium/liquidio-compute-config-container-puppet.yaml | 2 +- .../ceilometer-agent-central-container-puppet.yaml | 2 +- .../ceilometer-agent-compute-container-puppet.yaml | 2 +- .../ceilometer/ceilometer-agent-ipmi-container-puppet.yaml | 2 +- .../ceilometer-agent-notification-container-puppet.yaml | 2 +- deployment/ceph-ansible/ceph-nfs.yaml | 2 +- deployment/certs/ca-certs-baremetal-puppet.yaml | 2 +- deployment/certs/certmonger-user-baremetal-puppet.yaml | 2 +- deployment/cinder/cinder-api-container-puppet.yaml | 4 ++-- deployment/cinder/cinder-backup-container-puppet.yaml | 2 +- deployment/cinder/cinder-backup-pacemaker-puppet.yaml | 4 ++-- deployment/cinder/cinder-scheduler-container-puppet.yaml | 2 +- deployment/cinder/cinder-volume-container-puppet.yaml | 4 ++-- deployment/cinder/cinder-volume-pacemaker-puppet.yaml | 6 +++--- deployment/database/mysql-base.yaml | 2 +- deployment/database/mysql-client.yaml | 2 +- deployment/database/mysql-container-puppet.yaml | 2 +- deployment/database/mysql-pacemaker-puppet.yaml | 4 ++-- deployment/database/redis-container-puppet.yaml | 2 +- deployment/database/redis-pacemaker-puppet.yaml | 4 ++-- .../deprecated/neutron/neutron-sriov-host-config.yaml | 2 +- .../tripleo-firewall/tripleo-firewall-baremetal-puppet.yaml | 2 +- deployment/etcd/etcd-container-puppet.yaml | 4 ++-- deployment/glance/glance-api-container-puppet.yaml | 4 ++-- deployment/gnocchi/gnocchi-api-container-puppet.yaml | 2 +- deployment/gnocchi/gnocchi-metricd-container-puppet.yaml | 2 +- deployment/gnocchi/gnocchi-statsd-container-puppet.yaml | 2 +- deployment/haproxy/haproxy-container-puppet.yaml | 4 ++-- deployment/haproxy/haproxy-pacemaker-puppet.yaml | 4 ++-- deployment/heat/heat-api-cfn-container-puppet.yaml | 2 +- deployment/heat/heat-api-container-puppet.yaml | 2 +- deployment/heat/heat-engine-container-puppet.yaml | 2 +- deployment/horizon/horizon-container-puppet.yaml | 2 +- deployment/ironic/ironic-api-container-puppet.yaml | 2 +- deployment/ironic/ironic-base-puppet.yaml | 2 +- deployment/ironic/ironic-conductor-container-puppet.yaml | 2 +- deployment/ironic/ironic-inspector-container-puppet.yaml | 2 +- deployment/iscsid/iscsid-container-puppet.yaml | 2 +- deployment/keepalived/keepalived-container-puppet.yaml | 2 +- deployment/keystone/keystone-container-puppet.yaml | 4 ++-- deployment/logging/rsyslog-container-puppet.yaml | 2 +- deployment/logging/rsyslog-sidecar-container-puppet.yaml | 2 +- deployment/logrotate/logrotate-crond-container-puppet.yaml | 2 +- deployment/manila/manila-api-container-puppet.yaml | 2 +- deployment/manila/manila-scheduler-container-puppet.yaml | 2 +- deployment/manila/manila-share-container-puppet.yaml | 2 +- deployment/manila/manila-share-pacemaker-puppet.yaml | 4 ++-- deployment/memcached/memcached-container-puppet.yaml | 2 +- deployment/messaging/rpc-qdrouterd-container-puppet.yaml | 2 +- deployment/metrics/collectd-container-puppet.yaml | 2 +- deployment/metrics/qdr-container-puppet.yaml | 2 +- deployment/mistral/mistral-api-container-puppet.yaml | 2 +- deployment/mistral/mistral-engine-container-puppet.yaml | 2 +- .../mistral/mistral-event-engine-container-puppet.yaml | 2 +- deployment/mistral/mistral-executor-container-puppet.yaml | 2 +- deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml | 2 +- .../neutron/neutron-bgpvpn-bagpipe-baremetal-puppet.yaml | 2 +- .../neutron/neutron-bigswitch-agent-baremetal-puppet.yaml | 2 +- deployment/neutron/neutron-compute-plugin-nuage.yaml | 2 +- deployment/neutron/neutron-controller-plugin-nuage.yaml | 2 +- .../neutron/neutron-linuxbridge-agent-baremetal-puppet.yaml | 2 +- deployment/neutron/neutron-mlnx-agent-container-puppet.yaml | 2 +- deployment/neutron/neutron-ovs-agent-container-puppet.yaml | 2 +- .../neutron-plugin-ml2-ansible-container-puppet.yaml | 2 +- .../neutron-plugin-ml2-cisco-vts-container-puppet.yaml | 2 +- deployment/neutron/neutron-plugin-ml2-fujitsu-cfab.yaml | 2 +- deployment/neutron/neutron-plugin-ml2-fujitsu-fossw.yaml | 2 +- ...neutron-plugin-ml2-mlnx-sdn-assist-container-puppet.yaml | 2 +- deployment/neutron/neutron-plugin-ml2-ovn.yaml | 2 +- deployment/neutron/neutron-plugin-ml2.yaml | 2 +- deployment/neutron/neutron-sfc-api-container-puppet.yaml | 2 +- .../neutron/neutron-sriov-agent-container-puppet.yaml | 2 +- deployment/neutron/neutron-vpp-agent-baremetal-puppet.yaml | 2 +- deployment/nova/nova-libvirt-guests-container-puppet.yaml | 2 +- deployment/nova/novajoin-container-puppet.yaml | 2 +- deployment/ovn/ovn-controller-container-puppet.yaml | 2 +- deployment/ovn/ovn-dbs-container-puppet.yaml | 2 +- deployment/ovn/ovn-dbs-pacemaker-puppet.yaml | 2 +- deployment/ovn/ovn-metadata-container-puppet.yaml | 2 +- deployment/pacemaker/clustercheck-container-puppet.yaml | 2 +- .../pacemaker/compute-instanceha-baremetal-puppet.yaml | 2 +- deployment/pacemaker/ovn-dbs-baremetal-puppet.yaml | 2 +- deployment/pacemaker/pacemaker-baremetal-puppet.yaml | 2 +- deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml | 2 +- deployment/qdr/qdrouterd-container-puppet.yaml | 2 +- deployment/rabbitmq/rabbitmq-container-puppet.yaml | 4 ++-- .../rabbitmq-messaging-notify-container-puppet.yaml | 4 ++-- .../rabbitmq-messaging-notify-pacemaker-puppet.yaml | 4 ++-- .../rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml | 4 ++-- .../rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml | 4 ++-- .../rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml | 4 ++-- deployment/sahara/sahara-api-container-puppet.yaml | 2 +- deployment/sahara/sahara-engine-container-puppet.yaml | 2 +- deployment/snmp/snmp-baremetal-puppet.yaml | 2 +- deployment/sshd/sshd-baremetal-puppet.yaml | 2 +- deployment/swift/swift-dispersion-baremetal-puppet.yaml | 2 +- deployment/swift/swift-proxy-container-puppet.yaml | 2 +- deployment/swift/swift-ringbuilder-container-puppet.yaml | 2 +- deployment/swift/swift-storage-container-puppet.yaml | 2 +- .../tripleo-packages/tripleo-packages-baremetal-puppet.yaml | 2 +- deployment/vpp/vpp-baremetal-puppet.yaml | 2 +- deployment/zaqar/zaqar-container-puppet.yaml | 2 +- tools/yaml-validate.py | 2 +- 106 files changed, 125 insertions(+), 125 deletions(-) diff --git a/common/container-puppet.py b/common/container-puppet.py index ab5bf5cac7..d241f4eace 100755 --- a/common/container-puppet.py +++ b/common/container-puppet.py @@ -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( diff --git a/deployment/auditd/auditd-baremetal-puppet.yaml b/deployment/auditd/auditd-baremetal-puppet.yaml index fa3312acc7..8da8e499d3 100644 --- a/deployment/auditd/auditd-baremetal-puppet.yaml +++ b/deployment/auditd/auditd-baremetal-puppet.yaml @@ -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: [] diff --git a/deployment/barbican/barbican-api-container-puppet.yaml b/deployment/barbican/barbican-api-container-puppet.yaml index d435e4b201..45ec685107 100644 --- a/deployment/barbican/barbican-api-container-puppet.yaml +++ b/deployment/barbican/barbican-api-container-puppet.yaml @@ -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: diff --git a/deployment/cavium/liquidio-compute-config-container-puppet.yaml b/deployment/cavium/liquidio-compute-config-container-puppet.yaml index f7484f8fb6..09fa6163ed 100644 --- a/deployment/cavium/liquidio-compute-config-container-puppet.yaml +++ b/deployment/cavium/liquidio-compute-config-container-puppet.yaml @@ -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: diff --git a/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml index 0b5d540b51..90d3ccd622 100644 --- a/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml @@ -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: diff --git a/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml index ec45c7cd47..3fa0913326 100644 --- a/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml @@ -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: diff --git a/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml index 8957eb3acc..cba97ff264 100644 --- a/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml @@ -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: diff --git a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml index 192c55f6a5..c2679fc496 100644 --- a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml @@ -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: diff --git a/deployment/ceph-ansible/ceph-nfs.yaml b/deployment/ceph-ansible/ceph-nfs.yaml index b31d3f10e3..c9520c8465 100644 --- a/deployment/ceph-ansible/ceph-nfs.yaml +++ b/deployment/ceph-ansible/ceph-nfs.yaml @@ -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: '' diff --git a/deployment/certs/ca-certs-baremetal-puppet.yaml b/deployment/certs/ca-certs-baremetal-puppet.yaml index 5413b7b19b..30deb5ec02 100644 --- a/deployment/certs/ca-certs-baremetal-puppet.yaml +++ b/deployment/certs/ca-certs-baremetal-puppet.yaml @@ -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 diff --git a/deployment/certs/certmonger-user-baremetal-puppet.yaml b/deployment/certs/certmonger-user-baremetal-puppet.yaml index b5fb97bdae..9733df0241 100644 --- a/deployment/certs/certmonger-user-baremetal-puppet.yaml +++ b/deployment/certs/certmonger-user-baremetal-puppet.yaml @@ -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 diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml index 6e0934caa1..22d99033e3 100644 --- a/deployment/cinder/cinder-api-container-puppet.yaml +++ b/deployment/cinder/cinder-api-container-puppet.yaml @@ -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 diff --git a/deployment/cinder/cinder-backup-container-puppet.yaml b/deployment/cinder/cinder-backup-container-puppet.yaml index c8833e5fa0..18b2675549 100644 --- a/deployment/cinder/cinder-backup-container-puppet.yaml +++ b/deployment/cinder/cinder-backup-container-puppet.yaml @@ -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]} diff --git a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml index b006721e96..6be2716934 100644 --- a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml +++ b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml @@ -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' diff --git a/deployment/cinder/cinder-scheduler-container-puppet.yaml b/deployment/cinder/cinder-scheduler-container-puppet.yaml index 21eed6a25b..73b01aea24 100644 --- a/deployment/cinder/cinder-scheduler-container-puppet.yaml +++ b/deployment/cinder/cinder-scheduler-container-puppet.yaml @@ -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} diff --git a/deployment/cinder/cinder-volume-container-puppet.yaml b/deployment/cinder/cinder-volume-container-puppet.yaml index 5009a63ed9..2788ec6fc9 100644 --- a/deployment/cinder/cinder-volume-container-puppet.yaml +++ b/deployment/cinder/cinder-volume-container-puppet.yaml @@ -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: diff --git a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml index 407ba252b2..8f6fe4fbfa 100644 --- a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml +++ b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml @@ -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' diff --git a/deployment/database/mysql-base.yaml b/deployment/database/mysql-base.yaml index b37402ae83..a9b5664b78 100644 --- a/deployment/database/mysql-base.yaml +++ b/deployment/database/mysql-base.yaml @@ -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 diff --git a/deployment/database/mysql-client.yaml b/deployment/database/mysql-client.yaml index d98c8e1b03..cf29180f5d 100644 --- a/deployment/database/mysql-client.yaml +++ b/deployment/database/mysql-client.yaml @@ -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 diff --git a/deployment/database/mysql-container-puppet.yaml b/deployment/database/mysql-container-puppet.yaml index 2a9195bf1e..5fd5b6b68d 100644 --- a/deployment/database/mysql-container-puppet.yaml +++ b/deployment/database/mysql-container-puppet.yaml @@ -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: diff --git a/deployment/database/mysql-pacemaker-puppet.yaml b/deployment/database/mysql-pacemaker-puppet.yaml index 4232f2218e..5e0787bcc3 100644 --- a/deployment/database/mysql-pacemaker-puppet.yaml +++ b/deployment/database/mysql-pacemaker-puppet.yaml @@ -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' diff --git a/deployment/database/redis-container-puppet.yaml b/deployment/database/redis-container-puppet.yaml index 239a2bc99f..03fedf21ac 100644 --- a/deployment/database/redis-container-puppet.yaml +++ b/deployment/database/redis-container-puppet.yaml @@ -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: diff --git a/deployment/database/redis-pacemaker-puppet.yaml b/deployment/database/redis-pacemaker-puppet.yaml index c21004f9e2..6d4ddd3fce 100644 --- a/deployment/database/redis-pacemaker-puppet.yaml +++ b/deployment/database/redis-pacemaker-puppet.yaml @@ -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' diff --git a/deployment/deprecated/neutron/neutron-sriov-host-config.yaml b/deployment/deprecated/neutron/neutron-sriov-host-config.yaml index e0ed8c25c5..9a50529207 100644 --- a/deployment/deprecated/neutron/neutron-sriov-host-config.yaml +++ b/deployment/deprecated/neutron/neutron-sriov-host-config.yaml @@ -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] diff --git a/deployment/deprecated/tripleo-firewall/tripleo-firewall-baremetal-puppet.yaml b/deployment/deprecated/tripleo-firewall/tripleo-firewall-baremetal-puppet.yaml index c06507e8f3..00c7af9941 100644 --- a/deployment/deprecated/tripleo-firewall/tripleo-firewall-baremetal-puppet.yaml +++ b/deployment/deprecated/tripleo-firewall/tripleo-firewall-baremetal-puppet.yaml @@ -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: diff --git a/deployment/etcd/etcd-container-puppet.yaml b/deployment/etcd/etcd-container-puppet.yaml index d90b46d572..4e094bba73 100644 --- a/deployment/etcd/etcd-container-puppet.yaml +++ b/deployment/etcd/etcd-container-puppet.yaml @@ -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 diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml index 705628897f..f5aeb30920 100644 --- a/deployment/glance/glance-api-container-puppet.yaml +++ b/deployment/glance/glance-api-container-puppet.yaml @@ -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 diff --git a/deployment/gnocchi/gnocchi-api-container-puppet.yaml b/deployment/gnocchi/gnocchi-api-container-puppet.yaml index d1387a26f6..d5888f7b2f 100644 --- a/deployment/gnocchi/gnocchi-api-container-puppet.yaml +++ b/deployment/gnocchi/gnocchi-api-container-puppet.yaml @@ -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: diff --git a/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml b/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml index 1163a3c8cc..dc65ca4f4b 100644 --- a/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml +++ b/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml @@ -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: diff --git a/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml b/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml index b304673874..aea007a925 100644 --- a/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml +++ b/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml @@ -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: diff --git a/deployment/haproxy/haproxy-container-puppet.yaml b/deployment/haproxy/haproxy-container-puppet.yaml index 7aa2e46926..eb513f73ee 100644 --- a/deployment/haproxy/haproxy-container-puppet.yaml +++ b/deployment/haproxy/haproxy-container-puppet.yaml @@ -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: diff --git a/deployment/haproxy/haproxy-pacemaker-puppet.yaml b/deployment/haproxy/haproxy-pacemaker-puppet.yaml index fc3106342b..e141a78777 100644 --- a/deployment/haproxy/haproxy-pacemaker-puppet.yaml +++ b/deployment/haproxy/haproxy-pacemaker-puppet.yaml @@ -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' diff --git a/deployment/heat/heat-api-cfn-container-puppet.yaml b/deployment/heat/heat-api-cfn-container-puppet.yaml index 6e045ae383..e6237dd9c4 100644 --- a/deployment/heat/heat-api-cfn-container-puppet.yaml +++ b/deployment/heat/heat-api-cfn-container-puppet.yaml @@ -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: diff --git a/deployment/heat/heat-api-container-puppet.yaml b/deployment/heat/heat-api-container-puppet.yaml index c1df1d3533..078ff519e3 100644 --- a/deployment/heat/heat-api-container-puppet.yaml +++ b/deployment/heat/heat-api-container-puppet.yaml @@ -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: diff --git a/deployment/heat/heat-engine-container-puppet.yaml b/deployment/heat/heat-engine-container-puppet.yaml index f39e3b2959..8b786edb24 100644 --- a/deployment/heat/heat-engine-container-puppet.yaml +++ b/deployment/heat/heat-engine-container-puppet.yaml @@ -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: diff --git a/deployment/horizon/horizon-container-puppet.yaml b/deployment/horizon/horizon-container-puppet.yaml index 202746cf05..e06106c814 100644 --- a/deployment/horizon/horizon-container-puppet.yaml +++ b/deployment/horizon/horizon-container-puppet.yaml @@ -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: diff --git a/deployment/ironic/ironic-api-container-puppet.yaml b/deployment/ironic/ironic-api-container-puppet.yaml index 5927738adb..a010ee6a86 100644 --- a/deployment/ironic/ironic-api-container-puppet.yaml +++ b/deployment/ironic/ironic-api-container-puppet.yaml @@ -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: diff --git a/deployment/ironic/ironic-base-puppet.yaml b/deployment/ironic/ironic-base-puppet.yaml index 595f229bc5..7e1adb8a25 100644 --- a/deployment/ironic/ironic-base-puppet.yaml +++ b/deployment/ironic/ironic-base-puppet.yaml @@ -111,4 +111,4 @@ outputs: - {} - ironic::rpc_transport: {get_param: IronicRpcTransport} step_config: | - include ::tripleo::profile::base::ironic + include tripleo::profile::base::ironic diff --git a/deployment/ironic/ironic-conductor-container-puppet.yaml b/deployment/ironic/ironic-conductor-container-puppet.yaml index 864d2a61a8..013c33aa4e 100644 --- a/deployment/ironic/ironic-conductor-container-puppet.yaml +++ b/deployment/ironic/ironic-conductor-container-puppet.yaml @@ -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: diff --git a/deployment/ironic/ironic-inspector-container-puppet.yaml b/deployment/ironic/ironic-inspector-container-puppet.yaml index 0eeedec808..291c51fd55 100644 --- a/deployment/ironic/ironic-inspector-container-puppet.yaml +++ b/deployment/ironic/ironic-inspector-container-puppet.yaml @@ -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: diff --git a/deployment/iscsid/iscsid-container-puppet.yaml b/deployment/iscsid/iscsid-container-puppet.yaml index 1bc9c41087..292bc79260 100644 --- a/deployment/iscsid/iscsid-container-puppet.yaml +++ b/deployment/iscsid/iscsid-container-puppet.yaml @@ -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 diff --git a/deployment/keepalived/keepalived-container-puppet.yaml b/deployment/keepalived/keepalived-container-puppet.yaml index 5cdfe0f1af..7cfc6f5c88 100644 --- a/deployment/keepalived/keepalived-container-puppet.yaml +++ b/deployment/keepalived/keepalived-container-puppet.yaml @@ -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: diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml index 64f3989449..7a8aa257ad 100644 --- a/deployment/keystone/keystone-container-puppet.yaml +++ b/deployment/keystone/keystone-container-puppet.yaml @@ -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: diff --git a/deployment/logging/rsyslog-container-puppet.yaml b/deployment/logging/rsyslog-container-puppet.yaml index 285ff21c4b..1d7608a54d 100644 --- a/deployment/logging/rsyslog-container-puppet.yaml +++ b/deployment/logging/rsyslog-container-puppet.yaml @@ -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: diff --git a/deployment/logging/rsyslog-sidecar-container-puppet.yaml b/deployment/logging/rsyslog-sidecar-container-puppet.yaml index 6b36733c4a..103c1614ca 100644 --- a/deployment/logging/rsyslog-sidecar-container-puppet.yaml +++ b/deployment/logging/rsyslog-sidecar-container-puppet.yaml @@ -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: diff --git a/deployment/logrotate/logrotate-crond-container-puppet.yaml b/deployment/logrotate/logrotate-crond-container-puppet.yaml index 9268670e69..4fa535071e 100644 --- a/deployment/logrotate/logrotate-crond-container-puppet.yaml +++ b/deployment/logrotate/logrotate-crond-container-puppet.yaml @@ -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: diff --git a/deployment/manila/manila-api-container-puppet.yaml b/deployment/manila/manila-api-container-puppet.yaml index 5a3277bfa1..371d46cc66 100644 --- a/deployment/manila/manila-api-container-puppet.yaml +++ b/deployment/manila/manila-api-container-puppet.yaml @@ -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: diff --git a/deployment/manila/manila-scheduler-container-puppet.yaml b/deployment/manila/manila-scheduler-container-puppet.yaml index ef304cee10..a16d37132c 100644 --- a/deployment/manila/manila-scheduler-container-puppet.yaml +++ b/deployment/manila/manila-scheduler-container-puppet.yaml @@ -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: diff --git a/deployment/manila/manila-share-container-puppet.yaml b/deployment/manila/manila-share-container-puppet.yaml index 99494b9e2f..dbf3f450e8 100644 --- a/deployment/manila/manila-share-container-puppet.yaml +++ b/deployment/manila/manila-share-container-puppet.yaml @@ -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: diff --git a/deployment/manila/manila-share-pacemaker-puppet.yaml b/deployment/manila/manila-share-pacemaker-puppet.yaml index df46a947a8..43917a9e8b 100644 --- a/deployment/manila/manila-share-pacemaker-puppet.yaml +++ b/deployment/manila/manila-share-pacemaker-puppet.yaml @@ -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' diff --git a/deployment/memcached/memcached-container-puppet.yaml b/deployment/memcached/memcached-container-puppet.yaml index 6941e93122..2bdd220e22 100644 --- a/deployment/memcached/memcached-container-puppet.yaml +++ b/deployment/memcached/memcached-container-puppet.yaml @@ -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: diff --git a/deployment/messaging/rpc-qdrouterd-container-puppet.yaml b/deployment/messaging/rpc-qdrouterd-container-puppet.yaml index b675fa77cb..d8612d03ad 100644 --- a/deployment/messaging/rpc-qdrouterd-container-puppet.yaml +++ b/deployment/messaging/rpc-qdrouterd-container-puppet.yaml @@ -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: diff --git a/deployment/metrics/collectd-container-puppet.yaml b/deployment/metrics/collectd-container-puppet.yaml index d9c10d5be6..c15b22d7b6 100644 --- a/deployment/metrics/collectd-container-puppet.yaml +++ b/deployment/metrics/collectd-container-puppet.yaml @@ -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: diff --git a/deployment/metrics/qdr-container-puppet.yaml b/deployment/metrics/qdr-container-puppet.yaml index 0d92ad5ba6..c66346931c 100644 --- a/deployment/metrics/qdr-container-puppet.yaml +++ b/deployment/metrics/qdr-container-puppet.yaml @@ -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: diff --git a/deployment/mistral/mistral-api-container-puppet.yaml b/deployment/mistral/mistral-api-container-puppet.yaml index f2be3b7f40..71b5f43afb 100644 --- a/deployment/mistral/mistral-api-container-puppet.yaml +++ b/deployment/mistral/mistral-api-container-puppet.yaml @@ -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: diff --git a/deployment/mistral/mistral-engine-container-puppet.yaml b/deployment/mistral/mistral-engine-container-puppet.yaml index c5ce91398e..ddc3a80b2e 100644 --- a/deployment/mistral/mistral-engine-container-puppet.yaml +++ b/deployment/mistral/mistral-engine-container-puppet.yaml @@ -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: diff --git a/deployment/mistral/mistral-event-engine-container-puppet.yaml b/deployment/mistral/mistral-event-engine-container-puppet.yaml index cd73fce613..2f50ebc832 100644 --- a/deployment/mistral/mistral-event-engine-container-puppet.yaml +++ b/deployment/mistral/mistral-event-engine-container-puppet.yaml @@ -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: diff --git a/deployment/mistral/mistral-executor-container-puppet.yaml b/deployment/mistral/mistral-executor-container-puppet.yaml index b1463e7d76..f7961ace8b 100644 --- a/deployment/mistral/mistral-executor-container-puppet.yaml +++ b/deployment/mistral/mistral-executor-container-puppet.yaml @@ -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: diff --git a/deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml b/deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml index dd7ef34f57..a58529e818 100644 --- a/deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml +++ b/deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml @@ -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: {} diff --git a/deployment/neutron/neutron-bgpvpn-bagpipe-baremetal-puppet.yaml b/deployment/neutron/neutron-bgpvpn-bagpipe-baremetal-puppet.yaml index 8c7639602e..3c1c48365c 100644 --- a/deployment/neutron/neutron-bgpvpn-bagpipe-baremetal-puppet.yaml +++ b/deployment/neutron/neutron-bgpvpn-bagpipe-baremetal-puppet.yaml @@ -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 diff --git a/deployment/neutron/neutron-bigswitch-agent-baremetal-puppet.yaml b/deployment/neutron/neutron-bigswitch-agent-baremetal-puppet.yaml index fb72f72d84..c4b2c680e8 100644 --- a/deployment/neutron/neutron-bigswitch-agent-baremetal-puppet.yaml +++ b/deployment/neutron/neutron-bigswitch-agent-baremetal-puppet.yaml @@ -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 diff --git a/deployment/neutron/neutron-compute-plugin-nuage.yaml b/deployment/neutron/neutron-compute-plugin-nuage.yaml index fcd64f77e3..9d47180456 100644 --- a/deployment/neutron/neutron-compute-plugin-nuage.yaml +++ b/deployment/neutron/neutron-compute-plugin-nuage.yaml @@ -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 diff --git a/deployment/neutron/neutron-controller-plugin-nuage.yaml b/deployment/neutron/neutron-controller-plugin-nuage.yaml index ef43d31ec3..2e30b2150b 100644 --- a/deployment/neutron/neutron-controller-plugin-nuage.yaml +++ b/deployment/neutron/neutron-controller-plugin-nuage.yaml @@ -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 diff --git a/deployment/neutron/neutron-linuxbridge-agent-baremetal-puppet.yaml b/deployment/neutron/neutron-linuxbridge-agent-baremetal-puppet.yaml index 8426727be4..1492e84deb 100644 --- a/deployment/neutron/neutron-linuxbridge-agent-baremetal-puppet.yaml +++ b/deployment/neutron/neutron-linuxbridge-agent-baremetal-puppet.yaml @@ -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] diff --git a/deployment/neutron/neutron-mlnx-agent-container-puppet.yaml b/deployment/neutron/neutron-mlnx-agent-container-puppet.yaml index 83886b28cf..c391d7eb60 100644 --- a/deployment/neutron/neutron-mlnx-agent-container-puppet.yaml +++ b/deployment/neutron/neutron-mlnx-agent-container-puppet.yaml @@ -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: diff --git a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml index d85eec1bb5..c3b953ba9d 100644 --- a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml +++ b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml @@ -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 ." diff --git a/deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml b/deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml index 6a38966a5a..4483848bc9 100644 --- a/deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml +++ b/deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml @@ -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: {} diff --git a/deployment/neutron/neutron-plugin-ml2-cisco-vts-container-puppet.yaml b/deployment/neutron/neutron-plugin-ml2-cisco-vts-container-puppet.yaml index 04c645896b..8505537439 100644 --- a/deployment/neutron/neutron-plugin-ml2-cisco-vts-container-puppet.yaml +++ b/deployment/neutron/neutron-plugin-ml2-cisco-vts-container-puppet.yaml @@ -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: {} diff --git a/deployment/neutron/neutron-plugin-ml2-fujitsu-cfab.yaml b/deployment/neutron/neutron-plugin-ml2-fujitsu-cfab.yaml index a283fc624f..96fd3923f5 100644 --- a/deployment/neutron/neutron-plugin-ml2-fujitsu-cfab.yaml +++ b/deployment/neutron/neutron-plugin-ml2-fujitsu-cfab.yaml @@ -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] diff --git a/deployment/neutron/neutron-plugin-ml2-fujitsu-fossw.yaml b/deployment/neutron/neutron-plugin-ml2-fujitsu-fossw.yaml index d4ba1f5d0b..988eb2312b 100644 --- a/deployment/neutron/neutron-plugin-ml2-fujitsu-fossw.yaml +++ b/deployment/neutron/neutron-plugin-ml2-fujitsu-fossw.yaml @@ -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] diff --git a/deployment/neutron/neutron-plugin-ml2-mlnx-sdn-assist-container-puppet.yaml b/deployment/neutron/neutron-plugin-ml2-mlnx-sdn-assist-container-puppet.yaml index 7b05015075..c2f88474b8 100644 --- a/deployment/neutron/neutron-plugin-ml2-mlnx-sdn-assist-container-puppet.yaml +++ b/deployment/neutron/neutron-plugin-ml2-mlnx-sdn-assist-container-puppet.yaml @@ -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: {} diff --git a/deployment/neutron/neutron-plugin-ml2-ovn.yaml b/deployment/neutron/neutron-plugin-ml2-ovn.yaml index 407ca96a9b..f5b4ee1a9d 100644 --- a/deployment/neutron/neutron-plugin-ml2-ovn.yaml +++ b/deployment/neutron/neutron-plugin-ml2-ovn.yaml @@ -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] diff --git a/deployment/neutron/neutron-plugin-ml2.yaml b/deployment/neutron/neutron-plugin-ml2.yaml index f6965b7c56..576a3b978f 100644 --- a/deployment/neutron/neutron-plugin-ml2.yaml +++ b/deployment/neutron/neutron-plugin-ml2.yaml @@ -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} diff --git a/deployment/neutron/neutron-sfc-api-container-puppet.yaml b/deployment/neutron/neutron-sfc-api-container-puppet.yaml index 4c213fab2e..9e80507adf 100644 --- a/deployment/neutron/neutron-sfc-api-container-puppet.yaml +++ b/deployment/neutron/neutron-sfc-api-container-puppet.yaml @@ -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: {} diff --git a/deployment/neutron/neutron-sriov-agent-container-puppet.yaml b/deployment/neutron/neutron-sriov-agent-container-puppet.yaml index 9ceebe8d5b..e88a424eca 100644 --- a/deployment/neutron/neutron-sriov-agent-container-puppet.yaml +++ b/deployment/neutron/neutron-sriov-agent-container-puppet.yaml @@ -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: diff --git a/deployment/neutron/neutron-vpp-agent-baremetal-puppet.yaml b/deployment/neutron/neutron-vpp-agent-baremetal-puppet.yaml index 6dc12a8dc8..5ae4cc6a24 100644 --- a/deployment/neutron/neutron-vpp-agent-baremetal-puppet.yaml +++ b/deployment/neutron/neutron-vpp-agent-baremetal-puppet.yaml @@ -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] diff --git a/deployment/nova/nova-libvirt-guests-container-puppet.yaml b/deployment/nova/nova-libvirt-guests-container-puppet.yaml index 8b0e134b49..b9d264d2a7 100644 --- a/deployment/nova/nova-libvirt-guests-container-puppet.yaml +++ b/deployment/nova/nova-libvirt-guests-container-puppet.yaml @@ -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} diff --git a/deployment/nova/novajoin-container-puppet.yaml b/deployment/nova/novajoin-container-puppet.yaml index 41ac46305b..e32f9ab443 100644 --- a/deployment/nova/novajoin-container-puppet.yaml +++ b/deployment/nova/novajoin-container-puppet.yaml @@ -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: diff --git a/deployment/ovn/ovn-controller-container-puppet.yaml b/deployment/ovn/ovn-controller-container-puppet.yaml index cb136042e7..72bc5721e5 100644 --- a/deployment/ovn/ovn-controller-container-puppet.yaml +++ b/deployment/ovn/ovn-controller-container-puppet.yaml @@ -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:..." diff --git a/deployment/ovn/ovn-dbs-container-puppet.yaml b/deployment/ovn/ovn-dbs-container-puppet.yaml index a2341049eb..eb4a99d5c7 100644 --- a/deployment/ovn/ovn-dbs-container-puppet.yaml +++ b/deployment/ovn/ovn-dbs-container-puppet.yaml @@ -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 diff --git a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml index c7c566ce75..e18aa97ccb 100644 --- a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml +++ b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml @@ -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' diff --git a/deployment/ovn/ovn-metadata-container-puppet.yaml b/deployment/ovn/ovn-metadata-container-puppet.yaml index 3b6ce76283..8babeff4e6 100644 --- a/deployment/ovn/ovn-metadata-container-puppet.yaml +++ b/deployment/ovn/ovn-metadata-container-puppet.yaml @@ -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: diff --git a/deployment/pacemaker/clustercheck-container-puppet.yaml b/deployment/pacemaker/clustercheck-container-puppet.yaml index 853bf5ad53..96eff81ec7 100644 --- a/deployment/pacemaker/clustercheck-container-puppet.yaml +++ b/deployment/pacemaker/clustercheck-container-puppet.yaml @@ -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: diff --git a/deployment/pacemaker/compute-instanceha-baremetal-puppet.yaml b/deployment/pacemaker/compute-instanceha-baremetal-puppet.yaml index d4b000100e..0cbaa16c64 100644 --- a/deployment/pacemaker/compute-instanceha-baremetal-puppet.yaml +++ b/deployment/pacemaker/compute-instanceha-baremetal-puppet.yaml @@ -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 diff --git a/deployment/pacemaker/ovn-dbs-baremetal-puppet.yaml b/deployment/pacemaker/ovn-dbs-baremetal-puppet.yaml index 8a2e6bae18..b0f192354a 100644 --- a/deployment/pacemaker/ovn-dbs-baremetal-puppet.yaml +++ b/deployment/pacemaker/ovn-dbs-baremetal-puppet.yaml @@ -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 diff --git a/deployment/pacemaker/pacemaker-baremetal-puppet.yaml b/deployment/pacemaker/pacemaker-baremetal-puppet.yaml index 928b9b5e37..f9acaad680 100644 --- a/deployment/pacemaker/pacemaker-baremetal-puppet.yaml +++ b/deployment/pacemaker/pacemaker-baremetal-puppet.yaml @@ -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 diff --git a/deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml b/deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml index 587cbf4159..f65119856e 100644 --- a/deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml +++ b/deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml @@ -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 diff --git a/deployment/qdr/qdrouterd-container-puppet.yaml b/deployment/qdr/qdrouterd-container-puppet.yaml index e7d74a4960..538aa1cfd3 100644 --- a/deployment/qdr/qdrouterd-container-puppet.yaml +++ b/deployment/qdr/qdrouterd-container-puppet.yaml @@ -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: diff --git a/deployment/rabbitmq/rabbitmq-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-container-puppet.yaml index 3994225d05..e21c9db642 100644 --- a/deployment/rabbitmq/rabbitmq-container-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-container-puppet.yaml @@ -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 diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml index 259c5e091c..19166d79ee 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml @@ -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 diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml index a0328eb0b6..ffd0adbe3a 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml @@ -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' diff --git a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml index 7705b2f828..8ec07c117f 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml @@ -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' diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml index 8cb6ff725b..53e35d7d67 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml @@ -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 diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml index 6940420453..82cc93569f 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml @@ -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' diff --git a/deployment/sahara/sahara-api-container-puppet.yaml b/deployment/sahara/sahara-api-container-puppet.yaml index a328c70d45..6dee8e1b33 100644 --- a/deployment/sahara/sahara-api-container-puppet.yaml +++ b/deployment/sahara/sahara-api-container-puppet.yaml @@ -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: diff --git a/deployment/sahara/sahara-engine-container-puppet.yaml b/deployment/sahara/sahara-engine-container-puppet.yaml index b476934cb6..156d2d6528 100644 --- a/deployment/sahara/sahara-engine-container-puppet.yaml +++ b/deployment/sahara/sahara-engine-container-puppet.yaml @@ -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: diff --git a/deployment/snmp/snmp-baremetal-puppet.yaml b/deployment/snmp/snmp-baremetal-puppet.yaml index 041d071524..f775d39f22 100644 --- a/deployment/snmp/snmp-baremetal-puppet.yaml +++ b/deployment/snmp/snmp-baremetal-puppet.yaml @@ -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: diff --git a/deployment/sshd/sshd-baremetal-puppet.yaml b/deployment/sshd/sshd-baremetal-puppet.yaml index 82199f6c12..01545cf60c 100644 --- a/deployment/sshd/sshd-baremetal-puppet.yaml +++ b/deployment/sshd/sshd-baremetal-puppet.yaml @@ -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 diff --git a/deployment/swift/swift-dispersion-baremetal-puppet.yaml b/deployment/swift/swift-dispersion-baremetal-puppet.yaml index 27a083460f..5fb9488e20 100644 --- a/deployment/swift/swift-dispersion-baremetal-puppet.yaml +++ b/deployment/swift/swift-dispersion-baremetal-puppet.yaml @@ -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 diff --git a/deployment/swift/swift-proxy-container-puppet.yaml b/deployment/swift/swift-proxy-container-puppet.yaml index 41e9b3480f..c4c7bdf9b9 100644 --- a/deployment/swift/swift-proxy-container-puppet.yaml +++ b/deployment/swift/swift-proxy-container-puppet.yaml @@ -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: diff --git a/deployment/swift/swift-ringbuilder-container-puppet.yaml b/deployment/swift/swift-ringbuilder-container-puppet.yaml index e466f09ff5..0760ff1580 100644 --- a/deployment/swift/swift-ringbuilder-container-puppet.yaml +++ b/deployment/swift/swift-ringbuilder-container-puppet.yaml @@ -106,7 +106,7 @@ outputs: config_volume: 'swift_ringbuilder' puppet_tags: swift_config,exec,fetch_swift_ring_tarball,extract_swift_ring_tarball,ring_object_device,swift::ringbuilder::create,tripleo::profile::base::swift::add_devices,swift::ringbuilder::rebalance,create_swift_ring_tarball,upload_swift_ring_tarball step_config: | - include ::tripleo::profile::base::swift::ringbuilder + include tripleo::profile::base::swift::ringbuilder config_image: &swift_ringbuilder_image {get_param: ContainerSwiftConfigImage} kolla_config: {} docker_config: diff --git a/deployment/swift/swift-storage-container-puppet.yaml b/deployment/swift/swift-storage-container-puppet.yaml index 4d55eadda4..86c13a5b25 100644 --- a/deployment/swift/swift-storage-container-puppet.yaml +++ b/deployment/swift/swift-storage-container-puppet.yaml @@ -188,7 +188,7 @@ outputs: - "\n" - - "class xinetd() {}" - "define xinetd::service($bind='',$port='',$server='',$server_args='') {}" - - "include ::tripleo::profile::base::swift::storage" + - "include tripleo::profile::base::swift::storage" config_image: {get_param: ContainerSwiftConfigImage} kolla_config: /var/lib/kolla/config_files/swift_account_auditor.json: diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml index d775eb5c13..8c896c6664 100644 --- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml +++ b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml @@ -97,7 +97,7 @@ outputs: config_settings: tripleo::packages::enable_install: {get_param: EnablePackageInstall} step_config: | - include ::tripleo::packages + include tripleo::packages upgrade_tasks: - name: set leapp facts tags: always diff --git a/deployment/vpp/vpp-baremetal-puppet.yaml b/deployment/vpp/vpp-baremetal-puppet.yaml index f6ba00a396..157058c399 100644 --- a/deployment/vpp/vpp-baremetal-puppet.yaml +++ b/deployment/vpp/vpp-baremetal-puppet.yaml @@ -52,7 +52,7 @@ outputs: fdio::vpp_cpu_main_core: {get_param: VppCpuMainCore} fdio::vpp_cpu_corelist_workers: {get_param: VppCpuCorelistWorkers} step_config: | - include ::tripleo::profile::base::vpp + include tripleo::profile::base::vpp upgrade_tasks: - name: Check if vpp is deployed command: systemctl is-enabled vpp diff --git a/deployment/zaqar/zaqar-container-puppet.yaml b/deployment/zaqar/zaqar-container-puppet.yaml index cc12e285ce..c15bf9d5d6 100644 --- a/deployment/zaqar/zaqar-container-puppet.yaml +++ b/deployment/zaqar/zaqar-container-puppet.yaml @@ -269,7 +269,7 @@ outputs: step_config: list_join: - "\n" - - - include ::tripleo::profile::base::zaqar + - - include tripleo::profile::base::zaqar - {get_attr: [MySQLClient, role_data, step_config]} config_image: {get_param: ContainerZaqarConfigImage} kolla_config: diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py index 5b53d30633..7c43a85692 100755 --- a/tools/yaml-validate.py +++ b/tools/yaml-validate.py @@ -686,7 +686,7 @@ def validate_docker_service_mysql_usage(filename, tpl): if not search(puppet_config, match_mysqlclient, no_op): print("ERROR: containerized service %s uses mysql but " "puppet_config section does not include " - "::tripleo::profile::base::database::mysql::client" + "tripleo::profile::base::database::mysql::client" % filename) return 1