From 7f195ff9a81c97469cd3c74d441c28c3b07d34ba Mon Sep 17 00:00:00 2001 From: ramishra Date: Fri, 12 Feb 2021 09:53:59 +0530 Subject: [PATCH] Remove DefaultPasswords interface This was mainly there as an legacy interface which was for internal use. Now that we pull the passwords from the existing environment and don't use it, we can drop this. Reduces a number of heat resources. Change-Id: If83d0f3d72a229d737a45b2fd37507dc11a04649 --- ci/environments/disable-unbound.yaml | 3 -- ci/environments/multinode-core.yaml | 3 -- common/services/role.role.j2.yaml | 6 ---- default_passwords.yaml | 25 -------------- deployment/README.rst | 4 --- deployment/aide/aide-baremetal-ansible.yaml | 3 -- .../aodh/aodh-api-container-puppet.yaml | 5 --- deployment/aodh/aodh-base.yaml | 3 -- .../aodh/aodh-evaluator-container-puppet.yaml | 4 --- .../aodh/aodh-listener-container-puppet.yaml | 4 --- .../aodh/aodh-notifier-container-puppet.yaml | 4 --- .../apache/apache-baremetal-puppet.j2.yaml | 3 -- .../auditd/auditd-baremetal-puppet.yaml | 3 -- .../rear-baremetal-ansible.yaml | 3 -- .../barbican-api-container-puppet.yaml | 4 --- .../barbican-backend-dogtag-puppet.yaml | 3 -- .../barbican-backend-kmip-puppet.yaml | 3 -- ...barbican-backend-pkcs11-crypto-puppet.yaml | 3 -- ...barbican-backend-simple-crypto-puppet.yaml | 3 -- .../barbican/barbican-client-puppet.yaml | 3 -- ...uidio-compute-config-container-puppet.yaml | 3 -- ...ometer-agent-central-container-puppet.yaml | 4 --- ...ometer-agent-compute-container-puppet.yaml | 4 --- ...eilometer-agent-ipmi-container-puppet.yaml | 5 --- ...r-agent-notification-container-puppet.yaml | 4 --- .../ceilometer-base-container-puppet.yaml | 3 -- deployment/ceph-ansible/ceph-base.yaml | 3 -- deployment/ceph-ansible/ceph-client.yaml | 4 --- deployment/ceph-ansible/ceph-external.yaml | 4 --- deployment/ceph-ansible/ceph-grafana.yaml | 4 --- deployment/ceph-ansible/ceph-mds.yaml | 4 --- deployment/ceph-ansible/ceph-mgr.yaml | 4 --- deployment/ceph-ansible/ceph-mon.yaml | 4 --- deployment/ceph-ansible/ceph-nfs.yaml | 4 --- deployment/ceph-ansible/ceph-osd.yaml | 4 --- deployment/ceph-ansible/ceph-rbdmirror.yaml | 4 --- deployment/ceph-ansible/ceph-rgw.yaml | 4 --- .../certs/ca-certs-baremetal-puppet.yaml | 3 -- .../certmonger-user-baremetal-puppet.yaml | 3 -- .../cinder/cinder-api-container-puppet.yaml | 5 --- ...nder-backend-dellemc-powerflex-puppet.yaml | 3 -- ...inder-backend-dellemc-powermax-puppet.yaml | 3 -- ...der-backend-dellemc-powerstore-puppet.yaml | 3 -- .../cinder-backend-dellemc-sc-puppet.yaml | 3 -- .../cinder-backend-dellemc-unity-puppet.yaml | 3 -- ...der-backend-dellemc-vmax-iscsi-puppet.yaml | 3 -- .../cinder-backend-dellemc-vnx-puppet.yaml | 3 -- ...-backend-dellemc-xtremio-iscsi-puppet.yaml | 3 -- ...cinder-backend-dellemc-xtremio-puppet.yaml | 3 -- .../cinder/cinder-backend-dellsc-puppet.yaml | 3 -- .../cinder/cinder-backend-netapp-puppet.yaml | 3 -- .../cinder/cinder-backend-nvmeof-puppet.yaml | 3 -- .../cinder/cinder-backend-pure-puppet.yaml | 3 -- ...der-backend-veritas-hyperscale-puppet.yaml | 3 -- .../cinder-backup-container-puppet.yaml | 4 --- .../cinder-backup-pacemaker-puppet.yaml | 4 --- deployment/cinder/cinder-base.yaml | 3 -- .../cinder-common-container-puppet.yaml | 3 -- .../cinder-hpelefthand-iscsi-puppet.yaml | 3 -- .../cinder-scheduler-container-puppet.yaml | 4 --- .../cinder-volume-container-puppet.yaml | 4 --- .../cinder-volume-pacemaker-puppet.yaml | 4 --- .../openstack-clients-baremetal-ansible.yaml | 3 -- ...er-image-prepare-baremetal-ansible.j2.yaml | 3 -- deployment/containers-common.yaml | 3 -- deployment/database/mysql-base.yaml | 11 +----- deployment/database/mysql-client.yaml | 3 -- .../database/mysql-container-puppet.yaml | 12 +------ .../database/mysql-pacemaker-puppet.yaml | 12 +------ deployment/database/redis-base-puppet.yaml | 3 -- .../database/redis-container-puppet.yaml | 4 --- .../database/redis-pacemaker-puppet.yaml | 4 --- ...inder-backend-dellemc-vxflexos-puppet.yaml | 3 -- .../cinder/cinder-backend-scaleio-puppet.yaml | 3 -- .../keepalived-container-puppet.yaml | 3 -- .../mistral/mistral-api-container-puppet.yaml | 4 --- .../deprecated/mistral/mistral-base.yaml | 3 -- .../mistral-engine-container-puppet.yaml | 4 --- ...mistral-event-engine-container-puppet.yaml | 4 --- .../mistral-executor-container-puppet.yaml | 4 --- .../deprecated/multipathd-container.yaml | 3 -- .../novajoin/ipaclient-baremetal-ansible.yaml | 3 -- .../novajoin/novajoin-container-puppet.yaml | 3 -- .../zaqar/zaqar-container-puppet.yaml | 4 --- deployment/etcd/etcd-container-puppet.yaml | 3 -- .../designate-api-container-puppet.yaml | 4 --- .../designate/designate-base.yaml | 3 -- .../designate-central-container-puppet.yaml | 4 --- .../designate-mdns-container-puppet.yaml | 4 --- .../designate-producer-container-puppet.yaml | 4 --- .../designate-sink-container-puppet.yaml | 4 --- .../designate-worker-container-puppet.yaml | 4 --- .../glance/glance-api-container-puppet.yaml | 4 --- .../glance-api-edge-container-puppet.yaml | 4 --- .../gnocchi/gnocchi-api-container-puppet.yaml | 5 --- deployment/gnocchi/gnocchi-base.yaml | 3 -- .../gnocchi-metricd-container-puppet.yaml | 4 --- .../gnocchi-statsd-container-puppet.yaml | 4 --- .../haproxy/haproxy-container-puppet.yaml | 5 --- .../haproxy-edge-container-puppet.yaml | 4 --- .../haproxy-internal-tls-certmonger.j2.yaml | 3 -- .../haproxy/haproxy-pacemaker-puppet.yaml | 4 --- .../haproxy-public-tls-certmonger.yaml | 3 -- .../haproxy/haproxy-public-tls-inject.yaml | 3 -- .../heat/heat-api-cfn-container-puppet.yaml | 5 --- .../heat-api-cloudwatch-disabled-puppet.yaml | 3 -- .../heat/heat-api-container-puppet.yaml | 5 --- deployment/heat/heat-base-puppet.yaml | 3 -- .../heat/heat-engine-container-puppet.yaml | 12 +------ .../horizon/horizon-container-puppet.yaml | 11 +----- .../image-serve-baremetal-ansible.yaml | 3 -- .../ipa/ipaservices-baremetal-ansible.yaml | 3 -- deployment/ipsec/ipsec-baremetal-ansible.yaml | 3 -- .../ironic/ironic-api-container-puppet.yaml | 5 --- deployment/ironic/ironic-base-puppet.yaml | 3 -- .../ironic-conductor-container-puppet.yaml | 4 --- .../ironic-inspector-container-puppet.yaml | 3 -- ...ironic-neutron-agent-container-puppet.yaml | 4 --- .../ironic/ironic-pxe-container-puppet.yaml | 3 -- .../iscsid/iscsid-container-puppet.yaml | 3 -- .../kernel/kernel-baremetal-ansible.yaml | 3 -- .../kernel-boot-params-baremetal-ansible.yaml | 3 -- .../keystone/keystone-container-puppet.yaml | 4 --- .../logging/rsyslog-baremetal-ansible.yaml | 3 -- .../logging/rsyslog-container-puppet.yaml | 3 -- .../rsyslog-sidecar-container-puppet.yaml | 3 -- .../login-defs-baremetal-ansible.yaml | 3 -- .../logrotate-crond-container-puppet.yaml | 3 -- deployment/logrotate/tmpwatch-install.yaml | 3 -- .../manila/manila-api-container-puppet.yaml | 5 --- deployment/manila/manila-backend-cephfs.yaml | 3 -- deployment/manila/manila-backend-isilon.yaml | 3 -- deployment/manila/manila-backend-netapp.yaml | 3 -- deployment/manila/manila-backend-unity.yaml | 3 -- deployment/manila/manila-backend-vmax.yaml | 3 -- deployment/manila/manila-backend-vnx.yaml | 3 -- deployment/manila/manila-base.yaml | 3 -- .../manila-scheduler-container-puppet.yaml | 4 --- deployment/manila/manila-share-common.yaml | 3 -- .../manila/manila-share-container-puppet.yaml | 4 --- .../manila/manila-share-pacemaker-puppet.yaml | 4 --- .../masquerade-networks-baremetal-puppet.yaml | 3 -- .../memcached/memcached-container-puppet.yaml | 3 -- .../rpc-qdrouterd-container-puppet.yaml | 3 -- .../metrics/collectd-container-puppet.yaml | 3 -- deployment/metrics/qdr-container-puppet.yaml | 3 -- .../multipathd-container-ansible.yaml | 3 -- ...ron-agents-ib-config-container-puppet.yaml | 4 --- .../neutron/neutron-api-container-puppet.yaml | 5 --- deployment/neutron/neutron-base.yaml | 3 -- .../neutron-bgpvpn-api-container-puppet.yaml | 3 -- ...utron-bgpvpn-bagpipe-baremetal-puppet.yaml | 3 -- ...tron-bigswitch-agent-baremetal-puppet.yaml | 3 -- .../neutron/neutron-compute-plugin-nuage.yaml | 3 -- .../neutron-controller-plugin-nuage.yaml | 3 -- .../neutron-dhcp-container-puppet.yaml | 4 --- .../neutron-l2gw-agent-baremetal-puppet.yaml | 3 -- .../neutron-l2gw-api-container-puppet.yaml | 3 -- .../neutron/neutron-l3-compute-dvr.yaml | 4 --- .../neutron/neutron-l3-container-puppet.yaml | 4 --- ...on-linuxbridge-agent-baremetal-puppet.yaml | 4 --- .../neutron-metadata-container-puppet.yaml | 4 --- .../neutron-mlnx-agent-container-puppet.yaml | 4 --- ...tron-ovn-dpdk-config-container-puppet.yaml | 4 --- .../neutron-ovs-agent-container-puppet.yaml | 4 --- ...utron-ovs-dpdk-agent-container-puppet.yaml | 5 --- ...n-plugin-ml2-ansible-container-puppet.yaml | 3 -- ...plugin-ml2-cisco-vts-container-puppet.yaml | 3 -- .../neutron-plugin-ml2-container-puppet.yaml | 3 -- ...-ml2-mlnx-sdn-assist-container-puppet.yaml | 4 --- .../neutron/neutron-plugin-ml2-nuage.yaml | 4 --- .../neutron/neutron-plugin-ml2-ovn.yaml | 4 --- deployment/neutron/neutron-plugin-ml2.yaml | 4 --- .../neutron-plugin-nsx-container-puppet.yaml | 2 -- deployment/neutron/neutron-plugin-nuage.yaml | 4 --- .../neutron-sfc-api-container-puppet.yaml | 3 -- .../neutron-sriov-agent-container-puppet.yaml | 4 --- .../neutron-vpp-agent-baremetal-puppet.yaml | 4 --- .../nova/nova-api-container-puppet.yaml | 7 ---- deployment/nova/nova-apidb-client-puppet.yaml | 3 -- deployment/nova/nova-az-config.yaml | 3 -- deployment/nova/nova-base-puppet.yaml | 3 -- .../nova-compute-common-container-puppet.yaml | 3 -- .../nova/nova-compute-container-puppet.yaml | 5 --- .../nova/nova-conductor-container-puppet.yaml | 6 ---- deployment/nova/nova-db-client-puppet.yaml | 3 -- .../nova/nova-ironic-container-puppet.yaml | 5 --- .../nova/nova-libvirt-container-puppet.yaml | 4 --- .../nova-libvirt-guests-container-puppet.yaml | 3 -- .../nova/nova-manager-container-puppet.yaml | 4 --- .../nova/nova-metadata-container-puppet.yaml | 7 ---- ...ova-migration-target-container-puppet.yaml | 4 --- .../nova/nova-scheduler-container-puppet.yaml | 6 ---- .../nova/nova-vnc-proxy-container-puppet.yaml | 5 --- .../octavia/octavia-api-container-puppet.yaml | 6 ---- deployment/octavia/octavia-base.yaml | 3 -- .../octavia/octavia-deployment-config.j2.yaml | 3 -- ...tavia-health-manager-container-puppet.yaml | 4 --- ...octavia-housekeeping-container-puppet.yaml | 4 --- .../octavia-worker-container-puppet.yaml | 4 --- .../providers/ovn-provider-config.yaml | 3 -- .../openvswitch-dpdk-baremetal-ansible.yaml | 4 --- ...ch-dpdk-netcontrold-container-ansible.yaml | 3 -- .../ovn/ovn-controller-container-puppet.yaml | 3 -- deployment/ovn/ovn-dbs-container-puppet.yaml | 3 -- deployment/ovn/ovn-dbs-pacemaker-puppet.yaml | 4 --- .../ovn/ovn-metadata-container-puppet.yaml | 4 --- .../clustercheck-container-puppet.yaml | 4 --- .../compute-instanceha-baremetal-puppet.yaml | 3 -- .../pacemaker/ovn-dbs-baremetal-puppet.yaml | 4 --- .../pacemaker/pacemaker-baremetal-puppet.yaml | 11 +----- .../pacemaker-remote-baremetal-puppet.yaml | 11 +----- .../placement-api-container-puppet.yaml | 4 --- .../podman/podman-baremetal-ansible.yaml | 3 -- .../qdr/qdrouterd-container-puppet.yaml | 3 -- .../rabbitmq/rabbitmq-container-puppet.yaml | 22 ++---------- ...tmq-messaging-notify-container-puppet.yaml | 15 +------- ...tmq-messaging-notify-pacemaker-puppet.yaml | 15 +------- ...bbitmq-messaging-notify-shared-puppet.yaml | 3 -- .../rabbitmq-messaging-pacemaker-puppet.yaml | 15 +------- ...bbitmq-messaging-rpc-container-puppet.yaml | 15 +------- ...bbitmq-messaging-rpc-pacemaker-puppet.yaml | 21 ++---------- deployment/rhsm/rhsm-baremetal-ansible.yaml | 3 -- .../securetty-baremetal-ansible.yaml | 3 -- deployment/snmp/snmp-baremetal-puppet.yaml | 3 -- deployment/sshd/sshd-baremetal-ansible.yaml | 3 -- deployment/sshd/sshd-baremetal-puppet.yaml | 3 -- ...external-swift-proxy-baremetal-puppet.yaml | 3 -- deployment/swift/swift-base.yaml | 3 -- .../swift-dispersion-baremetal-puppet.yaml | 3 -- .../swift/swift-proxy-container-puppet.yaml | 5 --- .../swift-ringbuilder-container-puppet.yaml | 3 -- .../swift/swift-storage-container-puppet.yaml | 4 --- deployment/tests/test-container-volume.yaml | 3 -- deployment/time/ptp-baremetal-ansible.yaml | 3 -- .../time/timezone-baremetal-ansible.yaml | 3 -- .../timesync/chrony-baremetal-ansible.yaml | 3 -- .../tls/undercloud-remove-novajoin.yaml | 3 -- deployment/tls/undercloud-tls.yaml | 3 -- .../tripleo-firewall-baremetal-ansible.yaml | 3 -- .../tripleo-packages-baremetal-puppet.yaml | 3 -- deployment/tuned/tuned-baremetal-ansible.yaml | 3 -- .../undercloud/minion-rabbitmq-puppet.yaml | 3 -- .../undercloud/tempest-container-puppet.yaml | 3 -- deployment/undercloud/undercloud-upgrade.yaml | 3 -- ...tripleo-validations-baremetal-ansible.yaml | 3 -- ...yperscale-controller-baremetal-puppet.yaml | 3 -- deployment/vpp/vpp-baremetal-puppet.yaml | 3 -- environments/overcloud-baremetal.j2.yaml | 2 -- overcloud-resource-registry-puppet.j2.yaml | 4 +-- overcloud.j2.yaml | 34 ------------------- ...t-password-interface-55a4e85ef0ccef2f.yaml | 5 +++ tools/yaml-validate.py | 6 ++-- .../environment_generator.py | 2 +- 254 files changed, 25 insertions(+), 1064 deletions(-) delete mode 100644 default_passwords.yaml create mode 100644 releasenotes/notes/remove-default-password-interface-55a4e85ef0ccef2f.yaml diff --git a/ci/environments/disable-unbound.yaml b/ci/environments/disable-unbound.yaml index 89fdbd5572..0883645a99 100644 --- a/ci/environments/disable-unbound.yaml +++ b/ci/environments/disable-unbound.yaml @@ -17,9 +17,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/ci/environments/multinode-core.yaml b/ci/environments/multinode-core.yaml index 79063de14b..b0b3676924 100644 --- a/ci/environments/multinode-core.yaml +++ b/ci/environments/multinode-core.yaml @@ -10,9 +10,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json EndpointMap: default: {} description: Mapping of service endpoint -> protocol. Typically set diff --git a/common/services/role.role.j2.yaml b/common/services/role.role.j2.yaml index f3554b9d90..7cfff0b5bb 100644 --- a/common/services/role.role.j2.yaml +++ b/common/services/role.role.j2.yaml @@ -25,11 +25,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - DefaultPasswords: - default: {} - description: Mapping of service -> default password. Used to help - pass top level passwords managed by Heat into services. - type: json RoleName: default: '' description: Role name on which the service is applied @@ -50,7 +45,6 @@ resources: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} EndpointMap: {get_param: EndpointMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/default_passwords.yaml b/default_passwords.yaml deleted file mode 100644 index 6ed3563135..0000000000 --- a/default_passwords.yaml +++ /dev/null @@ -1,25 +0,0 @@ -heat_template_version: rocky - -description: Passwords we manage at the top level - -parameters: - DefaultMysqlRootPassword: - type: string - DefaultRabbitCookie: - type: string - DefaultHeatAuthEncryptionKey: - type: string - DefaultPcsdPassword: - type: string - DefaultHorizonSecret: - type: string - -outputs: - passwords: - description: Password data - value: - mysql_root_password: {get_param: DefaultMysqlRootPassword} - rabbit_cookie: {get_param: DefaultRabbitCookie} - heat_auth_encryption_key: {get_param: DefaultHeatAuthEncryptionKey} - pcsd_password: {get_param: DefaultPcsdPassword} - horizon_secret: {get_param: DefaultHorizonSecret} diff --git a/deployment/README.rst b/deployment/README.rst index 68e9eb9cc9..e2c9c32532 100644 --- a/deployment/README.rst +++ b/deployment/README.rst @@ -201,10 +201,6 @@ the services. Following are the list of default parameters: endpoint data generated for all services, based on the data included in ../network/endpoints/endpoint_data.yaml. - * DefaultPasswords: Mapping of service -> default password. Used to pass some - passwords from the parent templates, this is a legacy interface and should - not be used by new services. - * RoleName: Name of the role on which this service is deployed. A service can be deployed in multiple roles. This is an internal parameter (should not be set via environment file), which is fetched from the name attribute of the diff --git a/deployment/aide/aide-baremetal-ansible.yaml b/deployment/aide/aide-baremetal-ansible.yaml index 44e8a9b27b..ab9062d4c1 100644 --- a/deployment/aide/aide-baremetal-ansible.yaml +++ b/deployment/aide/aide-baremetal-ansible.yaml @@ -9,9 +9,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/aodh/aodh-api-container-puppet.yaml b/deployment/aodh/aodh-api-container-puppet.yaml index 90afe9167e..0f1ef64920 100644 --- a/deployment/aodh/aodh-api-container-puppet.yaml +++ b/deployment/aodh/aodh-api-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -122,7 +119,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -132,7 +128,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/aodh/aodh-base.yaml b/deployment/aodh/aodh-base.yaml index 565c3c982b..f208005752 100644 --- a/deployment/aodh/aodh-base.yaml +++ b/deployment/aodh/aodh-base.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/aodh/aodh-evaluator-container-puppet.yaml b/deployment/aodh/aodh-evaluator-container-puppet.yaml index cad2233043..c227adabfa 100644 --- a/deployment/aodh/aodh-evaluator-container-puppet.yaml +++ b/deployment/aodh/aodh-evaluator-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -53,7 +50,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/aodh/aodh-listener-container-puppet.yaml b/deployment/aodh/aodh-listener-container-puppet.yaml index c81d0b4dc2..542b7c0076 100644 --- a/deployment/aodh/aodh-listener-container-puppet.yaml +++ b/deployment/aodh/aodh-listener-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -53,7 +50,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/aodh/aodh-notifier-container-puppet.yaml b/deployment/aodh/aodh-notifier-container-puppet.yaml index c83f364d1c..4f60b85a94 100644 --- a/deployment/aodh/aodh-notifier-container-puppet.yaml +++ b/deployment/aodh/aodh-notifier-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -53,7 +50,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/apache/apache-baremetal-puppet.j2.yaml b/deployment/apache/apache-baremetal-puppet.j2.yaml index f78640d4ff..24a14f3bc6 100644 --- a/deployment/apache/apache-baremetal-puppet.j2.yaml +++ b/deployment/apache/apache-baremetal-puppet.j2.yaml @@ -23,9 +23,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/auditd/auditd-baremetal-puppet.yaml b/deployment/auditd/auditd-baremetal-puppet.yaml index 8da8e499d3..c313c2ee02 100644 --- a/deployment/auditd/auditd-baremetal-puppet.yaml +++ b/deployment/auditd/auditd-baremetal-puppet.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/backup-and-restore/rear-baremetal-ansible.yaml b/deployment/backup-and-restore/rear-baremetal-ansible.yaml index 334786ed73..6d5b1bd137 100644 --- a/deployment/backup-and-restore/rear-baremetal-ansible.yaml +++ b/deployment/backup-and-restore/rear-baremetal-ansible.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json EndpointMap: default: {} description: Mapping of service endpoint -> protocol. Typically set diff --git a/deployment/barbican/barbican-api-container-puppet.yaml b/deployment/barbican/barbican-api-container-puppet.yaml index d192f4e674..e2435eead6 100644 --- a/deployment/barbican/barbican-api-container-puppet.yaml +++ b/deployment/barbican/barbican-api-container-puppet.yaml @@ -31,9 +31,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json EnableSQLAlchemyCollectd: type: boolean description: > @@ -195,7 +192,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/barbican/barbican-backend-dogtag-puppet.yaml b/deployment/barbican/barbican-backend-dogtag-puppet.yaml index c856b897a4..e7b7a0abd2 100644 --- a/deployment/barbican/barbican-backend-dogtag-puppet.yaml +++ b/deployment/barbican/barbican-backend-dogtag-puppet.yaml @@ -15,9 +15,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/barbican/barbican-backend-kmip-puppet.yaml b/deployment/barbican/barbican-backend-kmip-puppet.yaml index a3cb8c8120..c84c30a965 100644 --- a/deployment/barbican/barbican-backend-kmip-puppet.yaml +++ b/deployment/barbican/barbican-backend-kmip-puppet.yaml @@ -15,9 +15,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/barbican/barbican-backend-pkcs11-crypto-puppet.yaml b/deployment/barbican/barbican-backend-pkcs11-crypto-puppet.yaml index 4bbd24f129..56fe320bf3 100644 --- a/deployment/barbican/barbican-backend-pkcs11-crypto-puppet.yaml +++ b/deployment/barbican/barbican-backend-pkcs11-crypto-puppet.yaml @@ -15,9 +15,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/barbican/barbican-backend-simple-crypto-puppet.yaml b/deployment/barbican/barbican-backend-simple-crypto-puppet.yaml index 451c717f83..836723572b 100644 --- a/deployment/barbican/barbican-backend-simple-crypto-puppet.yaml +++ b/deployment/barbican/barbican-backend-simple-crypto-puppet.yaml @@ -15,9 +15,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/barbican/barbican-client-puppet.yaml b/deployment/barbican/barbican-client-puppet.yaml index 04e93ee8bc..4e5e13c344 100644 --- a/deployment/barbican/barbican-client-puppet.yaml +++ b/deployment/barbican/barbican-client-puppet.yaml @@ -19,9 +19,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/cavium/liquidio-compute-config-container-puppet.yaml b/deployment/cavium/liquidio-compute-config-container-puppet.yaml index 09fa6163ed..c5d5ec1aeb 100644 --- a/deployment/cavium/liquidio-compute-config-container-puppet.yaml +++ b/deployment/cavium/liquidio-compute-config-container-puppet.yaml @@ -24,9 +24,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml index 9f449014a3..c08fabcc05 100644 --- a/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml @@ -30,9 +30,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -70,7 +67,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml index cb2aaf7e2e..75b9c34307 100644 --- a/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -60,7 +57,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml index 985e6b8f9d..2ab34d2cb2 100644 --- a/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml @@ -30,9 +30,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -59,7 +56,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -70,7 +66,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml index 9104cdf561..69a4d99287 100644 --- a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml @@ -30,9 +30,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -103,7 +100,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/ceilometer/ceilometer-base-container-puppet.yaml b/deployment/ceilometer/ceilometer-base-container-puppet.yaml index 45d68286a2..cd13945e22 100644 --- a/deployment/ceilometer/ceilometer-base-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-base-container-puppet.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/ceph-ansible/ceph-base.yaml b/deployment/ceph-ansible/ceph-base.yaml index a9f121b0c2..fcf501cbde 100644 --- a/deployment/ceph-ansible/ceph-base.yaml +++ b/deployment/ceph-ansible/ceph-base.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json CephDashboardAdminPassword: description: Admin password for the dashboard component type: string diff --git a/deployment/ceph-ansible/ceph-client.yaml b/deployment/ceph-ansible/ceph-client.yaml index 48db62f364..17f88dfef4 100644 --- a/deployment/ceph-ansible/ceph-client.yaml +++ b/deployment/ceph-ansible/ceph-client.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -37,7 +34,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/ceph-ansible/ceph-external.yaml b/deployment/ceph-ansible/ceph-external.yaml index 8d1648fa81..c152d64469 100644 --- a/deployment/ceph-ansible/ceph-external.yaml +++ b/deployment/ceph-ansible/ceph-external.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -41,7 +38,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/ceph-ansible/ceph-grafana.yaml b/deployment/ceph-ansible/ceph-grafana.yaml index c2e9736abd..8bfbdddf62 100644 --- a/deployment/ceph-ansible/ceph-grafana.yaml +++ b/deployment/ceph-ansible/ceph-grafana.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -84,7 +81,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/ceph-ansible/ceph-mds.yaml b/deployment/ceph-ansible/ceph-mds.yaml index 0604c834df..32a21d27e9 100644 --- a/deployment/ceph-ansible/ceph-mds.yaml +++ b/deployment/ceph-ansible/ceph-mds.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -44,7 +41,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/ceph-ansible/ceph-mgr.yaml b/deployment/ceph-ansible/ceph-mgr.yaml index 1a06fdec24..0aa3cb37c8 100644 --- a/deployment/ceph-ansible/ceph-mgr.yaml +++ b/deployment/ceph-ansible/ceph-mgr.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -76,7 +73,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/ceph-ansible/ceph-mon.yaml b/deployment/ceph-ansible/ceph-mon.yaml index c893af1239..695c8813a1 100644 --- a/deployment/ceph-ansible/ceph-mon.yaml +++ b/deployment/ceph-ansible/ceph-mon.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -52,7 +49,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/ceph-ansible/ceph-nfs.yaml b/deployment/ceph-ansible/ceph-nfs.yaml index 31df45eb0e..e938de94b4 100644 --- a/deployment/ceph-ansible/ceph-nfs.yaml +++ b/deployment/ceph-ansible/ceph-nfs.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -40,7 +37,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/ceph-ansible/ceph-osd.yaml b/deployment/ceph-ansible/ceph-osd.yaml index 5fbf1392fa..fc14d4dd02 100644 --- a/deployment/ceph-ansible/ceph-osd.yaml +++ b/deployment/ceph-ansible/ceph-osd.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -52,7 +49,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/ceph-ansible/ceph-rbdmirror.yaml b/deployment/ceph-ansible/ceph-rbdmirror.yaml index 3c8ab52442..4d5a3c2e42 100644 --- a/deployment/ceph-ansible/ceph-rbdmirror.yaml +++ b/deployment/ceph-ansible/ceph-rbdmirror.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -60,7 +57,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/ceph-ansible/ceph-rgw.yaml b/deployment/ceph-ansible/ceph-rgw.yaml index 194c0c2c23..de0578b7a3 100644 --- a/deployment/ceph-ansible/ceph-rgw.yaml +++ b/deployment/ceph-ansible/ceph-rgw.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -67,7 +64,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/certs/ca-certs-baremetal-puppet.yaml b/deployment/certs/ca-certs-baremetal-puppet.yaml index 30deb5ec02..30483057d6 100644 --- a/deployment/certs/ca-certs-baremetal-puppet.yaml +++ b/deployment/certs/ca-certs-baremetal-puppet.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/certs/certmonger-user-baremetal-puppet.yaml b/deployment/certs/certmonger-user-baremetal-puppet.yaml index 7ee76e8051..7453955986 100644 --- a/deployment/certs/certmonger-user-baremetal-puppet.yaml +++ b/deployment/certs/certmonger-user-baremetal-puppet.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml index 7f88e6770a..3eb4ac24b8 100644 --- a/deployment/cinder/cinder-api-container-puppet.yaml +++ b/deployment/cinder/cinder-api-container-puppet.yaml @@ -30,9 +30,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -107,7 +104,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -119,7 +115,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/cinder/cinder-backend-dellemc-powerflex-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-powerflex-puppet.yaml index 69a7e73369..6b5f544575 100644 --- a/deployment/cinder/cinder-backend-dellemc-powerflex-puppet.yaml +++ b/deployment/cinder/cinder-backend-dellemc-powerflex-puppet.yaml @@ -102,9 +102,6 @@ parameters: description: Mapping of service_name -> network name. Typically set via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. - DefaultPasswords: - type: json - default: {} RoleName: type: string default: '' diff --git a/deployment/cinder/cinder-backend-dellemc-powermax-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-powermax-puppet.yaml index 343beec8c2..794cb3edfd 100644 --- a/deployment/cinder/cinder-backend-dellemc-powermax-puppet.yaml +++ b/deployment/cinder/cinder-backend-dellemc-powermax-puppet.yaml @@ -69,9 +69,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/cinder/cinder-backend-dellemc-powerstore-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-powerstore-puppet.yaml index 2762715b50..b5e51bf014 100644 --- a/deployment/cinder/cinder-backend-dellemc-powerstore-puppet.yaml +++ b/deployment/cinder/cinder-backend-dellemc-powerstore-puppet.yaml @@ -65,9 +65,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/cinder/cinder-backend-dellemc-sc-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-sc-puppet.yaml index 8fe3e8d492..9cae615cf3 100644 --- a/deployment/cinder/cinder-backend-dellemc-sc-puppet.yaml +++ b/deployment/cinder/cinder-backend-dellemc-sc-puppet.yaml @@ -99,9 +99,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/cinder/cinder-backend-dellemc-unity-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-unity-puppet.yaml index 4f748bf755..5dde15c987 100644 --- a/deployment/cinder/cinder-backend-dellemc-unity-puppet.yaml +++ b/deployment/cinder/cinder-backend-dellemc-unity-puppet.yaml @@ -56,9 +56,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/cinder/cinder-backend-dellemc-vmax-iscsi-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-vmax-iscsi-puppet.yaml index b44ec4d311..3a14683eaa 100644 --- a/deployment/cinder/cinder-backend-dellemc-vmax-iscsi-puppet.yaml +++ b/deployment/cinder/cinder-backend-dellemc-vmax-iscsi-puppet.yaml @@ -43,9 +43,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/cinder/cinder-backend-dellemc-vnx-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-vnx-puppet.yaml index b6b428ae9e..daae7ee6e3 100644 --- a/deployment/cinder/cinder-backend-dellemc-vnx-puppet.yaml +++ b/deployment/cinder/cinder-backend-dellemc-vnx-puppet.yaml @@ -72,9 +72,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/cinder/cinder-backend-dellemc-xtremio-iscsi-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-xtremio-iscsi-puppet.yaml index 883fb75b4c..bea3e0e9a4 100644 --- a/deployment/cinder/cinder-backend-dellemc-xtremio-iscsi-puppet.yaml +++ b/deployment/cinder/cinder-backend-dellemc-xtremio-iscsi-puppet.yaml @@ -65,9 +65,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/cinder/cinder-backend-dellemc-xtremio-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-xtremio-puppet.yaml index 227726d2df..e2983e23f8 100644 --- a/deployment/cinder/cinder-backend-dellemc-xtremio-puppet.yaml +++ b/deployment/cinder/cinder-backend-dellemc-xtremio-puppet.yaml @@ -76,9 +76,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/cinder/cinder-backend-dellsc-puppet.yaml b/deployment/cinder/cinder-backend-dellsc-puppet.yaml index bd4c36719c..ee18480535 100644 --- a/deployment/cinder/cinder-backend-dellsc-puppet.yaml +++ b/deployment/cinder/cinder-backend-dellsc-puppet.yaml @@ -88,9 +88,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/cinder/cinder-backend-netapp-puppet.yaml b/deployment/cinder/cinder-backend-netapp-puppet.yaml index 4e41e7eaee..7376a0b44c 100644 --- a/deployment/cinder/cinder-backend-netapp-puppet.yaml +++ b/deployment/cinder/cinder-backend-netapp-puppet.yaml @@ -13,9 +13,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/cinder/cinder-backend-nvmeof-puppet.yaml b/deployment/cinder/cinder-backend-nvmeof-puppet.yaml index f45fc97ec8..80cefcf3f0 100644 --- a/deployment/cinder/cinder-backend-nvmeof-puppet.yaml +++ b/deployment/cinder/cinder-backend-nvmeof-puppet.yaml @@ -41,9 +41,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/cinder/cinder-backend-pure-puppet.yaml b/deployment/cinder/cinder-backend-pure-puppet.yaml index bbd79ed18a..9f8b4e8b8e 100644 --- a/deployment/cinder/cinder-backend-pure-puppet.yaml +++ b/deployment/cinder/cinder-backend-pure-puppet.yaml @@ -27,9 +27,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/cinder/cinder-backend-veritas-hyperscale-puppet.yaml b/deployment/cinder/cinder-backend-veritas-hyperscale-puppet.yaml index c86bd33b49..e586a9c16a 100644 --- a/deployment/cinder/cinder-backend-veritas-hyperscale-puppet.yaml +++ b/deployment/cinder/cinder-backend-veritas-hyperscale-puppet.yaml @@ -34,9 +34,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/cinder/cinder-backup-container-puppet.yaml b/deployment/cinder/cinder-backup-container-puppet.yaml index 6d5a6f58cb..338986ca68 100644 --- a/deployment/cinder/cinder-backup-container-puppet.yaml +++ b/deployment/cinder/cinder-backup-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -101,7 +98,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml index 8f0f68575c..cbfd38fe99 100644 --- a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml +++ b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml @@ -51,9 +51,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -108,7 +105,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} CinderBackupBackend: {get_param: CinderBackupBackend} diff --git a/deployment/cinder/cinder-base.yaml b/deployment/cinder/cinder-base.yaml index 49da17084a..397420248b 100644 --- a/deployment/cinder/cinder-base.yaml +++ b/deployment/cinder/cinder-base.yaml @@ -37,9 +37,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/cinder/cinder-common-container-puppet.yaml b/deployment/cinder/cinder-common-container-puppet.yaml index d8fbcf75a7..948eead3b4 100644 --- a/deployment/cinder/cinder-common-container-puppet.yaml +++ b/deployment/cinder/cinder-common-container-puppet.yaml @@ -20,9 +20,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/cinder/cinder-hpelefthand-iscsi-puppet.yaml b/deployment/cinder/cinder-hpelefthand-iscsi-puppet.yaml index a31ff127fc..38740d97bb 100644 --- a/deployment/cinder/cinder-hpelefthand-iscsi-puppet.yaml +++ b/deployment/cinder/cinder-hpelefthand-iscsi-puppet.yaml @@ -39,9 +39,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/cinder/cinder-scheduler-container-puppet.yaml b/deployment/cinder/cinder-scheduler-container-puppet.yaml index 03db220dee..13b977ada1 100644 --- a/deployment/cinder/cinder-scheduler-container-puppet.yaml +++ b/deployment/cinder/cinder-scheduler-container-puppet.yaml @@ -30,9 +30,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -59,7 +56,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/cinder/cinder-volume-container-puppet.yaml b/deployment/cinder/cinder-volume-container-puppet.yaml index 0b64a97baa..fcd3705b3e 100644 --- a/deployment/cinder/cinder-volume-container-puppet.yaml +++ b/deployment/cinder/cinder-volume-container-puppet.yaml @@ -34,9 +34,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -204,7 +201,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml index ef6428d4db..ac7cd1d740 100644 --- a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml +++ b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml @@ -39,9 +39,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -96,7 +93,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/clients/openstack-clients-baremetal-ansible.yaml b/deployment/clients/openstack-clients-baremetal-ansible.yaml index b533eecb58..a335bffc3e 100644 --- a/deployment/clients/openstack-clients-baremetal-ansible.yaml +++ b/deployment/clients/openstack-clients-baremetal-ansible.yaml @@ -9,9 +9,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/container-image-prepare/container-image-prepare-baremetal-ansible.j2.yaml b/deployment/container-image-prepare/container-image-prepare-baremetal-ansible.j2.yaml index 1dd36c3229..3aedfc1099 100644 --- a/deployment/container-image-prepare/container-image-prepare-baremetal-ansible.j2.yaml +++ b/deployment/container-image-prepare/container-image-prepare-baremetal-ansible.j2.yaml @@ -19,9 +19,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/containers-common.yaml b/deployment/containers-common.yaml index cb3ae68286..10765bae7a 100644 --- a/deployment/containers-common.yaml +++ b/deployment/containers-common.yaml @@ -21,9 +21,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/database/mysql-base.yaml b/deployment/database/mysql-base.yaml index e98216f47c..15295d485f 100644 --- a/deployment/database/mysql-base.yaml +++ b/deployment/database/mysql-base.yaml @@ -15,9 +15,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -115,13 +112,7 @@ outputs: mysql::server::manage_config_file: true mysql_ipv6: {if: [is_ipv6, true, false]} mysql_max_connections: {get_param: MysqlMaxConnections} - mysql::server::root_password: - yaql: - expression: $.data.passwords.where($ != '').first() - data: - passwords: - - {get_param: MysqlRootPassword} - - {get_param: [DefaultPasswords, mysql_root_password]} + mysql::server::root_password: {get_param: MysqlRootPassword} mysql_clustercheck_password: {get_param: MysqlClustercheckPassword} enable_galera: {get_param: EnableGalera} mysql_auth_ed25519: {get_param: EnableMysqlAuthEd25519} diff --git a/deployment/database/mysql-client.yaml b/deployment/database/mysql-client.yaml index cf29180f5d..d88e29780f 100644 --- a/deployment/database/mysql-client.yaml +++ b/deployment/database/mysql-client.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/database/mysql-container-puppet.yaml b/deployment/database/mysql-container-puppet.yaml index 4fa6fdff9e..b24c90b6dc 100644 --- a/deployment/database/mysql-container-puppet.yaml +++ b/deployment/database/mysql-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -64,7 +61,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -188,13 +184,7 @@ outputs: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS KOLLA_BOOTSTRAP: true DB_MAX_TIMEOUT: 60 - DB_ROOT_PASSWORD: - yaql: - expression: $.data.passwords.where($ != '').first() - data: - passwords: - - {get_param: MysqlRootPassword} - - {get_param: [DefaultPasswords, mysql_root_password]} + DB_ROOT_PASSWORD: {get_param: MysqlRootPassword} mysql: start_order: 2 stop_grace_period: 60 diff --git a/deployment/database/mysql-pacemaker-puppet.yaml b/deployment/database/mysql-pacemaker-puppet.yaml index e14ba73e7a..9017b7007b 100644 --- a/deployment/database/mysql-pacemaker-puppet.yaml +++ b/deployment/database/mysql-pacemaker-puppet.yaml @@ -39,9 +39,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json MysqlRootPassword: type: string hidden: true @@ -99,7 +96,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -265,13 +261,7 @@ outputs: KOLLA_BOOTSTRAP: true DB_MAX_TIMEOUT: 60 DB_CLUSTERCHECK_PASSWORD: {get_param: MysqlClustercheckPassword} - DB_ROOT_PASSWORD: - yaql: - expression: $.data.passwords.where($ != '').first() - data: - passwords: - - {get_param: MysqlRootPassword} - - {get_param: [DefaultPasswords, mysql_root_password]} + DB_ROOT_PASSWORD: {get_param: MysqlRootPassword} step_2: mysql_wait_bundle: start_order: 0 diff --git a/deployment/database/redis-base-puppet.yaml b/deployment/database/redis-base-puppet.yaml index a0efef457e..fa99a258b3 100644 --- a/deployment/database/redis-base-puppet.yaml +++ b/deployment/database/redis-base-puppet.yaml @@ -22,9 +22,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/database/redis-container-puppet.yaml b/deployment/database/redis-container-puppet.yaml index c2efb41a00..02ae919089 100644 --- a/deployment/database/redis-container-puppet.yaml +++ b/deployment/database/redis-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -66,7 +63,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} outputs: role_data: diff --git a/deployment/database/redis-pacemaker-puppet.yaml b/deployment/database/redis-pacemaker-puppet.yaml index cf4af3d0a3..0479b73cac 100644 --- a/deployment/database/redis-pacemaker-puppet.yaml +++ b/deployment/database/redis-pacemaker-puppet.yaml @@ -39,9 +39,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -105,7 +102,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/deprecated/cinder/cinder-backend-dellemc-vxflexos-puppet.yaml b/deployment/deprecated/cinder/cinder-backend-dellemc-vxflexos-puppet.yaml index b697fdedd5..9ed50d1fe3 100644 --- a/deployment/deprecated/cinder/cinder-backend-dellemc-vxflexos-puppet.yaml +++ b/deployment/deprecated/cinder/cinder-backend-dellemc-vxflexos-puppet.yaml @@ -106,9 +106,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/deprecated/cinder/cinder-backend-scaleio-puppet.yaml b/deployment/deprecated/cinder/cinder-backend-scaleio-puppet.yaml index 540432624d..a370bd9173 100644 --- a/deployment/deprecated/cinder/cinder-backend-scaleio-puppet.yaml +++ b/deployment/deprecated/cinder/cinder-backend-scaleio-puppet.yaml @@ -87,9 +87,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/deprecated/keepalived/keepalived-container-puppet.yaml b/deployment/deprecated/keepalived/keepalived-container-puppet.yaml index 85d26a3df9..35ff4249ae 100644 --- a/deployment/deprecated/keepalived/keepalived-container-puppet.yaml +++ b/deployment/deprecated/keepalived/keepalived-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/deprecated/mistral/mistral-api-container-puppet.yaml b/deployment/deprecated/mistral/mistral-api-container-puppet.yaml index 9ed059c04b..41e7fba902 100644 --- a/deployment/deprecated/mistral/mistral-api-container-puppet.yaml +++ b/deployment/deprecated/mistral/mistral-api-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -93,7 +90,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/deprecated/mistral/mistral-base.yaml b/deployment/deprecated/mistral/mistral-base.yaml index 49f7f1da6a..bfdd4b0c3a 100644 --- a/deployment/deprecated/mistral/mistral-base.yaml +++ b/deployment/deprecated/mistral/mistral-base.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/deprecated/mistral/mistral-engine-container-puppet.yaml b/deployment/deprecated/mistral/mistral-engine-container-puppet.yaml index 5c01e448c0..202f7c609b 100644 --- a/deployment/deprecated/mistral/mistral-engine-container-puppet.yaml +++ b/deployment/deprecated/mistral/mistral-engine-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -72,7 +69,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/deprecated/mistral/mistral-event-engine-container-puppet.yaml b/deployment/deprecated/mistral/mistral-event-engine-container-puppet.yaml index a1896cfb12..87d76c8dcd 100644 --- a/deployment/deprecated/mistral/mistral-event-engine-container-puppet.yaml +++ b/deployment/deprecated/mistral/mistral-event-engine-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -51,7 +48,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/deprecated/mistral/mistral-executor-container-puppet.yaml b/deployment/deprecated/mistral/mistral-executor-container-puppet.yaml index 06d04dce37..94b340b5fe 100644 --- a/deployment/deprecated/mistral/mistral-executor-container-puppet.yaml +++ b/deployment/deprecated/mistral/mistral-executor-container-puppet.yaml @@ -29,9 +29,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -100,7 +97,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/deprecated/multipathd-container.yaml b/deployment/deprecated/multipathd-container.yaml index 5389ad4b3b..92d919bdc9 100644 --- a/deployment/deprecated/multipathd-container.yaml +++ b/deployment/deprecated/multipathd-container.yaml @@ -45,9 +45,6 @@ parameters: default: {} description: Parameters specific to the role type: json - DefaultPasswords: - default: {} - type: json conditions: diff --git a/deployment/deprecated/novajoin/ipaclient-baremetal-ansible.yaml b/deployment/deprecated/novajoin/ipaclient-baremetal-ansible.yaml index e30b72eb99..70c87fa832 100644 --- a/deployment/deprecated/novajoin/ipaclient-baremetal-ansible.yaml +++ b/deployment/deprecated/novajoin/ipaclient-baremetal-ansible.yaml @@ -16,9 +16,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/deprecated/novajoin/novajoin-container-puppet.yaml b/deployment/deprecated/novajoin/novajoin-container-puppet.yaml index 087d167fd5..65e19a02e3 100644 --- a/deployment/deprecated/novajoin/novajoin-container-puppet.yaml +++ b/deployment/deprecated/novajoin/novajoin-container-puppet.yaml @@ -28,9 +28,6 @@ parameters: default: {} description: Dictionary packing service data type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/deprecated/zaqar/zaqar-container-puppet.yaml b/deployment/deprecated/zaqar/zaqar-container-puppet.yaml index ab832990c7..fc7d5f2afc 100644 --- a/deployment/deprecated/zaqar/zaqar-container-puppet.yaml +++ b/deployment/deprecated/zaqar/zaqar-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -107,7 +104,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} EnableInternalTLS: {get_param: EnableInternalTLS} diff --git a/deployment/etcd/etcd-container-puppet.yaml b/deployment/etcd/etcd-container-puppet.yaml index 17fead3fd1..aefe44d43b 100644 --- a/deployment/etcd/etcd-container-puppet.yaml +++ b/deployment/etcd/etcd-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/experimental/designate/designate-api-container-puppet.yaml b/deployment/experimental/designate/designate-api-container-puppet.yaml index 184e97acf3..29d444baf8 100644 --- a/deployment/experimental/designate/designate-api-container-puppet.yaml +++ b/deployment/experimental/designate/designate-api-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -70,7 +67,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/experimental/designate/designate-base.yaml b/deployment/experimental/designate/designate-base.yaml index 5a00804bfc..27b6559880 100644 --- a/deployment/experimental/designate/designate-base.yaml +++ b/deployment/experimental/designate/designate-base.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/experimental/designate/designate-central-container-puppet.yaml b/deployment/experimental/designate/designate-central-container-puppet.yaml index 78f2da36c8..6a5baa2bf2 100644 --- a/deployment/experimental/designate/designate-central-container-puppet.yaml +++ b/deployment/experimental/designate/designate-central-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json EnableSQLAlchemyCollectd: type: boolean description: > @@ -80,7 +77,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/experimental/designate/designate-mdns-container-puppet.yaml b/deployment/experimental/designate/designate-mdns-container-puppet.yaml index 214d339964..630d1d895f 100644 --- a/deployment/experimental/designate/designate-mdns-container-puppet.yaml +++ b/deployment/experimental/designate/designate-mdns-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json EnableSQLAlchemyCollectd: type: boolean description: > @@ -71,7 +68,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/experimental/designate/designate-producer-container-puppet.yaml b/deployment/experimental/designate/designate-producer-container-puppet.yaml index cf93e352aa..e82dfc0e79 100644 --- a/deployment/experimental/designate/designate-producer-container-puppet.yaml +++ b/deployment/experimental/designate/designate-producer-container-puppet.yaml @@ -30,9 +30,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -67,7 +64,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/experimental/designate/designate-sink-container-puppet.yaml b/deployment/experimental/designate/designate-sink-container-puppet.yaml index 95b3c7a44e..37fc4490a7 100644 --- a/deployment/experimental/designate/designate-sink-container-puppet.yaml +++ b/deployment/experimental/designate/designate-sink-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -58,7 +55,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/experimental/designate/designate-worker-container-puppet.yaml b/deployment/experimental/designate/designate-worker-container-puppet.yaml index 23be019393..9fbccb716f 100644 --- a/deployment/experimental/designate/designate-worker-container-puppet.yaml +++ b/deployment/experimental/designate/designate-worker-container-puppet.yaml @@ -33,9 +33,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -70,7 +67,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml index 839c531ae4..210b9e3f5c 100644 --- a/deployment/glance/glance-api-container-puppet.yaml +++ b/deployment/glance/glance-api-container-puppet.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -368,7 +365,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/glance/glance-api-edge-container-puppet.yaml b/deployment/glance/glance-api-edge-container-puppet.yaml index 7a06f931d7..94242af46f 100644 --- a/deployment/glance/glance-api-edge-container-puppet.yaml +++ b/deployment/glance/glance-api-edge-container-puppet.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -45,7 +42,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/gnocchi/gnocchi-api-container-puppet.yaml b/deployment/gnocchi/gnocchi-api-container-puppet.yaml index c7dc620fd0..677122e32c 100644 --- a/deployment/gnocchi/gnocchi-api-container-puppet.yaml +++ b/deployment/gnocchi/gnocchi-api-container-puppet.yaml @@ -30,9 +30,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -146,7 +143,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -156,7 +152,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/gnocchi/gnocchi-base.yaml b/deployment/gnocchi/gnocchi-base.yaml index 41b8f706d3..628d259ad2 100644 --- a/deployment/gnocchi/gnocchi-base.yaml +++ b/deployment/gnocchi/gnocchi-base.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml b/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml index ac5b6b7b30..6d7250da6e 100644 --- a/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml +++ b/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -91,7 +88,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml b/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml index d0be5eb1ad..18bb714a76 100644 --- a/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml +++ b/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -83,7 +80,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/haproxy/haproxy-container-puppet.yaml b/deployment/haproxy/haproxy-container-puppet.yaml index f4ea1e8d85..10234e8850 100644 --- a/deployment/haproxy/haproxy-container-puppet.yaml +++ b/deployment/haproxy/haproxy-container-puppet.yaml @@ -20,9 +20,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json EndpointMap: default: {} description: Mapping of service endpoint -> protocol. Typically set @@ -140,7 +137,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -150,7 +146,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/haproxy/haproxy-edge-container-puppet.yaml b/deployment/haproxy/haproxy-edge-container-puppet.yaml index ab7686d9a2..729b91c64b 100644 --- a/deployment/haproxy/haproxy-edge-container-puppet.yaml +++ b/deployment/haproxy/haproxy-edge-container-puppet.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -51,7 +48,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/haproxy/haproxy-internal-tls-certmonger.j2.yaml b/deployment/haproxy/haproxy-internal-tls-certmonger.j2.yaml index e9259cfcd1..a391276c20 100644 --- a/deployment/haproxy/haproxy-internal-tls-certmonger.j2.yaml +++ b/deployment/haproxy/haproxy-internal-tls-certmonger.j2.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/haproxy/haproxy-pacemaker-puppet.yaml b/deployment/haproxy/haproxy-pacemaker-puppet.yaml index 686ce90cc9..ee93fe86e0 100644 --- a/deployment/haproxy/haproxy-pacemaker-puppet.yaml +++ b/deployment/haproxy/haproxy-pacemaker-puppet.yaml @@ -34,9 +34,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json EndpointMap: default: {} description: Mapping of service endpoint -> protocol. Typically set @@ -137,7 +134,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/haproxy/haproxy-public-tls-certmonger.yaml b/deployment/haproxy/haproxy-public-tls-certmonger.yaml index 0abcbf7977..3915935dda 100644 --- a/deployment/haproxy/haproxy-public-tls-certmonger.yaml +++ b/deployment/haproxy/haproxy-public-tls-certmonger.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/haproxy/haproxy-public-tls-inject.yaml b/deployment/haproxy/haproxy-public-tls-inject.yaml index afd5703184..a250dbe7cb 100644 --- a/deployment/haproxy/haproxy-public-tls-inject.yaml +++ b/deployment/haproxy/haproxy-public-tls-inject.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/heat/heat-api-cfn-container-puppet.yaml b/deployment/heat/heat-api-cfn-container-puppet.yaml index 82c5b18b1a..1358d8230f 100644 --- a/deployment/heat/heat-api-cfn-container-puppet.yaml +++ b/deployment/heat/heat-api-cfn-container-puppet.yaml @@ -31,9 +31,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -76,7 +73,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -88,7 +84,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml b/deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml index ce9232d957..bfea00383e 100644 --- a/deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml +++ b/deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/heat/heat-api-container-puppet.yaml b/deployment/heat/heat-api-container-puppet.yaml index f11157c94f..ea38da9e5d 100644 --- a/deployment/heat/heat-api-container-puppet.yaml +++ b/deployment/heat/heat-api-container-puppet.yaml @@ -31,9 +31,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -94,7 +91,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -106,7 +102,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/heat/heat-base-puppet.yaml b/deployment/heat/heat-base-puppet.yaml index 57c0bf0b2e..dc7714902c 100644 --- a/deployment/heat/heat-base-puppet.yaml +++ b/deployment/heat/heat-base-puppet.yaml @@ -32,9 +32,6 @@ parameters: type: string default: 'regionOne' description: Keystone region for endpoint - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/heat/heat-engine-container-puppet.yaml b/deployment/heat/heat-engine-container-puppet.yaml index e3b56037d6..b0d05054d3 100644 --- a/deployment/heat/heat-engine-container-puppet.yaml +++ b/deployment/heat/heat-engine-container-puppet.yaml @@ -30,9 +30,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -135,7 +132,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -197,13 +193,7 @@ outputs: - - {get_param: [EndpointMap, KeystoneV3Internal, uri]} - '/ec2tokens' heat::keystone::domain::domain_password: {get_param: HeatStackDomainAdminPassword} - heat::engine::auth_encryption_key: - yaql: - expression: $.data.passwords.where($ != '').first() - data: - passwords: - - {get_param: HeatAuthEncryptionKey} - - {get_param: [DefaultPasswords, heat_auth_encryption_key]} + heat::engine::auth_encryption_key: {get_param: HeatAuthEncryptionKey} heat::engine::plugin_dirs: {get_param: HeatEnginePluginDirs} - if: diff --git a/deployment/horizon/horizon-container-puppet.yaml b/deployment/horizon/horizon-container-puppet.yaml index c731954384..4ce80f8a7f 100644 --- a/deployment/horizon/horizon-container-puppet.yaml +++ b/deployment/horizon/horizon-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -210,13 +207,7 @@ outputs: horizon::keystone_url: {get_param: [EndpointMap, KeystoneV3Public, uri]} horizon::password_validator: {get_param: [HorizonPasswordValidator]} horizon::password_validator_help: {get_param: [HorizonPasswordValidatorHelp]} - horizon::secret_key: - yaql: - expression: $.data.passwords.where($ != '').first() - data: - passwords: - - {get_param: HorizonSecret} - - {get_param: [DefaultPasswords, horizon_secret]} + horizon::secret_key: {get_param: HorizonSecret} horizon::secure_cookies: {get_param: [HorizonSecureCookies]} horizon::session_timeout: {get_param: HorizonSessionTimeout} memcached_ipv6: {if: [is_ipv6, true, false]} diff --git a/deployment/image-serve/image-serve-baremetal-ansible.yaml b/deployment/image-serve/image-serve-baremetal-ansible.yaml index 91487a5eca..df577adb6f 100644 --- a/deployment/image-serve/image-serve-baremetal-ansible.yaml +++ b/deployment/image-serve/image-serve-baremetal-ansible.yaml @@ -19,9 +19,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/ipa/ipaservices-baremetal-ansible.yaml b/deployment/ipa/ipaservices-baremetal-ansible.yaml index 1e58ee7677..e6956e618b 100644 --- a/deployment/ipa/ipaservices-baremetal-ansible.yaml +++ b/deployment/ipa/ipaservices-baremetal-ansible.yaml @@ -16,9 +16,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/ipsec/ipsec-baremetal-ansible.yaml b/deployment/ipsec/ipsec-baremetal-ansible.yaml index f26ce402b8..3acfd60e5c 100644 --- a/deployment/ipsec/ipsec-baremetal-ansible.yaml +++ b/deployment/ipsec/ipsec-baremetal-ansible.yaml @@ -16,9 +16,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/ironic/ironic-api-container-puppet.yaml b/deployment/ironic/ironic-api-container-puppet.yaml index 35fd1573fb..92bea6d3c3 100644 --- a/deployment/ironic/ironic-api-container-puppet.yaml +++ b/deployment/ironic/ironic-api-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -79,7 +76,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -96,7 +92,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/ironic/ironic-base-puppet.yaml b/deployment/ironic/ironic-base-puppet.yaml index 7e1adb8a25..027bc0c0f4 100644 --- a/deployment/ironic/ironic-base-puppet.yaml +++ b/deployment/ironic/ironic-base-puppet.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/ironic/ironic-conductor-container-puppet.yaml b/deployment/ironic/ironic-conductor-container-puppet.yaml index 698b5ab92c..21263a674c 100644 --- a/deployment/ironic/ironic-conductor-container-puppet.yaml +++ b/deployment/ironic/ironic-conductor-container-puppet.yaml @@ -29,9 +29,6 @@ parameters: default: false description: Set to True to enable debugging on all services. type: boolean - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -309,7 +306,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/ironic/ironic-inspector-container-puppet.yaml b/deployment/ironic/ironic-inspector-container-puppet.yaml index 720cf967a4..1074ff0a95 100644 --- a/deployment/ironic/ironic-inspector-container-puppet.yaml +++ b/deployment/ironic/ironic-inspector-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: default: {} description: Dictionary packing service data type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/ironic/ironic-neutron-agent-container-puppet.yaml b/deployment/ironic/ironic-neutron-agent-container-puppet.yaml index 1995e5e8fd..0e1deca15a 100644 --- a/deployment/ironic/ironic-neutron-agent-container-puppet.yaml +++ b/deployment/ironic/ironic-neutron-agent-container-puppet.yaml @@ -20,9 +20,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -55,7 +52,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/ironic/ironic-pxe-container-puppet.yaml b/deployment/ironic/ironic-pxe-container-puppet.yaml index ef74180c4b..4a7d27d9a6 100644 --- a/deployment/ironic/ironic-pxe-container-puppet.yaml +++ b/deployment/ironic/ironic-pxe-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/iscsid/iscsid-container-puppet.yaml b/deployment/iscsid/iscsid-container-puppet.yaml index 5b2dcaffaa..c35ee162e8 100644 --- a/deployment/iscsid/iscsid-container-puppet.yaml +++ b/deployment/iscsid/iscsid-container-puppet.yaml @@ -33,9 +33,6 @@ parameters: default: {} description: Parameters specific to the role type: json - DefaultPasswords: - default: {} - type: json LVMFilterEnabled: default: false description: Enables configuration of LVM2 with a filter so that devices not diff --git a/deployment/kernel/kernel-baremetal-ansible.yaml b/deployment/kernel/kernel-baremetal-ansible.yaml index 7294be07c5..3de0e7f272 100644 --- a/deployment/kernel/kernel-baremetal-ansible.yaml +++ b/deployment/kernel/kernel-baremetal-ansible.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/kernel/kernel-boot-params-baremetal-ansible.yaml b/deployment/kernel/kernel-boot-params-baremetal-ansible.yaml index 869fbe5acf..442ca7d98c 100644 --- a/deployment/kernel/kernel-boot-params-baremetal-ansible.yaml +++ b/deployment/kernel/kernel-boot-params-baremetal-ansible.yaml @@ -16,9 +16,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml index bfdf5933ca..56d9cd8e72 100644 --- a/deployment/keystone/keystone-container-puppet.yaml +++ b/deployment/keystone/keystone-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -322,7 +319,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/logging/rsyslog-baremetal-ansible.yaml b/deployment/logging/rsyslog-baremetal-ansible.yaml index a40b6a3cfb..852ca1583f 100644 --- a/deployment/logging/rsyslog-baremetal-ansible.yaml +++ b/deployment/logging/rsyslog-baremetal-ansible.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/logging/rsyslog-container-puppet.yaml b/deployment/logging/rsyslog-container-puppet.yaml index 038dd3b51e..c8bb0b6d64 100644 --- a/deployment/logging/rsyslog-container-puppet.yaml +++ b/deployment/logging/rsyslog-container-puppet.yaml @@ -26,9 +26,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/logging/rsyslog-sidecar-container-puppet.yaml b/deployment/logging/rsyslog-sidecar-container-puppet.yaml index 103c1614ca..cb2d915de6 100644 --- a/deployment/logging/rsyslog-sidecar-container-puppet.yaml +++ b/deployment/logging/rsyslog-sidecar-container-puppet.yaml @@ -22,9 +22,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/login-defs/login-defs-baremetal-ansible.yaml b/deployment/login-defs/login-defs-baremetal-ansible.yaml index d91580a0fb..193e66c7ba 100644 --- a/deployment/login-defs/login-defs-baremetal-ansible.yaml +++ b/deployment/login-defs/login-defs-baremetal-ansible.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/logrotate/logrotate-crond-container-puppet.yaml b/deployment/logrotate/logrotate-crond-container-puppet.yaml index 4fa535071e..3568a3df56 100644 --- a/deployment/logrotate/logrotate-crond-container-puppet.yaml +++ b/deployment/logrotate/logrotate-crond-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/logrotate/tmpwatch-install.yaml b/deployment/logrotate/tmpwatch-install.yaml index 45a220de3c..fa8f1628f0 100644 --- a/deployment/logrotate/tmpwatch-install.yaml +++ b/deployment/logrotate/tmpwatch-install.yaml @@ -19,9 +19,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/manila/manila-api-container-puppet.yaml b/deployment/manila/manila-api-container-puppet.yaml index 17774bc80f..01e7f729c0 100644 --- a/deployment/manila/manila-api-container-puppet.yaml +++ b/deployment/manila/manila-api-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -80,7 +77,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -89,7 +85,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/manila/manila-backend-cephfs.yaml b/deployment/manila/manila-backend-cephfs.yaml index 319748443a..a1cb736469 100644 --- a/deployment/manila/manila-backend-cephfs.yaml +++ b/deployment/manila/manila-backend-cephfs.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/manila/manila-backend-isilon.yaml b/deployment/manila/manila-backend-isilon.yaml index 851ef10cd8..b6600dd2e0 100644 --- a/deployment/manila/manila-backend-isilon.yaml +++ b/deployment/manila/manila-backend-isilon.yaml @@ -38,9 +38,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/manila/manila-backend-netapp.yaml b/deployment/manila/manila-backend-netapp.yaml index 9170199344..28162680c0 100644 --- a/deployment/manila/manila-backend-netapp.yaml +++ b/deployment/manila/manila-backend-netapp.yaml @@ -74,9 +74,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/manila/manila-backend-unity.yaml b/deployment/manila/manila-backend-unity.yaml index 3b9edaa602..d5ddaa2810 100644 --- a/deployment/manila/manila-backend-unity.yaml +++ b/deployment/manila/manila-backend-unity.yaml @@ -48,9 +48,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/manila/manila-backend-vmax.yaml b/deployment/manila/manila-backend-vmax.yaml index 5cb6281506..18d254a8f1 100644 --- a/deployment/manila/manila-backend-vmax.yaml +++ b/deployment/manila/manila-backend-vmax.yaml @@ -38,9 +38,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/manila/manila-backend-vnx.yaml b/deployment/manila/manila-backend-vnx.yaml index ddebabd943..3940591f6c 100644 --- a/deployment/manila/manila-backend-vnx.yaml +++ b/deployment/manila/manila-backend-vnx.yaml @@ -48,9 +48,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/manila/manila-base.yaml b/deployment/manila/manila-base.yaml index 0e77a9732d..914cf92ff5 100644 --- a/deployment/manila/manila-base.yaml +++ b/deployment/manila/manila-base.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/manila/manila-scheduler-container-puppet.yaml b/deployment/manila/manila-scheduler-container-puppet.yaml index b6de7071ef..f4b3a34717 100644 --- a/deployment/manila/manila-scheduler-container-puppet.yaml +++ b/deployment/manila/manila-scheduler-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -54,7 +51,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} outputs: role_data: diff --git a/deployment/manila/manila-share-common.yaml b/deployment/manila/manila-share-common.yaml index d5f3ad357d..8a71e602f0 100644 --- a/deployment/manila/manila-share-common.yaml +++ b/deployment/manila/manila-share-common.yaml @@ -20,9 +20,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/manila/manila-share-container-puppet.yaml b/deployment/manila/manila-share-container-puppet.yaml index 18bcca75b0..eeca9db0bb 100644 --- a/deployment/manila/manila-share-container-puppet.yaml +++ b/deployment/manila/manila-share-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -79,7 +76,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/manila/manila-share-pacemaker-puppet.yaml b/deployment/manila/manila-share-pacemaker-puppet.yaml index 7adfd440eb..e74d289c26 100644 --- a/deployment/manila/manila-share-pacemaker-puppet.yaml +++ b/deployment/manila/manila-share-pacemaker-puppet.yaml @@ -39,9 +39,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -91,7 +88,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/masquerade-networks/masquerade-networks-baremetal-puppet.yaml b/deployment/masquerade-networks/masquerade-networks-baremetal-puppet.yaml index 62dd2dc666..1d87ddafed 100644 --- a/deployment/masquerade-networks/masquerade-networks-baremetal-puppet.yaml +++ b/deployment/masquerade-networks/masquerade-networks-baremetal-puppet.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/memcached/memcached-container-puppet.yaml b/deployment/memcached/memcached-container-puppet.yaml index 8f7d067c6d..ded4d2d1fa 100644 --- a/deployment/memcached/memcached-container-puppet.yaml +++ b/deployment/memcached/memcached-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/messaging/rpc-qdrouterd-container-puppet.yaml b/deployment/messaging/rpc-qdrouterd-container-puppet.yaml index a069a660b6..a230cda174 100644 --- a/deployment/messaging/rpc-qdrouterd-container-puppet.yaml +++ b/deployment/messaging/rpc-qdrouterd-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/metrics/collectd-container-puppet.yaml b/deployment/metrics/collectd-container-puppet.yaml index 31c65542c9..303120d9a9 100644 --- a/deployment/metrics/collectd-container-puppet.yaml +++ b/deployment/metrics/collectd-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/metrics/qdr-container-puppet.yaml b/deployment/metrics/qdr-container-puppet.yaml index d2022565ef..52f7d0c024 100644 --- a/deployment/metrics/qdr-container-puppet.yaml +++ b/deployment/metrics/qdr-container-puppet.yaml @@ -20,9 +20,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/multipathd/multipathd-container-ansible.yaml b/deployment/multipathd/multipathd-container-ansible.yaml index 9bffe775ae..b5d8ae7b16 100644 --- a/deployment/multipathd/multipathd-container-ansible.yaml +++ b/deployment/multipathd/multipathd-container-ansible.yaml @@ -60,9 +60,6 @@ parameters: default: {} description: Parameters specific to the role type: json - DefaultPasswords: - default: {} - type: json resources: diff --git a/deployment/neutron/neutron-agents-ib-config-container-puppet.yaml b/deployment/neutron/neutron-agents-ib-config-container-puppet.yaml index f26ecf0171..bf6de4802a 100644 --- a/deployment/neutron/neutron-agents-ib-config-container-puppet.yaml +++ b/deployment/neutron/neutron-agents-ib-config-container-puppet.yaml @@ -17,9 +17,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -61,7 +58,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/neutron/neutron-api-container-puppet.yaml b/deployment/neutron/neutron-api-container-puppet.yaml index 5b8fb44a6e..73d7fb0069 100644 --- a/deployment/neutron/neutron-api-container-puppet.yaml +++ b/deployment/neutron/neutron-api-container-puppet.yaml @@ -30,9 +30,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -217,7 +214,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -235,7 +231,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/neutron/neutron-base.yaml b/deployment/neutron/neutron-base.yaml index fe050464ed..6e9149c6f3 100644 --- a/deployment/neutron/neutron-base.yaml +++ b/deployment/neutron/neutron-base.yaml @@ -85,9 +85,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml b/deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml index a58529e818..6896428b93 100644 --- a/deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml +++ b/deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/neutron/neutron-bgpvpn-bagpipe-baremetal-puppet.yaml b/deployment/neutron/neutron-bgpvpn-bagpipe-baremetal-puppet.yaml index 3c1c48365c..184356d1d7 100644 --- a/deployment/neutron/neutron-bgpvpn-bagpipe-baremetal-puppet.yaml +++ b/deployment/neutron/neutron-bgpvpn-bagpipe-baremetal-puppet.yaml @@ -38,9 +38,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/neutron/neutron-bigswitch-agent-baremetal-puppet.yaml b/deployment/neutron/neutron-bigswitch-agent-baremetal-puppet.yaml index c4b2c680e8..e8eb92c6f9 100644 --- a/deployment/neutron/neutron-bigswitch-agent-baremetal-puppet.yaml +++ b/deployment/neutron/neutron-bigswitch-agent-baremetal-puppet.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/neutron/neutron-compute-plugin-nuage.yaml b/deployment/neutron/neutron-compute-plugin-nuage.yaml index 9d47180456..23cc2d9cf0 100644 --- a/deployment/neutron/neutron-compute-plugin-nuage.yaml +++ b/deployment/neutron/neutron-compute-plugin-nuage.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/neutron/neutron-controller-plugin-nuage.yaml b/deployment/neutron/neutron-controller-plugin-nuage.yaml index 2e30b2150b..03d8acbc0b 100644 --- a/deployment/neutron/neutron-controller-plugin-nuage.yaml +++ b/deployment/neutron/neutron-controller-plugin-nuage.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/neutron/neutron-dhcp-container-puppet.yaml b/deployment/neutron/neutron-dhcp-container-puppet.yaml index 373815e1a6..3bc2cb5c81 100644 --- a/deployment/neutron/neutron-dhcp-container-puppet.yaml +++ b/deployment/neutron/neutron-dhcp-container-puppet.yaml @@ -62,9 +62,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -183,7 +180,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/neutron/neutron-l2gw-agent-baremetal-puppet.yaml b/deployment/neutron/neutron-l2gw-agent-baremetal-puppet.yaml index a570559646..14a22e7a37 100644 --- a/deployment/neutron/neutron-l2gw-agent-baremetal-puppet.yaml +++ b/deployment/neutron/neutron-l2gw-agent-baremetal-puppet.yaml @@ -17,9 +17,6 @@ parameters: type: boolean default: false description: Set to True to enable debugging on all services. - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/neutron/neutron-l2gw-api-container-puppet.yaml b/deployment/neutron/neutron-l2gw-api-container-puppet.yaml index 5ac0c6f7cf..a13110a72b 100644 --- a/deployment/neutron/neutron-l2gw-api-container-puppet.yaml +++ b/deployment/neutron/neutron-l2gw-api-container-puppet.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/neutron/neutron-l3-compute-dvr.yaml b/deployment/neutron/neutron-l3-compute-dvr.yaml index 99a081d4ad..0505b8540f 100644 --- a/deployment/neutron/neutron-l3-compute-dvr.yaml +++ b/deployment/neutron/neutron-l3-compute-dvr.yaml @@ -15,9 +15,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -48,7 +45,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/neutron/neutron-l3-container-puppet.yaml b/deployment/neutron/neutron-l3-container-puppet.yaml index b539a0d035..b7b2f86538 100644 --- a/deployment/neutron/neutron-l3-container-puppet.yaml +++ b/deployment/neutron/neutron-l3-container-puppet.yaml @@ -69,9 +69,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -151,7 +148,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/neutron/neutron-linuxbridge-agent-baremetal-puppet.yaml b/deployment/neutron/neutron-linuxbridge-agent-baremetal-puppet.yaml index 1492e84deb..3a0b9abaf1 100644 --- a/deployment/neutron/neutron-linuxbridge-agent-baremetal-puppet.yaml +++ b/deployment/neutron/neutron-linuxbridge-agent-baremetal-puppet.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json EndpointMap: default: {} description: Mapping of service endpoint -> protocol. Typically set @@ -62,7 +59,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} outputs: diff --git a/deployment/neutron/neutron-metadata-container-puppet.yaml b/deployment/neutron/neutron-metadata-container-puppet.yaml index 28cb1811c1..12fe4a0525 100644 --- a/deployment/neutron/neutron-metadata-container-puppet.yaml +++ b/deployment/neutron/neutron-metadata-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json EndpointMap: default: {} description: Mapping of service endpoint -> protocol. Typically set @@ -94,7 +91,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/neutron/neutron-mlnx-agent-container-puppet.yaml b/deployment/neutron/neutron-mlnx-agent-container-puppet.yaml index c391d7eb60..a4604a7249 100644 --- a/deployment/neutron/neutron-mlnx-agent-container-puppet.yaml +++ b/deployment/neutron/neutron-mlnx-agent-container-puppet.yaml @@ -20,9 +20,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -88,7 +85,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/neutron/neutron-ovn-dpdk-config-container-puppet.yaml b/deployment/neutron/neutron-ovn-dpdk-config-container-puppet.yaml index 007c65390b..052f5f16f1 100644 --- a/deployment/neutron/neutron-ovn-dpdk-config-container-puppet.yaml +++ b/deployment/neutron/neutron-ovn-dpdk-config-container-puppet.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -56,7 +53,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml index 840b4c15a4..89fb781d5d 100644 --- a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml +++ b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml @@ -29,9 +29,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -181,7 +178,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml b/deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml index 2e459bdf9c..1d178d610e 100644 --- a/deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml +++ b/deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml @@ -17,9 +17,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -74,7 +71,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -84,7 +80,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml b/deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml index 279069fb53..9ab174bebe 100644 --- a/deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml +++ b/deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml @@ -22,8 +22,6 @@ parameters: ContainerNeutronConfigImage: description: The container image to use for the neutron config_volume type: string - DefaultPasswords: - type: json RoleName: default: '' description: Role name on which the service is applied @@ -49,7 +47,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} 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 8505537439..01996ab051 100644 --- a/deployment/neutron/neutron-plugin-ml2-cisco-vts-container-puppet.yaml +++ b/deployment/neutron/neutron-plugin-ml2-cisco-vts-container-puppet.yaml @@ -22,8 +22,6 @@ parameters: ContainerNeutronConfigImage: description: The container image to use for the neutron config_volume type: string - DefaultPasswords: - type: json RoleName: default: '' description: Role name on which the service is applied @@ -67,7 +65,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/neutron/neutron-plugin-ml2-container-puppet.yaml b/deployment/neutron/neutron-plugin-ml2-container-puppet.yaml index 233d259cf7..d19b0808b9 100644 --- a/deployment/neutron/neutron-plugin-ml2-container-puppet.yaml +++ b/deployment/neutron/neutron-plugin-ml2-container-puppet.yaml @@ -22,8 +22,6 @@ parameters: ContainerNeutronConfigImage: description: The container image to use for the neutron config_volume type: string - DefaultPasswords: - type: json RoleName: default: '' description: Role name on which the service is applied @@ -45,7 +43,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} 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 c2f88474b8..e7072f2344 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 @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -69,7 +66,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/neutron/neutron-plugin-ml2-nuage.yaml b/deployment/neutron/neutron-plugin-ml2-nuage.yaml index eb8678fd05..ee6718d01f 100644 --- a/deployment/neutron/neutron-plugin-ml2-nuage.yaml +++ b/deployment/neutron/neutron-plugin-ml2-nuage.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -89,7 +86,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/neutron/neutron-plugin-ml2-ovn.yaml b/deployment/neutron/neutron-plugin-ml2-ovn.yaml index 53eabaeae0..248f069ea2 100644 --- a/deployment/neutron/neutron-plugin-ml2-ovn.yaml +++ b/deployment/neutron/neutron-plugin-ml2-ovn.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -122,7 +119,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/neutron/neutron-plugin-ml2.yaml b/deployment/neutron/neutron-plugin-ml2.yaml index 3f77e4c5c0..3eadacdd8a 100644 --- a/deployment/neutron/neutron-plugin-ml2.yaml +++ b/deployment/neutron/neutron-plugin-ml2.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -128,7 +125,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/neutron/neutron-plugin-nsx-container-puppet.yaml b/deployment/neutron/neutron-plugin-nsx-container-puppet.yaml index 9afc9c4cb3..08f0003bed 100644 --- a/deployment/neutron/neutron-plugin-nsx-container-puppet.yaml +++ b/deployment/neutron/neutron-plugin-nsx-container-puppet.yaml @@ -22,8 +22,6 @@ parameters: ContainerNeutronConfigImage: description: The container image to use for the neutron config_volume type: string - DefaultPasswords: - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/neutron/neutron-plugin-nuage.yaml b/deployment/neutron/neutron-plugin-nuage.yaml index 24ea066ffe..995e076bd3 100644 --- a/deployment/neutron/neutron-plugin-nuage.yaml +++ b/deployment/neutron/neutron-plugin-nuage.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -74,7 +71,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/neutron/neutron-sfc-api-container-puppet.yaml b/deployment/neutron/neutron-sfc-api-container-puppet.yaml index 9e80507adf..cc107bb248 100644 --- a/deployment/neutron/neutron-sfc-api-container-puppet.yaml +++ b/deployment/neutron/neutron-sfc-api-container-puppet.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/neutron/neutron-sriov-agent-container-puppet.yaml b/deployment/neutron/neutron-sriov-agent-container-puppet.yaml index 627f9b1532..c45e2e9099 100644 --- a/deployment/neutron/neutron-sriov-agent-container-puppet.yaml +++ b/deployment/neutron/neutron-sriov-agent-container-puppet.yaml @@ -24,9 +24,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -128,7 +125,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/neutron/neutron-vpp-agent-baremetal-puppet.yaml b/deployment/neutron/neutron-vpp-agent-baremetal-puppet.yaml index 5ae4cc6a24..7ca37a04e2 100644 --- a/deployment/neutron/neutron-vpp-agent-baremetal-puppet.yaml +++ b/deployment/neutron/neutron-vpp-agent-baremetal-puppet.yaml @@ -15,9 +15,6 @@ parameters: parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -45,7 +42,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} outputs: diff --git a/deployment/nova/nova-api-container-puppet.yaml b/deployment/nova/nova-api-container-puppet.yaml index 4bbe21f6c2..09ca9ac7ea 100644 --- a/deployment/nova/nova-api-container-puppet.yaml +++ b/deployment/nova/nova-api-container-puppet.yaml @@ -30,9 +30,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -140,7 +137,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -151,7 +147,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -161,7 +156,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -171,7 +165,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/nova/nova-apidb-client-puppet.yaml b/deployment/nova/nova-apidb-client-puppet.yaml index 604a677fc4..01fd0ee634 100644 --- a/deployment/nova/nova-apidb-client-puppet.yaml +++ b/deployment/nova/nova-apidb-client-puppet.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/nova/nova-az-config.yaml b/deployment/nova/nova-az-config.yaml index b923c484f9..0f8cae64c4 100644 --- a/deployment/nova/nova-az-config.yaml +++ b/deployment/nova/nova-az-config.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/nova/nova-base-puppet.yaml b/deployment/nova/nova-base-puppet.yaml index b557764af8..213342e7d1 100644 --- a/deployment/nova/nova-base-puppet.yaml +++ b/deployment/nova/nova-base-puppet.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/nova/nova-compute-common-container-puppet.yaml b/deployment/nova/nova-compute-common-container-puppet.yaml index f6dd0b1060..aac6182192 100644 --- a/deployment/nova/nova-compute-common-container-puppet.yaml +++ b/deployment/nova/nova-compute-common-container-puppet.yaml @@ -21,9 +21,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml index 9ecdf94e72..716cbeccf7 100644 --- a/deployment/nova/nova-compute-container-puppet.yaml +++ b/deployment/nova/nova-compute-container-puppet.yaml @@ -29,9 +29,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -595,7 +592,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -611,7 +607,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/nova/nova-conductor-container-puppet.yaml b/deployment/nova/nova-conductor-container-puppet.yaml index c215cd68bc..5aef55cfa1 100644 --- a/deployment/nova/nova-conductor-container-puppet.yaml +++ b/deployment/nova/nova-conductor-container-puppet.yaml @@ -30,9 +30,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -86,7 +83,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -96,7 +92,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -106,7 +101,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/nova/nova-db-client-puppet.yaml b/deployment/nova/nova-db-client-puppet.yaml index db16a4e857..0502a061ff 100644 --- a/deployment/nova/nova-db-client-puppet.yaml +++ b/deployment/nova/nova-db-client-puppet.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/nova/nova-ironic-container-puppet.yaml b/deployment/nova/nova-ironic-container-puppet.yaml index 5bd4a9c9ae..f51ad6dd75 100644 --- a/deployment/nova/nova-ironic-container-puppet.yaml +++ b/deployment/nova/nova-ironic-container-puppet.yaml @@ -20,9 +20,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -88,7 +85,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -98,7 +94,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/nova/nova-libvirt-container-puppet.yaml b/deployment/nova/nova-libvirt-container-puppet.yaml index 11aee1fd05..759df0e9c8 100644 --- a/deployment/nova/nova-libvirt-container-puppet.yaml +++ b/deployment/nova/nova-libvirt-container-puppet.yaml @@ -31,9 +31,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -383,7 +380,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/nova/nova-libvirt-guests-container-puppet.yaml b/deployment/nova/nova-libvirt-guests-container-puppet.yaml index b9d264d2a7..7f006a704b 100644 --- a/deployment/nova/nova-libvirt-guests-container-puppet.yaml +++ b/deployment/nova/nova-libvirt-guests-container-puppet.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json EndpointMap: default: {} description: Mapping of service endpoint -> protocol. Typically set diff --git a/deployment/nova/nova-manager-container-puppet.yaml b/deployment/nova/nova-manager-container-puppet.yaml index 4cbecce147..379d756672 100644 --- a/deployment/nova/nova-manager-container-puppet.yaml +++ b/deployment/nova/nova-manager-container-puppet.yaml @@ -22,9 +22,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -52,7 +49,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/nova/nova-metadata-container-puppet.yaml b/deployment/nova/nova-metadata-container-puppet.yaml index bee6a46873..91266db84f 100644 --- a/deployment/nova/nova-metadata-container-puppet.yaml +++ b/deployment/nova/nova-metadata-container-puppet.yaml @@ -30,9 +30,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -99,7 +96,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -110,7 +106,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -120,7 +115,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -130,7 +124,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/nova/nova-migration-target-container-puppet.yaml b/deployment/nova/nova-migration-target-container-puppet.yaml index c1b8a99d06..d05c55d618 100644 --- a/deployment/nova/nova-migration-target-container-puppet.yaml +++ b/deployment/nova/nova-migration-target-container-puppet.yaml @@ -20,9 +20,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -71,7 +68,6 @@ resources: properties: EndpointMap: {get_param: EndpointMap} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/nova/nova-scheduler-container-puppet.yaml b/deployment/nova/nova-scheduler-container-puppet.yaml index 6e0cc2f343..08606507b7 100644 --- a/deployment/nova/nova-scheduler-container-puppet.yaml +++ b/deployment/nova/nova-scheduler-container-puppet.yaml @@ -30,9 +30,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -160,7 +157,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -170,7 +166,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -180,7 +175,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/nova/nova-vnc-proxy-container-puppet.yaml b/deployment/nova/nova-vnc-proxy-container-puppet.yaml index 36cfb1ce0b..a5234fff07 100644 --- a/deployment/nova/nova-vnc-proxy-container-puppet.yaml +++ b/deployment/nova/nova-vnc-proxy-container-puppet.yaml @@ -34,9 +34,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -155,7 +152,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -165,7 +161,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/octavia/octavia-api-container-puppet.yaml b/deployment/octavia/octavia-api-container-puppet.yaml index 8ab146c722..8e4a948b25 100644 --- a/deployment/octavia/octavia-api-container-puppet.yaml +++ b/deployment/octavia/octavia-api-container-puppet.yaml @@ -30,9 +30,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -111,7 +108,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -121,7 +117,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -131,7 +126,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/octavia/octavia-base.yaml b/deployment/octavia/octavia-base.yaml index 0f79b7ca47..95cb8a78d7 100644 --- a/deployment/octavia/octavia-base.yaml +++ b/deployment/octavia/octavia-base.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/octavia/octavia-deployment-config.j2.yaml b/deployment/octavia/octavia-deployment-config.j2.yaml index f6b96f0bb5..dc47a3168f 100644 --- a/deployment/octavia/octavia-deployment-config.j2.yaml +++ b/deployment/octavia/octavia-deployment-config.j2.yaml @@ -18,9 +18,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/octavia/octavia-health-manager-container-puppet.yaml b/deployment/octavia/octavia-health-manager-container-puppet.yaml index 6ce3b5d1e1..d1b419aa05 100644 --- a/deployment/octavia/octavia-health-manager-container-puppet.yaml +++ b/deployment/octavia/octavia-health-manager-container-puppet.yaml @@ -33,9 +33,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -82,7 +79,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/octavia/octavia-housekeeping-container-puppet.yaml b/deployment/octavia/octavia-housekeeping-container-puppet.yaml index e171847018..efbd0b596c 100644 --- a/deployment/octavia/octavia-housekeeping-container-puppet.yaml +++ b/deployment/octavia/octavia-housekeeping-container-puppet.yaml @@ -30,9 +30,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -69,7 +66,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/octavia/octavia-worker-container-puppet.yaml b/deployment/octavia/octavia-worker-container-puppet.yaml index a4b2520c3b..53ad788d78 100644 --- a/deployment/octavia/octavia-worker-container-puppet.yaml +++ b/deployment/octavia/octavia-worker-container-puppet.yaml @@ -30,9 +30,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -63,7 +60,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/octavia/providers/ovn-provider-config.yaml b/deployment/octavia/providers/ovn-provider-config.yaml index c0d7e0dce4..50237548a1 100644 --- a/deployment/octavia/providers/ovn-provider-config.yaml +++ b/deployment/octavia/providers/ovn-provider-config.yaml @@ -16,9 +16,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/openvswitch/openvswitch-dpdk-baremetal-ansible.yaml b/deployment/openvswitch/openvswitch-dpdk-baremetal-ansible.yaml index 77c32db069..29c6dad7db 100644 --- a/deployment/openvswitch/openvswitch-dpdk-baremetal-ansible.yaml +++ b/deployment/openvswitch/openvswitch-dpdk-baremetal-ansible.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -150,7 +147,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/openvswitch/openvswitch-dpdk-netcontrold-container-ansible.yaml b/deployment/openvswitch/openvswitch-dpdk-netcontrold-container-ansible.yaml index 67254d9fc5..96cadb4230 100644 --- a/deployment/openvswitch/openvswitch-dpdk-netcontrold-container-ansible.yaml +++ b/deployment/openvswitch/openvswitch-dpdk-netcontrold-container-ansible.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/ovn/ovn-controller-container-puppet.yaml b/deployment/ovn/ovn-controller-container-puppet.yaml index 18b2f49a65..7a017715d4 100644 --- a/deployment/ovn/ovn-controller-container-puppet.yaml +++ b/deployment/ovn/ovn-controller-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: ContainerOvnControllerConfigImage: description: The container image to use for the ovn_controller config_volume type: string - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/ovn/ovn-dbs-container-puppet.yaml b/deployment/ovn/ovn-dbs-container-puppet.yaml index bfe3244ebb..0afdd6f6b4 100644 --- a/deployment/ovn/ovn-dbs-container-puppet.yaml +++ b/deployment/ovn/ovn-dbs-container-puppet.yaml @@ -28,9 +28,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml index 37b1ee93f5..1abb68b28a 100644 --- a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml +++ b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml @@ -39,9 +39,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -127,7 +124,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} OVNNorthboundServerPort: {get_param: OVNNorthboundServerPort} diff --git a/deployment/ovn/ovn-metadata-container-puppet.yaml b/deployment/ovn/ovn-metadata-container-puppet.yaml index bbb2fbfd8a..4c0d6dc6ed 100644 --- a/deployment/ovn/ovn-metadata-container-puppet.yaml +++ b/deployment/ovn/ovn-metadata-container-puppet.yaml @@ -43,9 +43,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json EndpointMap: default: {} description: Mapping of service endpoint -> protocol. Typically set @@ -152,7 +149,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/pacemaker/clustercheck-container-puppet.yaml b/deployment/pacemaker/clustercheck-container-puppet.yaml index 466877040d..4baa11b883 100644 --- a/deployment/pacemaker/clustercheck-container-puppet.yaml +++ b/deployment/pacemaker/clustercheck-container-puppet.yaml @@ -27,9 +27,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -50,7 +47,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/pacemaker/compute-instanceha-baremetal-puppet.yaml b/deployment/pacemaker/compute-instanceha-baremetal-puppet.yaml index 0cbaa16c64..cce042e83e 100644 --- a/deployment/pacemaker/compute-instanceha-baremetal-puppet.yaml +++ b/deployment/pacemaker/compute-instanceha-baremetal-puppet.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/pacemaker/ovn-dbs-baremetal-puppet.yaml b/deployment/pacemaker/ovn-dbs-baremetal-puppet.yaml index b0f192354a..16d79ff2ab 100644 --- a/deployment/pacemaker/ovn-dbs-baremetal-puppet.yaml +++ b/deployment/pacemaker/ovn-dbs-baremetal-puppet.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -46,7 +43,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/pacemaker/pacemaker-baremetal-puppet.yaml b/deployment/pacemaker/pacemaker-baremetal-puppet.yaml index 447706960e..20fabfb4e6 100644 --- a/deployment/pacemaker/pacemaker-baremetal-puppet.yaml +++ b/deployment/pacemaker/pacemaker-baremetal-puppet.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -171,13 +168,7 @@ outputs: tripleo::fencing::config: {get_param: FencingConfig} tripleo::fencing::deep_compare: true enable_fencing: {get_param: EnableFencing} - hacluster_pwd: - yaql: - expression: $.data.passwords.where($ != '').first() - data: - passwords: - - {get_param: PcsdPassword} - - {get_param: [DefaultPasswords, pcsd_password]} + hacluster_pwd: {get_param: PcsdPassword} tripleo::profile::base::pacemaker::remote_authkey: {get_param: PacemakerRemoteAuthkey} tripleo::profile::base::pacemaker::pcsd_bind_addr: str_replace: diff --git a/deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml b/deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml index aa235dfbb4..68482d4424 100644 --- a/deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml +++ b/deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -107,13 +104,7 @@ outputs: params: $NETWORK: {get_param: [ServiceNetMap, PacemakerRemoteNetwork]} pacemaker::corosync::manage_fw: false - hacluster_pwd: - yaql: - expression: $.data.passwords.where($ != '').first() - data: - passwords: - - {get_param: PcsdPassword} - - {get_param: [DefaultPasswords, pcsd_password]} + hacluster_pwd: {get_param: PcsdPassword} service_config_settings: rsyslog: tripleo_logging_sources_pacemaker_remote: diff --git a/deployment/placement/placement-api-container-puppet.yaml b/deployment/placement/placement-api-container-puppet.yaml index ac0dec621a..ba3951f222 100644 --- a/deployment/placement/placement-api-container-puppet.yaml +++ b/deployment/placement/placement-api-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json EnableSQLAlchemyCollectd: type: boolean description: > @@ -96,7 +93,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/podman/podman-baremetal-ansible.yaml b/deployment/podman/podman-baremetal-ansible.yaml index 1fa8534d7c..90c2a21529 100644 --- a/deployment/podman/podman-baremetal-ansible.yaml +++ b/deployment/podman/podman-baremetal-ansible.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/qdr/qdrouterd-container-puppet.yaml b/deployment/qdr/qdrouterd-container-puppet.yaml index 59a5732abf..a0173bd268 100644 --- a/deployment/qdr/qdrouterd-container-puppet.yaml +++ b/deployment/qdr/qdrouterd-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/rabbitmq/rabbitmq-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-container-puppet.yaml index bad00938e5..809856db12 100644 --- a/deployment/rabbitmq/rabbitmq-container-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -117,11 +114,6 @@ parameter_groups: conditions: internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]} - rabbit_cookie_param_set: - not: - equals: - - {get_param: RabbitCookie} - - '' is_ipv6: equals: - {get_param: [ServiceData, net_ip_version_map, {get_param: [ServiceNetMap, RabbitmqNetwork]}]} @@ -179,13 +171,7 @@ outputs: rabbitmq_config_variables: cluster_partition_handling: 'ignore' queue_master_locator: '<<"min-masters">>' - rabbitmq::erlang_cookie: - yaql: - expression: $.data.passwords.where($ != '').first() - data: - passwords: - - {get_param: RabbitCookie} - - {get_param: [DefaultPasswords, rabbit_cookie]} + rabbitmq::erlang_cookie: {get_param: RabbitCookie} # NOTE: bind IP is found in hiera replacing the network name with the # local node IP for the given network; replacement examples # (eg. for internal_api): @@ -320,11 +306,7 @@ outputs: # NOTE: this should force this container to re-run on each # update (scale-out, etc.) TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier} - RABBITMQ_CLUSTER_COOKIE: - if: - - rabbit_cookie_param_set - - {get_param: RabbitCookie} - - {get_param: [DefaultPasswords, rabbit_cookie]} + RABBITMQ_CLUSTER_COOKIE: {get_param: RabbitCookie} rabbitmq: start_order: 2 diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml index e165671b7b..b3eef238d3 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -79,11 +76,6 @@ parameters: conditions: internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]} - rabbit_cookie_param_set: - not: - equals: - - {get_param: RabbitCookie} - - '' key_size_override_unset: {equals: [{get_param: RabbitmqMessageCertificateKeySize}, '']} resources: @@ -96,7 +88,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -250,11 +241,7 @@ outputs: # NOTE: this should force this container to re-run on each # update (scale-out, etc.) TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier} - RABBITMQ_CLUSTER_COOKIE: - if: - - rabbit_cookie_param_set - - {get_param: RabbitCookie} - - {get_param: [DefaultPasswords, rabbit_cookie]} + RABBITMQ_CLUSTER_COOKIE: {get_param: RabbitCookie} rabbitmq: start_order: 2 stop_grace_period: 60 diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml index 9bd3c2c644..52b15a5cc1 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml @@ -39,9 +39,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RabbitCookie: type: string default: '' @@ -76,11 +73,6 @@ conditions: docker_enabled: {equals: [{get_param: ContainerCli}, 'docker']} common_tag_enabled: {equals: [{get_param: ClusterCommonTag}, true]} common_tag_full: {equals: [{get_param: ClusterFullTag}, true]} - rabbit_cookie_param_set: - not: - equals: - - {get_param: RabbitCookie} - - '' resources: @@ -93,7 +85,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -199,11 +190,7 @@ outputs: # NOTE: this should force this container to re-run on each # update (scale-out, etc.) TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier} - RABBITMQ_CLUSTER_COOKIE: - if: - - rabbit_cookie_param_set - - {get_param: RabbitCookie} - - {get_param: [DefaultPasswords, rabbit_cookie]} + RABBITMQ_CLUSTER_COOKIE: {get_param: RabbitCookie} step_2: rabbitmq_wait_bundle: start_order: 0 diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml index 4262459ead..e54e8837ea 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml @@ -19,9 +19,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml index f929b971e9..e4ab4ac0c7 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml @@ -39,9 +39,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RabbitCookie: type: string default: '' @@ -76,11 +73,6 @@ conditions: docker_enabled: {equals: [{get_param: ContainerCli}, 'docker']} common_tag_enabled: {equals: [{get_param: ClusterCommonTag}, true]} common_tag_full: {equals: [{get_param: ClusterFullTag}, true]} - rabbit_cookie_param_set: - not: - equals: - - {get_param: RabbitCookie} - - '' resources: @@ -92,7 +84,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -199,11 +190,7 @@ outputs: # NOTE: this should force this container to re-run on each # update (scale-out, etc.) TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier} - RABBITMQ_CLUSTER_COOKIE: - if: - - rabbit_cookie_param_set - - {get_param: RabbitCookie} - - {get_param: [DefaultPasswords, rabbit_cookie]} + RABBITMQ_CLUSTER_COOKIE: {get_param: RabbitCookie} step_2: rabbitmq_wait_bundle: start_order: 0 diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml index 439e3425e6..ec8278d07f 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -80,11 +77,6 @@ parameters: conditions: internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]} - rabbit_cookie_param_set: - not: - equals: - - {get_param: RabbitCookie} - - '' key_size_override_unset: {equals: [{get_param: RpcCertificateKeySize}, '']} resources: @@ -97,7 +89,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -250,11 +241,7 @@ outputs: # NOTE: this should force this container to re-run on each # update (scale-out, etc.) TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier} - RABBITMQ_CLUSTER_COOKIE: - if: - - rabbit_cookie_param_set - - {get_param: RabbitCookie} - - {get_param: [DefaultPasswords, rabbit_cookie]} + RABBITMQ_CLUSTER_COOKIE: {get_param: RabbitCookie} rabbitmq: start_order: 2 stop_grace_period: 60 diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml index 8dff3bfe3f..a05e87e297 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml @@ -39,9 +39,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RabbitCookie: type: string default: '' @@ -76,11 +73,6 @@ conditions: docker_enabled: {equals: [{get_param: ContainerCli}, 'docker']} common_tag_enabled: {equals: [{get_param: ClusterCommonTag}, true]} common_tag_full: {equals: [{get_param: ClusterFullTag}, true]} - rabbit_cookie_param_set: - not: - equals: - - {get_param: RabbitCookie} - - '' resources: @@ -93,7 +85,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -199,11 +190,7 @@ outputs: # NOTE: this should force this container to re-run on each # update (scale-out, etc.) TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier} - RABBITMQ_CLUSTER_COOKIE: - if: - - rabbit_cookie_param_set - - {get_param: RabbitCookie} - - {get_param: [DefaultPasswords, rabbit_cookie]} + RABBITMQ_CLUSTER_COOKIE: {get_param: RabbitCookie} step_2: rabbitmq_wait_bundle: start_order: 0 @@ -232,11 +219,7 @@ outputs: # NOTE: this should force this container to re-run on each # update (scale-out, etc.) TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier} - RABBITMQ_CLUSTER_COOKIE: - if: - - rabbit_cookie_param_set - - {get_param: RabbitCookie} - - {get_param: [DefaultPasswords, rabbit_cookie]} + RABBITMQ_CLUSTER_COOKIE: {get_param: RabbitCookie} metadata_settings: get_attr: [RabbitmqBase, role_data, metadata_settings] host_prep_tasks: diff --git a/deployment/rhsm/rhsm-baremetal-ansible.yaml b/deployment/rhsm/rhsm-baremetal-ansible.yaml index 2140d9da35..cdd441642a 100644 --- a/deployment/rhsm/rhsm-baremetal-ansible.yaml +++ b/deployment/rhsm/rhsm-baremetal-ansible.yaml @@ -16,9 +16,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/securetty/securetty-baremetal-ansible.yaml b/deployment/securetty/securetty-baremetal-ansible.yaml index 2fbe5f821e..565beaea07 100644 --- a/deployment/securetty/securetty-baremetal-ansible.yaml +++ b/deployment/securetty/securetty-baremetal-ansible.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/snmp/snmp-baremetal-puppet.yaml b/deployment/snmp/snmp-baremetal-puppet.yaml index f775d39f22..fa577a5e0b 100644 --- a/deployment/snmp/snmp-baremetal-puppet.yaml +++ b/deployment/snmp/snmp-baremetal-puppet.yaml @@ -16,9 +16,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/sshd/sshd-baremetal-ansible.yaml b/deployment/sshd/sshd-baremetal-ansible.yaml index 1a0859163a..ca7df64974 100644 --- a/deployment/sshd/sshd-baremetal-ansible.yaml +++ b/deployment/sshd/sshd-baremetal-ansible.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/sshd/sshd-baremetal-puppet.yaml b/deployment/sshd/sshd-baremetal-puppet.yaml index c712528194..dd2982cce1 100644 --- a/deployment/sshd/sshd-baremetal-puppet.yaml +++ b/deployment/sshd/sshd-baremetal-puppet.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/swift/external-swift-proxy-baremetal-puppet.yaml b/deployment/swift/external-swift-proxy-baremetal-puppet.yaml index 67fd4c80d0..d5ed823063 100644 --- a/deployment/swift/external-swift-proxy-baremetal-puppet.yaml +++ b/deployment/swift/external-swift-proxy-baremetal-puppet.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/swift/swift-base.yaml b/deployment/swift/swift-base.yaml index dd04691a72..24d99b861d 100644 --- a/deployment/swift/swift-base.yaml +++ b/deployment/swift/swift-base.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/swift/swift-dispersion-baremetal-puppet.yaml b/deployment/swift/swift-dispersion-baremetal-puppet.yaml index 5fb9488e20..087a83b4d1 100644 --- a/deployment/swift/swift-dispersion-baremetal-puppet.yaml +++ b/deployment/swift/swift-dispersion-baremetal-puppet.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/swift/swift-proxy-container-puppet.yaml b/deployment/swift/swift-proxy-container-puppet.yaml index 61520f03a8..badf960112 100644 --- a/deployment/swift/swift-proxy-container-puppet.yaml +++ b/deployment/swift/swift-proxy-container-puppet.yaml @@ -25,9 +25,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -108,7 +105,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -117,7 +113,6 @@ resources: properties: ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} EnableInternalTLS: {get_param: EnableInternalTLS} diff --git a/deployment/swift/swift-ringbuilder-container-puppet.yaml b/deployment/swift/swift-ringbuilder-container-puppet.yaml index 49c16d8dc4..ecacc0e3cf 100644 --- a/deployment/swift/swift-ringbuilder-container-puppet.yaml +++ b/deployment/swift/swift-ringbuilder-container-puppet.yaml @@ -17,9 +17,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/swift/swift-storage-container-puppet.yaml b/deployment/swift/swift-storage-container-puppet.yaml index 088815a644..420431419e 100644 --- a/deployment/swift/swift-storage-container-puppet.yaml +++ b/deployment/swift/swift-storage-container-puppet.yaml @@ -24,9 +24,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied @@ -125,7 +122,6 @@ resources: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} diff --git a/deployment/tests/test-container-volume.yaml b/deployment/tests/test-container-volume.yaml index d69e0912a3..83a0e8a7d9 100644 --- a/deployment/tests/test-container-volume.yaml +++ b/deployment/tests/test-container-volume.yaml @@ -19,9 +19,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/time/ptp-baremetal-ansible.yaml b/deployment/time/ptp-baremetal-ansible.yaml index 441ac3752c..f6b09047dd 100644 --- a/deployment/time/ptp-baremetal-ansible.yaml +++ b/deployment/time/ptp-baremetal-ansible.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/time/timezone-baremetal-ansible.yaml b/deployment/time/timezone-baremetal-ansible.yaml index 3080c7c75d..44f6b08679 100644 --- a/deployment/time/timezone-baremetal-ansible.yaml +++ b/deployment/time/timezone-baremetal-ansible.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/timesync/chrony-baremetal-ansible.yaml b/deployment/timesync/chrony-baremetal-ansible.yaml index 5ef31fe5e2..afd5d53813 100644 --- a/deployment/timesync/chrony-baremetal-ansible.yaml +++ b/deployment/timesync/chrony-baremetal-ansible.yaml @@ -17,9 +17,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/tls/undercloud-remove-novajoin.yaml b/deployment/tls/undercloud-remove-novajoin.yaml index 6231b7bad2..0f37bbbd7a 100644 --- a/deployment/tls/undercloud-remove-novajoin.yaml +++ b/deployment/tls/undercloud-remove-novajoin.yaml @@ -16,9 +16,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/tls/undercloud-tls.yaml b/deployment/tls/undercloud-tls.yaml index 7e32c95987..e245054616 100644 --- a/deployment/tls/undercloud-tls.yaml +++ b/deployment/tls/undercloud-tls.yaml @@ -16,9 +16,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/tripleo-firewall/tripleo-firewall-baremetal-ansible.yaml b/deployment/tripleo-firewall/tripleo-firewall-baremetal-ansible.yaml index ad97cd512e..0bb0500de1 100644 --- a/deployment/tripleo-firewall/tripleo-firewall-baremetal-ansible.yaml +++ b/deployment/tripleo-firewall/tripleo-firewall-baremetal-ansible.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml index 4264d1fb62..2e0bb999b7 100644 --- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml +++ b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/tuned/tuned-baremetal-ansible.yaml b/deployment/tuned/tuned-baremetal-ansible.yaml index b1e959e750..f27885bd08 100644 --- a/deployment/tuned/tuned-baremetal-ansible.yaml +++ b/deployment/tuned/tuned-baremetal-ansible.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json EndpointMap: default: {} description: Mapping of service endpoint -> protocol. Typically set diff --git a/deployment/undercloud/minion-rabbitmq-puppet.yaml b/deployment/undercloud/minion-rabbitmq-puppet.yaml index d88db0e85e..9d549ab6e8 100644 --- a/deployment/undercloud/minion-rabbitmq-puppet.yaml +++ b/deployment/undercloud/minion-rabbitmq-puppet.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/undercloud/tempest-container-puppet.yaml b/deployment/undercloud/tempest-container-puppet.yaml index e3ec85dbc7..6e4b7634c5 100644 --- a/deployment/undercloud/tempest-container-puppet.yaml +++ b/deployment/undercloud/tempest-container-puppet.yaml @@ -22,9 +22,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/undercloud/undercloud-upgrade.yaml b/deployment/undercloud/undercloud-upgrade.yaml index 177ecc9245..8a0569f120 100644 --- a/deployment/undercloud/undercloud-upgrade.yaml +++ b/deployment/undercloud/undercloud-upgrade.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/validations/tripleo-validations-baremetal-ansible.yaml b/deployment/validations/tripleo-validations-baremetal-ansible.yaml index 0d7a57f3c8..5cfc927d20 100644 --- a/deployment/validations/tripleo-validations-baremetal-ansible.yaml +++ b/deployment/validations/tripleo-validations-baremetal-ansible.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/veritas-hyperscale/veritas-hyperscale-controller-baremetal-puppet.yaml b/deployment/veritas-hyperscale/veritas-hyperscale-controller-baremetal-puppet.yaml index cf59e9dc58..c6f648d22f 100644 --- a/deployment/veritas-hyperscale/veritas-hyperscale-controller-baremetal-puppet.yaml +++ b/deployment/veritas-hyperscale/veritas-hyperscale-controller-baremetal-puppet.yaml @@ -64,9 +64,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/deployment/vpp/vpp-baremetal-puppet.yaml b/deployment/vpp/vpp-baremetal-puppet.yaml index 157058c399..e061aae4fc 100644 --- a/deployment/vpp/vpp-baremetal-puppet.yaml +++ b/deployment/vpp/vpp-baremetal-puppet.yaml @@ -14,9 +14,6 @@ parameters: via parameter_defaults in the resource registry. This mapping overrides those in ServiceNetMapDefaults. type: json - DefaultPasswords: - default: {} - type: json RoleName: default: '' description: Role name on which the service is applied diff --git a/environments/overcloud-baremetal.j2.yaml b/environments/overcloud-baremetal.j2.yaml index 93191a7bcd..4f0bcb26d5 100644 --- a/environments/overcloud-baremetal.j2.yaml +++ b/environments/overcloud-baremetal.j2.yaml @@ -1,8 +1,6 @@ resource_registry: OS::TripleO::AllNodes::SoftwareConfig: OS::Heat::None OS::TripleO::PostDeploySteps: OS::Heat::None - OS::TripleO::DefaultPasswords: OS::Heat::None - OS::TripleO::RandomString: OS::Heat::None OS::TripleO::AllNodesDeployment: OS::Heat::None OS::TripleO::DeployedServerEnvironment: ../deployed-server/deployed-server-environment-output.yaml diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 18c0793376..fe61c0147b 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -5,8 +5,8 @@ resource_registry: OS::Heat::StructuredDeployment: config-download-structured.yaml OS::TripleO::PostDeploySteps: common/post.yaml OS::TripleO::AllNodesDeployment: OS::Heat::None - OS::TripleO::DefaultPasswords: default_passwords.yaml - OS::TripleO::RandomString: OS::Heat::RandomString + OS::TripleO::DefaultPasswords: OS::Heat::None + OS::TripleO::RandomString: OS::Heat::None {% for role in roles %} OS::TripleO::{{role.name}}PostDeploySteps: common/post.yaml diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml index 71ff650e11..56f86ad7cc 100644 --- a/overcloud.j2.yaml +++ b/overcloud.j2.yaml @@ -540,19 +540,6 @@ resources: {%- endif %} {%- endfor %} - HeatAuthEncryptionKey: - type: OS::TripleO::RandomString - - PcsdPassword: - type: OS::TripleO::RandomString - properties: - length: 16 - - HorizonSecret: - type: OS::TripleO::RandomString - properties: - length: 64 - NetCidrMapValue: type: OS::Heat::Value properties: @@ -663,7 +650,6 @@ resources: net_vip_map: {get_attr: [VipMap, net_ip_map]} net_ip_version_map: {get_attr: [NetIpVersionMapValue, value]} EndpointMap: {get_attr: [EndpointMapData, value]} - DefaultPasswords: {get_attr: [DefaultPasswords, passwords]} RoleName: {{role.name}} RoleParameters: map_merge: @@ -960,26 +946,6 @@ resources: - get_attr: [{{role.name}}ServiceChainRoleData, value, global_config_settings] {% endfor %} - MysqlRootPassword: - type: OS::TripleO::RandomString - properties: - length: 10 - - RabbitCookie: - type: OS::TripleO::RandomString - properties: - length: 20 - salt: {get_param: RabbitCookieSalt} - - DefaultPasswords: - type: OS::TripleO::DefaultPasswords - properties: - DefaultMysqlRootPassword: {get_attr: [MysqlRootPassword, value]} - DefaultRabbitCookie: {get_attr: [RabbitCookie, value]} - DefaultHeatAuthEncryptionKey: {get_attr: [HeatAuthEncryptionKey, value]} - DefaultPcsdPassword: {get_attr: [PcsdPassword, value]} - DefaultHorizonSecret: {get_attr: [HorizonSecret, value]} - # creates the network architecture Networks: type: OS::TripleO::Network diff --git a/releasenotes/notes/remove-default-password-interface-55a4e85ef0ccef2f.yaml b/releasenotes/notes/remove-default-password-interface-55a4e85ef0ccef2f.yaml new file mode 100644 index 0000000000..8b7f810954 --- /dev/null +++ b/releasenotes/notes/remove-default-password-interface-55a4e85ef0ccef2f.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + The legacy DefaultPasswords interface to use passwords from heat + resources has been removed as we don't use it anymore. diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py index ef7df58296..cdc1d4bccc 100755 --- a/tools/yaml-validate.py +++ b/tools/yaml-validate.py @@ -37,8 +37,8 @@ valid_heat_template_versions = [ current_heat_template_version = valid_heat_template_versions[-1] -required_params = ['EndpointMap', 'ServiceNetMap', 'DefaultPasswords', - 'RoleName', 'RoleParameters', 'ServiceData'] +required_params = ['EndpointMap', 'ServiceNetMap', 'RoleName', + 'RoleParameters', 'ServiceData'] # NOTE(bnemec): The duplication in this list is intentional. For the # transition to generated environments we have two copies of these files, @@ -188,8 +188,6 @@ PARAMETER_DEFINITION_EXCLUSIONS = { 'server': ['description'], 'servers': ['description'], 'ExtraConfig': ['description'], - 'DefaultPasswords': ['description', - 'default'], 'BondInterfaceOvsOptions': ['description', 'default', 'constraints'], diff --git a/tripleo_heat_templates/environment_generator.py b/tripleo_heat_templates/environment_generator.py index 16ca8fedbc..d2044d04a6 100755 --- a/tripleo_heat_templates/environment_generator.py +++ b/tripleo_heat_templates/environment_generator.py @@ -46,7 +46,7 @@ _FILE_HEADER = ( _PARAMETERS = "parameters" # Certain parameter names can't be changed, but shouldn't be shown because # they are never intended for direct user input. -_PRIVATE_OVERRIDES = ['server', 'servers', 'NodeIndex', 'DefaultPasswords'] +_PRIVATE_OVERRIDES = ['server', 'servers', 'NodeIndex'] # Hidden params are not included by default when the 'all' option is used, # but can be explicitly included by referencing them in sample_defaults or # static. This allows us to generate sample environments using them when