diff --git a/deployment/aodh/aodh-api-container-puppet.yaml b/deployment/aodh/aodh-api-container-puppet.yaml index 3755cc9112..b0d1d6dea9 100644 --- a/deployment/aodh/aodh-api-container-puppet.yaml +++ b/deployment/aodh/aodh-api-container-puppet.yaml @@ -52,10 +52,6 @@ parameters: e.g. { aodh-context_is_admin: { key: context_is_admin, value: 'role:admin' } } default: {} type: json - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean conditions: @@ -235,16 +231,6 @@ outputs: Log files from aodh containers can be found under /var/log/containers/aodh and /var/log/containers/httpd/aodh-api. ignore_errors: true - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-aodh-api package - set_fact: - remove_aodh_api_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-aodh-api package if operator requests it - package: name=openstack-aodh-api state=removed - ignore_errors: True - when: remove_aodh_api_package|bool metadata_settings: get_attr: [ApacheServiceBase, role_data, metadata_settings] post_upgrade_tasks: diff --git a/deployment/aodh/aodh-evaluator-container-puppet.yaml b/deployment/aodh/aodh-evaluator-container-puppet.yaml index 7f3b14ee33..7da57941b7 100644 --- a/deployment/aodh/aodh-evaluator-container-puppet.yaml +++ b/deployment/aodh/aodh-evaluator-container-puppet.yaml @@ -36,10 +36,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean MonitoringSubscriptionAodhEvaluator: default: 'overcloud-ceilometer-aodh-evaluator' type: string @@ -127,16 +123,6 @@ outputs: Log files from aodh containers can be found under /var/log/containers/aodh and /var/log/containers/httpd/aodh-api. ignore_errors: true - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-aodh-evaluator package - set_fact: - remove_aodh_evaluator_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-aodh-evaluator package if operator requests it - package: name=openstack-aodh-evaluator state=removed - ignore_errors: True - when: remove_aodh_evaluator_package|bool post_upgrade_tasks: - when: step|int == 1 import_role: diff --git a/deployment/aodh/aodh-listener-container-puppet.yaml b/deployment/aodh/aodh-listener-container-puppet.yaml index 88edb3c2dc..c2a02b063a 100644 --- a/deployment/aodh/aodh-listener-container-puppet.yaml +++ b/deployment/aodh/aodh-listener-container-puppet.yaml @@ -36,10 +36,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean MonitoringSubscriptionAodhListener: default: 'overcloud-ceilometer-aodh-listener' type: string @@ -135,16 +131,6 @@ outputs: Log files from aodh containers can be found under /var/log/containers/aodh and /var/log/containers/httpd/aodh-api. ignore_errors: true - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-aodh-listener package - set_fact: - remove_aodh_listener_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-aodh-listener package if operator requests it - package: name=openstack-aodh-listener state=removed - ignore_errors: True - when: remove_aodh_listener_package|bool post_upgrade_tasks: - when: step|int == 1 import_role: diff --git a/deployment/aodh/aodh-notifier-container-puppet.yaml b/deployment/aodh/aodh-notifier-container-puppet.yaml index 2e92b323fc..e730cb0ee7 100644 --- a/deployment/aodh/aodh-notifier-container-puppet.yaml +++ b/deployment/aodh/aodh-notifier-container-puppet.yaml @@ -36,10 +36,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean MonitoringSubscriptionAodhNotifier: default: 'overcloud-ceilometer-aodh-notifier' type: string @@ -135,16 +131,6 @@ outputs: Log files from aodh containers can be found under /var/log/containers/aodh and /var/log/containers/httpd/aodh-api. ignore_errors: true - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-aodh-notifier package - set_fact: - remove_aodh_notifier_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-aodh-notifier package if operator requests it - package: name=openstack-aodh-notifier state=removed - ignore_errors: True - when: remove_aodh_notifier_package|bool post_upgrade_tasks: - when: step|int == 1 import_role: diff --git a/deployment/barbican/barbican-api-container-puppet.yaml b/deployment/barbican/barbican-api-container-puppet.yaml index 508357f6fb..c1a7c08506 100644 --- a/deployment/barbican/barbican-api-container-puppet.yaml +++ b/deployment/barbican/barbican-api-container-puppet.yaml @@ -45,10 +45,6 @@ parameters: EnableInternalTLS: type: boolean default: false - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean BarbicanPkcs11CryptoATOSEnabled: type: boolean default: false @@ -776,16 +772,6 @@ outputs: name: virt_sandbox_use_netlink persistent: yes state: yes - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-barbican-api package - set_fact: - remove_barbican_api_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-barbican-api package if operator requests it - package: name=openstack-barbican-api state=removed - ignore_errors: True - when: remove_barbican_api_package|bool post_upgrade_tasks: - when: step|int == 1 import_role: diff --git a/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml index eed347eeba..9b4b0195b4 100644 --- a/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml @@ -41,10 +41,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean RedisPassword: description: The password for the redis service account. type: string @@ -165,16 +161,6 @@ outputs: Log files from ceilometer containers can be found under /var/log/containers/ceilometer. ignore_errors: true - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-ceilometer-central package - set_fact: - remove_ceilometer_central_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-ceilometer-central package if operator requests it - package: name=openstack-ceilometer-central state=removed - ignore_errors: True - when: remove_ceilometer_central_package|bool post_upgrade_tasks: - when: step|int == 1 import_role: diff --git a/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml index a17b16f2e1..0f2e6dc820 100644 --- a/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml @@ -36,10 +36,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean MonitoringSubscriptionCeilometerCompute: default: 'overcloud-ceilometer-agent-compute' type: string @@ -149,20 +145,6 @@ outputs: name: virt_sandbox_use_netlink persistent: yes state: yes - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-ceilometer-compute and polling package - set_fact: - remove_ceilometer_compute_polling_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-ceilometer-compute package if operator requests it - package: name=openstack-ceilometer-compute state=removed - ignore_errors: True - when: remove_ceilometer_compute_polling_package|bool - - name: Remove openstack-ceilometer-polling package if operator requests it - package: name=openstack-ceilometer-polling state=removed - ignore_errors: True - when: remove_ceilometer_compute_polling_package|bool post_upgrade_tasks: - when: step|int == 1 import_role: diff --git a/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml index 93a14c84b3..0131e742a3 100644 --- a/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml @@ -41,10 +41,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean RedisPassword: description: The password for the redis service account. type: string @@ -152,16 +148,6 @@ outputs: Log files from ceilometer containers can be found under /var/log/containers/ceilometer. ignore_errors: true - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-ceilometer-ipmi package - set_fact: - remove_ceilometer_ipmi_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-ceilometer-ipmi package if operator requests it - package: name=openstack-ceilometer-ipmi state=removed - ignore_errors: True - when: remove_ceilometer_ipmi_package|bool post_upgrade_tasks: - when: step|int == 1 import_role: diff --git a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml index 30de4cb663..c1d0c911c6 100644 --- a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml @@ -41,10 +41,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean CeilometerEnablePanko: default: true description: Check if panko need to be enabled or not. @@ -173,16 +169,6 @@ outputs: name: virt_sandbox_use_netlink persistent: yes state: yes - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-ceilometer-notification package - set_fact: - remove_ceilometer_notification_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-ceilometer-notification package if operator requests it - package: name=openstack-ceilometer-notification state=removed - ignore_errors: True - when: remove_ceilometer_notification_package|bool post_upgrade_tasks: - when: step|int == 1 import_role: diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml index 0d1b0deb2c..edb6c6f6cb 100644 --- a/deployment/cinder/cinder-api-container-puppet.yaml +++ b/deployment/cinder/cinder-api-container-puppet.yaml @@ -44,10 +44,6 @@ parameters: EnableInternalTLS: type: boolean default: false - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean CinderDefaultVolumeType: default: tripleo description: The name of Cinder's default volume type. @@ -372,15 +368,6 @@ outputs: fi tags: pre-upgrade when: is_cinder_api_bootstrap_node|bool - - when: step|int == 3 - block: - - name: Set fact for removal of httpd package - set_fact: - remove_httpd_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove httpd package if operator requests it - package: name=httpd state=removed - ignore_errors: True - when: remove_httpd_package|bool external_upgrade_tasks: - when: step|int == 1 block: diff --git a/deployment/cinder/cinder-backup-container-puppet.yaml b/deployment/cinder/cinder-backup-container-puppet.yaml index 8876f0e39f..818dd031b6 100644 --- a/deployment/cinder/cinder-backup-container-puppet.yaml +++ b/deployment/cinder/cinder-backup-container-puppet.yaml @@ -36,10 +36,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean CephClusterName: type: string default: ceph @@ -228,13 +224,3 @@ outputs: vars: containers_to_rm: - cinder_backup - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-cinder package - set_fact: - remove_cinder_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-cinder package if operator requests it - package: name=openstack-cinder state=removed - ignore_errors: True - when: remove_cinder_package|bool diff --git a/deployment/cinder/cinder-scheduler-container-puppet.yaml b/deployment/cinder/cinder-scheduler-container-puppet.yaml index c9ee329b87..dc27b91004 100644 --- a/deployment/cinder/cinder-scheduler-container-puppet.yaml +++ b/deployment/cinder/cinder-scheduler-container-puppet.yaml @@ -41,10 +41,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean MonitoringSubscriptionCinderScheduler: default: 'overcloud-cinder-scheduler' type: string @@ -163,16 +159,6 @@ outputs: name: virt_sandbox_use_netlink persistent: yes state: yes - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-cinder package - set_fact: - remove_cinder_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-cinder package if operator requests it - package: name=openstack-cinder state=removed - ignore_errors: True - when: remove_cinder_package|bool post_upgrade_tasks: - when: step|int == 1 import_role: diff --git a/deployment/cinder/cinder-volume-container-puppet.yaml b/deployment/cinder/cinder-volume-container-puppet.yaml index 2689954972..fa1b1e42c0 100644 --- a/deployment/cinder/cinder-volume-container-puppet.yaml +++ b/deployment/cinder/cinder-volume-container-puppet.yaml @@ -45,10 +45,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean CephClientUserName: default: openstack type: string @@ -322,16 +318,6 @@ outputs: volumes: {get_attr: [CinderCommon, cinder_volume_volumes]} environment: {get_attr: [CinderCommon, cinder_volume_environment]} host_prep_tasks: {get_attr: [CinderCommon, cinder_volume_host_prep_tasks]} - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-cinder package - set_fact: - remove_cinder_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-cinder package if operator requests it - package: name=openstack-cinder state=removed - ignore_errors: True - when: remove_cinder_package|bool post_upgrade_tasks: - when: step|int == 1 import_role: diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml index 3381569812..638b72246a 100644 --- a/deployment/glance/glance-api-container-puppet.yaml +++ b/deployment/glance/glance-api-container-puppet.yaml @@ -196,10 +196,6 @@ parameters: type: string constraints: - allowed_values: ['swift', 'file', 'rbd', 'cinder'] - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean CephClientUserName: default: openstack type: string @@ -571,16 +567,6 @@ outputs: path: /var/lib/glance state: directory setype: svirt_sandbox_file_t - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-glance package - set_fact: - remove_glance_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-glance package if operator requests it - package: name=openstack-glance state=removed - ignore_errors: True - when: remove_glance_package|bool metadata_settings: get_attr: [TLSProxyBase, role_data, metadata_settings] post_upgrade_tasks: diff --git a/deployment/haproxy/haproxy-container-puppet.yaml b/deployment/haproxy/haproxy-container-puppet.yaml index eb9fee6ed5..ba51051bf1 100644 --- a/deployment/haproxy/haproxy-container-puppet.yaml +++ b/deployment/haproxy/haproxy-container-puppet.yaml @@ -91,10 +91,6 @@ parameters: default: false description: Whether to run config management (e.g. Puppet) in debug mode. type: boolean - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean EnableLoadBalancer: default: true description: Whether to deploy a LoadBalancer, set to false when an external load balancer is used. @@ -314,15 +310,6 @@ outputs: state: directory setype: var_log_t recurse: yes - - when: step|int == 3 - block: - - name: Set fact for removal of HAproxy package - set_fact: - remove_haproxy_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove HAproxy package if operator requests it - package: name=haproxy state=removed - ignore_errors: True - when: remove_haproxy_package|bool post_upgrade_tasks: - when: step|int == 1 import_role: diff --git a/deployment/ironic/ironic-api-container-puppet.yaml b/deployment/ironic/ironic-api-container-puppet.yaml index b8823b1f51..4db783dc86 100644 --- a/deployment/ironic/ironic-api-container-puppet.yaml +++ b/deployment/ironic/ironic-api-container-puppet.yaml @@ -36,10 +36,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean IronicPassword: description: The password for the Ironic service and db account, used by the Ironic services type: string @@ -286,15 +282,6 @@ outputs: fi tags: pre-upgrade when: is_ironic_api_bootstrap_node|bool - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-ironic-api package - set_fact: - remove_ironic_api_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-ironic-api package if operator requests it - package: name=openstack-ironic-api state=removed - ignore_errors: True - when: remove_ironic_api_package|bool external_upgrade_tasks: - when: step|int == 1 block: diff --git a/deployment/ironic/ironic-conductor-container-puppet.yaml b/deployment/ironic/ironic-conductor-container-puppet.yaml index bdf70c0444..3282385f2e 100644 --- a/deployment/ironic/ironic-conductor-container-puppet.yaml +++ b/deployment/ironic/ironic-conductor-container-puppet.yaml @@ -226,10 +226,6 @@ parameters: default: [] description: List of additional architectures to enable. type: comma_delimited_list - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean conditions: default_deploy_interface_unset: {equals : [{get_param: IronicDefaultDeployInterface}, '']} @@ -586,16 +582,6 @@ outputs: with_items: - httpboot - tftpboot - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-ironic-conductor package - set_fact: - remove_ironic_conductor_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-ironic-conductor package if operator requests it - package: name=openstack-ironic-conductor state=removed - ignore_errors: True - when: remove_ironic_conductor_package|bool post_upgrade_tasks: - when: step|int == 1 import_role: diff --git a/deployment/ironic/ironic-inspector-container-puppet.yaml b/deployment/ironic/ironic-inspector-container-puppet.yaml index aa3ecb1bd2..96864aa8ef 100644 --- a/deployment/ironic/ironic-inspector-container-puppet.yaml +++ b/deployment/ironic/ironic-inspector-container-puppet.yaml @@ -40,10 +40,6 @@ parameters: default: [] description: IPA image URLs, the format should be ["http://path/to/kernel", "http://path/to/ramdisk"] type: json - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean MonitoringSubscriptionIronicInspector: default: 'overcloud-ironic-inspector' type: string @@ -463,16 +459,6 @@ outputs: path: /var/lib/ironic-inspector/dhcp-hostsdir state: directory setype: svirt_sandbox_file_t - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-ironic-inspector package - set_fact: - remove_ironic_inspector_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-ironic-inspector package if operator requests it - package: name=openstack-ironic-inspector state=removed - ignore_errors: True - when: remove_ironic_inspector_package|bool post_upgrade_tasks: - when: step|int == 1 import_role: diff --git a/deployment/ironic/ironic-pxe-container-puppet.yaml b/deployment/ironic/ironic-pxe-container-puppet.yaml index 796135bb8c..22904e563b 100644 --- a/deployment/ironic/ironic-pxe-container-puppet.yaml +++ b/deployment/ironic/ironic-pxe-container-puppet.yaml @@ -36,10 +36,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean resources: @@ -108,17 +104,6 @@ outputs: name: xinetd state: restarted when: xinetd_active_result.rc == 0 - - when: step|int == 3 - block: - - name: Set fact for removal of tftp-server package - set_fact: - remove_tftp_server: {get_param: UpgradeRemoveUnusedPackages} - - name: remove tftp-server if requested - ignore_errors: True - when: remove_tftp_server|bool - package: - name: tftp-server - state: removed docker_config: step_4: ironic_pxe_tftp: diff --git a/deployment/keepalived/keepalived-container-puppet.yaml b/deployment/keepalived/keepalived-container-puppet.yaml index 9652a2aa3d..4985c7e944 100644 --- a/deployment/keepalived/keepalived-container-puppet.yaml +++ b/deployment/keepalived/keepalived-container-puppet.yaml @@ -36,10 +36,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean # TODO(emilien) Remove when Keepalived 2.0.6 is out # https://bugs.launchpad.net/tripleo/+bug/1791238 KeepalivedRestart: @@ -162,16 +158,6 @@ outputs: Log files from keepalived containers can be found under /var/log/containers/keepalived. ignore_errors: true - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of Keepalived package - set_fact: - remove_keepalived_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove Keepalived package if operator requests it - package: name=keepalived state=removed - ignore_errors: True - when: remove_keepalived_package|bool post_upgrade_tasks: - when: step|int == 1 import_role: diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml index b9deb3df6e..229c9f355f 100644 --- a/deployment/keystone/keystone-container-puppet.yaml +++ b/deployment/keystone/keystone-container-puppet.yaml @@ -49,10 +49,6 @@ parameters: EnableInternalTLS: type: boolean default: false - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean KeystoneEnableDBPurge: default: true description: | @@ -800,16 +796,6 @@ outputs: step_config: 'include ::tripleo::profile::base::keystone' config_image: *keystone_config_image host_prep_tasks: {get_attr: [KeystoneLogging, host_prep_tasks]} - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-keystone package - set_fact: - remove_keystone_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-keystone package if operator requests it - package: name=openstack-keystone state=removed - ignore_errors: True - when: remove_keystone_package|bool metadata_settings: get_attr: [ApacheServiceBase, role_data, metadata_settings] post_upgrade_tasks: diff --git a/deployment/metrics/collectd-container-puppet.yaml b/deployment/metrics/collectd-container-puppet.yaml index 4912ae6719..12e6243f9f 100644 --- a/deployment/metrics/collectd-container-puppet.yaml +++ b/deployment/metrics/collectd-container-puppet.yaml @@ -36,10 +36,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean GnocchiPassword: type: string description: The password for the gnocchi service and db account. @@ -508,16 +504,6 @@ outputs: Log files from collectd containers can be found under /var/log/containers/collectd. ignore_errors: true - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of collectd package - set_fact: - remove_collectd_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove collectd package if operator requests it - package: name=collectd state=removed - ignore_errors: True - when: remove_collectd_package|bool fast_forward_upgrade_tasks: - when: - step|int == 0 diff --git a/deployment/mistral/mistral-api-container-puppet.yaml b/deployment/mistral/mistral-api-container-puppet.yaml index 24464ea150..805787b19e 100644 --- a/deployment/mistral/mistral-api-container-puppet.yaml +++ b/deployment/mistral/mistral-api-container-puppet.yaml @@ -36,10 +36,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean MistralWorkers: default: 1 description: The number of workers for the mistral-api. @@ -235,16 +231,6 @@ outputs: Log files from mistral containers can be found under /var/log/containers/mistral. ignore_errors: true - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-mistral-api package - set_fact: - remove_mistral_api_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-mistral-api package if operator requests it - package: name=openstack-mistral-api state=removed - ignore_errors: True - when: remove_mistral_api_package|bool post_upgrade_tasks: - when: step|int == 1 import_role: diff --git a/deployment/mistral/mistral-engine-container-puppet.yaml b/deployment/mistral/mistral-engine-container-puppet.yaml index 31106e1a03..22251a0747 100644 --- a/deployment/mistral/mistral-engine-container-puppet.yaml +++ b/deployment/mistral/mistral-engine-container-puppet.yaml @@ -36,10 +36,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean MistralExecutionFieldSizeLimit: default: 1024 description: The default maximum size in KB of large text fields of runtime @@ -168,16 +164,6 @@ outputs: name: virt_sandbox_use_netlink persistent: yes state: yes - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-mistral-engine package - set_fact: - remove_mistral_engine_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-mistral-engine package if operator requests it - package: name=openstack-mistral-engine state=removed - ignore_errors: True - when: remove_mistral_engine_package|bool post_upgrade_tasks: - when: step|int == 1 import_role: diff --git a/deployment/mistral/mistral-event-engine-container-puppet.yaml b/deployment/mistral/mistral-event-engine-container-puppet.yaml index d5d5a3c970..497a32b69d 100644 --- a/deployment/mistral/mistral-event-engine-container-puppet.yaml +++ b/deployment/mistral/mistral-event-engine-container-puppet.yaml @@ -36,10 +36,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean RpcPort: default: 5672 description: The network port for messaging backend @@ -143,16 +139,6 @@ outputs: name: virt_sandbox_use_netlink persistent: yes state: yes - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-mistral-event-engine package - set_fact: - remove_mistral_event_engine_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-mistral-event-engine package if operator requests it - package: name=openstack-mistral-event-engine state=removed - ignore_errors: True - when: remove_mistral_event_engine_package|bool post_upgrade_tasks: - when: step|int == 1 import_role: diff --git a/deployment/mistral/mistral-executor-container-puppet.yaml b/deployment/mistral/mistral-executor-container-puppet.yaml index 802f84e991..2ecf9cfbfe 100644 --- a/deployment/mistral/mistral-executor-container-puppet.yaml +++ b/deployment/mistral/mistral-executor-container-puppet.yaml @@ -40,10 +40,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean MistralExecutorVolumes: default: [] description: List of additional volumes to mount into the mistral-executor container @@ -250,16 +246,6 @@ outputs: name: virt_sandbox_use_netlink persistent: yes state: yes - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-mistral-executor package - set_fact: - remove_mistral_executor_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-mistral-executor package if operator requests it - package: name=openstack-mistral-executor state=removed - ignore_errors: True - when: remove_mistral_executor_package|bool post_upgrade_tasks: - when: step|int == 1 import_role: diff --git a/deployment/neutron/neutron-api-container-puppet.yaml b/deployment/neutron/neutron-api-container-puppet.yaml index 5eb16ce173..1bac40baaf 100644 --- a/deployment/neutron/neutron-api-container-puppet.yaml +++ b/deployment/neutron/neutron-api-container-puppet.yaml @@ -44,10 +44,6 @@ parameters: EnableInternalTLS: type: boolean default: false - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean NeutronApiOptVolumes: default: [] description: list of optional volumes to be mounted @@ -401,16 +397,6 @@ outputs: - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS - {} host_prep_tasks: {get_attr: [NeutronLogging, host_prep_tasks]} - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-neutron package - set_fact: - remove_neutron_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-neutron package if operator requests it - package: name=openstack-neutron state=removed - ignore_errors: True - when: remove_neutron_package|bool metadata_settings: get_attr: [TLSProxyBase, role_data, metadata_settings] post_upgrade_tasks: diff --git a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml index 026b082915..28533953f8 100644 --- a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml +++ b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml @@ -45,10 +45,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean DockerPuppetMountHostPuppet: type: boolean default: true @@ -356,16 +352,6 @@ outputs: shell: | iptables -t raw -nL ip6tables -t raw -nL - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-neutron-openvswitch package - set_fact: - remove_neutron_openvswitch_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-neutron-openvswitch package if operator requests it - package: name=openstack-neutron-openvswitch state=removed - ignore_errors: True - when: remove_neutron_openvswitch_package|bool update_tasks: # puppetlabs-firewall manages security rules via Puppet but make the rules # consistent by default. Since Neutron also creates some rules, we don't diff --git a/deployment/nova/nova-api-container-puppet.yaml b/deployment/nova/nova-api-container-puppet.yaml index 2358bbc823..3aa08ac0a9 100644 --- a/deployment/nova/nova-api-container-puppet.yaml +++ b/deployment/nova/nova-api-container-puppet.yaml @@ -48,10 +48,6 @@ parameters: default: 300 description: Timeout for Nova db sync type: number - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean NovaPassword: description: The password for the nova service and db account type: string @@ -479,16 +475,6 @@ outputs: fi tags: pre-upgrade when: is_nova_api_bootstrap_node|bool - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-nova-api package - set_fact: - remove_nova_api_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-nova-api package if operator requests it - package: name=openstack-nova-api state=removed - ignore_errors: True - when: - - remove_nova_api_package|bool external_upgrade_tasks: - when: step|int == 1 block: diff --git a/deployment/nova/nova-conductor-container-puppet.yaml b/deployment/nova/nova-conductor-container-puppet.yaml index 6a09218ce7..ce86d76c05 100644 --- a/deployment/nova/nova-conductor-container-puppet.yaml +++ b/deployment/nova/nova-conductor-container-puppet.yaml @@ -41,10 +41,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean NovaWorkers: default: 0 description: Number of workers for Nova services. @@ -203,16 +199,6 @@ outputs: name: virt_sandbox_use_netlink persistent: yes state: yes - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-nova-conductor package - set_fact: - remove_nova_conductor_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-nova-conductor package if operator requests it - package: name=openstack-nova-conductor state=removed - ignore_errors: True - when: remove_nova_conductor_package|bool post_upgrade_tasks: - when: step|int == 1 import_role: diff --git a/deployment/nova/nova-consoleauth-container-puppet.yaml b/deployment/nova/nova-consoleauth-container-puppet.yaml index 4e42dda60c..cc8474e376 100644 --- a/deployment/nova/nova-consoleauth-container-puppet.yaml +++ b/deployment/nova/nova-consoleauth-container-puppet.yaml @@ -41,10 +41,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean MonitoringSubscriptionNovaConsoleauth: default: 'overcloud-nova-consoleauth' type: string @@ -154,16 +150,6 @@ outputs: name: virt_sandbox_use_netlink persistent: yes state: yes - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-nova-console package - set_fact: - remove_nova_console_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-nova-console package if operator requests it - package: name=openstack-nova-console state=removed - ignore_errors: True - when: remove_nova_console_package|bool post_upgrade_tasks: - when: step|int == 1 import_role: diff --git a/deployment/nova/nova-ironic-container-puppet.yaml b/deployment/nova/nova-ironic-container-puppet.yaml index 7ada988d60..468a200327 100644 --- a/deployment/nova/nova-ironic-container-puppet.yaml +++ b/deployment/nova/nova-ironic-container-puppet.yaml @@ -36,10 +36,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean IronicPassword: description: The password for the Ironic service and db account, used by the Ironic services type: string @@ -198,16 +194,6 @@ outputs: name: virt_sandbox_use_netlink persistent: yes state: yes - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-nova-compute package - set_fact: - remove_nova_compute_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-nova-compute package if operator requests it - package: name=openstack-nova-compute state=removed - ignore_errors: True - when: remove_nova_compute_package|bool post_upgrade_tasks: - when: step|int == 1 import_role: diff --git a/deployment/nova/nova-placement-container-puppet.yaml b/deployment/nova/nova-placement-container-puppet.yaml index cc99d585bc..65dd8cd72b 100644 --- a/deployment/nova/nova-placement-container-puppet.yaml +++ b/deployment/nova/nova-placement-container-puppet.yaml @@ -44,10 +44,6 @@ parameters: EnableInternalTLS: type: boolean default: false - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean NovaWorkers: default: 0 description: Number of workers for Nova services. @@ -235,16 +231,6 @@ outputs: path: /var/lib/nova state: directory setype: svirt_sandbox_file_t - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of httpd package - set_fact: - remove_httpd_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove httpd package if operator requests it - package: name=httpd state=removed - ignore_errors: True - when: remove_httpd_package|bool post_upgrade_tasks: - when: step|int == 1 import_role: diff --git a/deployment/nova/nova-scheduler-container-puppet.yaml b/deployment/nova/nova-scheduler-container-puppet.yaml index b040b78d0b..3876dc4a96 100644 --- a/deployment/nova/nova-scheduler-container-puppet.yaml +++ b/deployment/nova/nova-scheduler-container-puppet.yaml @@ -41,10 +41,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean NovaSchedulerAvailableFilters: default: [] description: List of scheduler available filters @@ -193,16 +189,6 @@ outputs: name: virt_sandbox_use_netlink persistent: yes state: yes - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-nova-scheduler package - set_fact: - remove_nova_scheduler_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-nova-scheduler package if operator requests it - package: name=openstack-nova-scheduler state=removed - ignore_errors: True - when: remove_nova_scheduler_package|bool fast_forward_upgrade_tasks: - when: - step|int == 0 diff --git a/deployment/nova/nova-vnc-proxy-container-puppet.yaml b/deployment/nova/nova-vnc-proxy-container-puppet.yaml index e7f1f92af4..fa51f6903e 100644 --- a/deployment/nova/nova-vnc-proxy-container-puppet.yaml +++ b/deployment/nova/nova-vnc-proxy-container-puppet.yaml @@ -41,10 +41,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean EnableInternalTLS: type: boolean default: false @@ -289,16 +285,6 @@ outputs: type: node - null host_prep_tasks: {get_attr: [NovaLogging, host_prep_tasks]} - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-nova-novncproxy package - set_fact: - remove_nova_novncproxy_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-nova-novncproxy package if operator requests it - package: name=openstack-nova-novncproxy state=removed - ignore_errors: True - when: remove_nova_novncproxy_package|bool fast_forward_upgrade_tasks: - when: - step|int == 0 diff --git a/deployment/octavia/octavia-health-manager-container-puppet.yaml b/deployment/octavia/octavia-health-manager-container-puppet.yaml index 2c6571a0de..8962618487 100644 --- a/deployment/octavia/octavia-health-manager-container-puppet.yaml +++ b/deployment/octavia/octavia-health-manager-container-puppet.yaml @@ -41,10 +41,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean MonitoringSubscriptionOctaviaHealthManager: default: 'overcloud-octavia-health-manager' type: string @@ -176,16 +172,6 @@ outputs: Log files from octavia containers can be found under /var/log/containers/octavia and /var/log/containers/httpd/octavia-api. ignore_errors: true - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-octavia-health-manager package - set_fact: - remove_octavia_health_manager_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-octavia-health-manager package if operator requests it - package: name=openstack-octavia-health-manager state=removed - ignore_errors: True - when: remove_octavia_health_manager_package|bool post_upgrade_tasks: - when: step|int == 1 import_role: diff --git a/deployment/sahara/sahara-api-container-puppet.yaml b/deployment/sahara/sahara-api-container-puppet.yaml index a79c033f05..f997971bea 100644 --- a/deployment/sahara/sahara-api-container-puppet.yaml +++ b/deployment/sahara/sahara-api-container-puppet.yaml @@ -41,10 +41,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean SaharaPassword: description: The password for the sahara service account, used by sahara-api. type: string @@ -214,16 +210,6 @@ outputs: Log files from sahara containers can be found under /var/log/containers/sahara. ignore_errors: true - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-sahara-api package - set_fact: - remove_sahara_api_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-sahara-api package if operator requests it - package: name=openstack-sahara-api state=removed - ignore_errors: True - when: remove_sahara_api_package|bool post_upgrade_tasks: - when: step|int == 1 import_role: diff --git a/deployment/sahara/sahara-engine-container-puppet.yaml b/deployment/sahara/sahara-engine-container-puppet.yaml index 589de85aa2..fb82e55a32 100644 --- a/deployment/sahara/sahara-engine-container-puppet.yaml +++ b/deployment/sahara/sahara-engine-container-puppet.yaml @@ -41,10 +41,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean MonitoringSubscriptionSaharaEngine: default: 'overcloud-sahara-engine' type: string @@ -156,16 +152,6 @@ outputs: name: virt_sandbox_use_netlink persistent: yes state: yes - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-sahara-engine package - set_fact: - remove_sahara_engine_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-sahara-engine package if operator requests it - package: name=openstack-sahara-engine state=removed - ignore_errors: True - when: remove_sahara_engine_package|bool post_upgrade_tasks: - when: step|int == 1 import_role: diff --git a/deployment/swift/swift-proxy-container-puppet.yaml b/deployment/swift/swift-proxy-container-puppet.yaml index 736eb6f511..311b2fcd47 100644 --- a/deployment/swift/swift-proxy-container-puppet.yaml +++ b/deployment/swift/swift-proxy-container-puppet.yaml @@ -40,10 +40,6 @@ parameters: description: Set to True to enable data-at-rest encryption in Swift default: false type: boolean - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean DeployIdentifier: default: '' type: string @@ -486,16 +482,6 @@ outputs: when: - logconfig is changed when: rsyslog_config.rc == 0 - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-swift-proxy package - set_fact: - remove_swift_proxy_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-swift-proxy package if operator requests it - package: name=openstack-swift-proxy state=removed - ignore_errors: True - when: remove_swift_proxy_package|bool metadata_settings: get_attr: [TLSProxyBase, role_data, metadata_settings] post_upgrade_tasks: diff --git a/deployment/swift/swift-storage-container-puppet.yaml b/deployment/swift/swift-storage-container-puppet.yaml index 0f6c8ad7e6..31e6ae8e85 100644 --- a/deployment/swift/swift-storage-container-puppet.yaml +++ b/deployment/swift/swift-storage-container-puppet.yaml @@ -61,10 +61,6 @@ parameters: description: Set to True to enable Swift container sharder service default: false type: boolean - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean SwiftMountCheck: default: false description: Value of mount_check in Swift account/container/object -server.conf @@ -640,21 +636,6 @@ outputs: state: mounted with_items: "{{ swift_raw_disks }}" when: swift_raw_disks - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-swift-container,object,account package - set_fact: - remove_swift_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-swift-container,object,account packages if operator requests it - package: - name: - - openstack-swift-container - - openstack-swift-object - - openstack-swift-account - state: removed - ignore_errors: True - when: remove_swift_package|bool update_tasks: - name: Ensure rsyncd pid file is absent file: diff --git a/deployment/zaqar/zaqar-container-puppet.yaml b/deployment/zaqar/zaqar-container-puppet.yaml index be3a0ffa4f..8cd8767b67 100644 --- a/deployment/zaqar/zaqar-container-puppet.yaml +++ b/deployment/zaqar/zaqar-container-puppet.yaml @@ -36,10 +36,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean Debug: type: boolean description: Set to True to enable debugging on all services. @@ -360,16 +356,6 @@ outputs: Log files from zaqar containers can be found under /var/log/containers/zaqar and /var/log/containers/httpd/zaqar. ignore_errors: true - upgrade_tasks: - - when: step|int == 3 - block: - - name: Set fact for removal of openstack-zaqar package - set_fact: - remove_zaqar_package: {get_param: UpgradeRemoveUnusedPackages} - - name: Remove openstack-zaqar package if operator requests it - package: name=openstack-zaqar state=removed - ignore_errors: True - when: remove_zaqar_package|bool post_upgrade_tasks: - when: step|int == 1 import_role: diff --git a/docker/services/tempest.yaml b/docker/services/tempest.yaml index 3d15b084fb..9d7aa9a35f 100644 --- a/docker/services/tempest.yaml +++ b/docker/services/tempest.yaml @@ -33,10 +33,6 @@ parameters: default: {} description: Parameters specific to the role type: json - UpgradeRemoveUnusedPackages: - default: false - description: Remove package if the service is being disabled during upgrade - type: boolean outputs: role_data: diff --git a/environments/lifecycle/upgrade-converge.yaml b/environments/lifecycle/upgrade-converge.yaml index 4e69f91fd7..4a289b0d89 100644 --- a/environments/lifecycle/upgrade-converge.yaml +++ b/environments/lifecycle/upgrade-converge.yaml @@ -5,4 +5,3 @@ parameter_defaults: UpgradeLevelNovaCompute: '' UpgradeInitCommonCommand: '' UpgradeInitCommand: '' - UpgradeRemoveUnusedPackages: false diff --git a/environments/lifecycle/upgrade-prepare.yaml b/environments/lifecycle/upgrade-prepare.yaml index 7bd1d8578e..6b6da5292f 100644 --- a/environments/lifecycle/upgrade-prepare.yaml +++ b/environments/lifecycle/upgrade-prepare.yaml @@ -17,4 +17,3 @@ parameter_defaults: yum install -y ansible-pacemaker # Remove the element os-net-config config.json https://bugs.launchpad.net/tripleo/+bug/1758161/ rm /usr/libexec/os-apply-config/templates/etc/os-net-config/config.json || true - UpgradeRemoveUnusedPackages: false diff --git a/releasenotes/notes/remove-option-remove-unused-packages-on-upgrade-99bfd428dd52b4c9.yaml b/releasenotes/notes/remove-option-remove-unused-packages-on-upgrade-99bfd428dd52b4c9.yaml new file mode 100644 index 0000000000..f6508d238c --- /dev/null +++ b/releasenotes/notes/remove-option-remove-unused-packages-on-upgrade-99bfd428dd52b4c9.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - Removes UpgradeRemoveUnusedPackages parameter and some service + upgrade_tasks that use this parameter to remove any unused packages.