From 00a774f4f7161e48c50f2bd80016924f52d65732 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 13 Oct 2022 14:03:33 +0900 Subject: [PATCH] Enable package installation by default Now overcloud is always deployed using pre-provisioned nodes, and all deployment types(standalone, undercloud and overcloud) enables package installation. Thus we can update the default value of EnablePackageInstall instead of setting the parameter everytime. Change-Id: I5598f6d8ee82f0df2598dd0e48fbc16cdb426009 --- deployment/octavia/octavia-worker-container-puppet.yaml | 2 +- deployment/timemaster/timemaster-baremetal-ansible.yaml | 2 +- deployment/timesync/chrony-baremetal-ansible.yaml | 2 +- .../tripleo-packages/tripleo-packages-baremetal-puppet.yaml | 2 +- environments/deployed-server-environment.j2.yaml | 1 - environments/lifecycle/upgrade-prepare.yaml | 1 - environments/standalone/standalone-tripleo.yaml | 4 ---- environments/undercloud.yaml | 1 - overcloud-resource-registry-puppet.j2.yaml | 2 +- sample-env-generator/standalone.yaml | 4 ---- 10 files changed, 5 insertions(+), 16 deletions(-) diff --git a/deployment/octavia/octavia-worker-container-puppet.yaml b/deployment/octavia/octavia-worker-container-puppet.yaml index 2aa34002b0..822899437f 100644 --- a/deployment/octavia/octavia-worker-container-puppet.yaml +++ b/deployment/octavia/octavia-worker-container-puppet.yaml @@ -43,7 +43,7 @@ parameters: description: Parameters specific to the role type: json EnablePackageInstall: - default: 'false' + default: true description: Set to true to enable package installation at deploy time type: boolean MonitoringSubscriptionOctaviaWorker: diff --git a/deployment/timemaster/timemaster-baremetal-ansible.yaml b/deployment/timemaster/timemaster-baremetal-ansible.yaml index 1dc4047b84..7bee1f5d0e 100644 --- a/deployment/timemaster/timemaster-baremetal-ansible.yaml +++ b/deployment/timemaster/timemaster-baremetal-ansible.yaml @@ -79,7 +79,7 @@ parameters: constraints: - range: { min: 4, max: 17 } EnablePackageInstall: - default: 'false' + default: true description: Set to true to enable package installation at deploy time type: boolean ChronyAclRules: diff --git a/deployment/timesync/chrony-baremetal-ansible.yaml b/deployment/timesync/chrony-baremetal-ansible.yaml index 9712b3fb67..7c48bfd6ec 100644 --- a/deployment/timesync/chrony-baremetal-ansible.yaml +++ b/deployment/timesync/chrony-baremetal-ansible.yaml @@ -79,7 +79,7 @@ parameters: constraints: - range: { min: 4, max: 17 } EnablePackageInstall: - default: 'false' + default: true description: Set to true to enable package installation at deploy time type: boolean ChronyAclRules: diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml index 143cf38730..8625cdd23c 100644 --- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml +++ b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml @@ -28,7 +28,7 @@ parameters: via parameter_defaults in the resource registry. type: json EnablePackageInstall: - default: 'false' + default: true description: Set to true to enable package installation at deploy time type: boolean UpgradeLeappEnabled: diff --git a/environments/deployed-server-environment.j2.yaml b/environments/deployed-server-environment.j2.yaml index 4e040e5fcd..32b27606ef 100644 --- a/environments/deployed-server-environment.j2.yaml +++ b/environments/deployed-server-environment.j2.yaml @@ -2,7 +2,6 @@ resource_registry: OS::TripleO::DeployedServer::ControlPlanePort: OS::Neutron::Port parameter_defaults: - EnablePackageInstall: True {% for role in roles %} {{role.name}}NetworkConfigTemplate: 'templates/net_config_static_bridge.j2' {% endfor %} diff --git a/environments/lifecycle/upgrade-prepare.yaml b/environments/lifecycle/upgrade-prepare.yaml index da86d7c8a8..40cf494540 100644 --- a/environments/lifecycle/upgrade-prepare.yaml +++ b/environments/lifecycle/upgrade-prepare.yaml @@ -9,7 +9,6 @@ resource_registry: parameter_defaults: CephAnsiblePlaybook: default - EnablePackageInstall: true ServerDeletionPolicy: retain UpgradeLevelNovaCompute: auto UpgradeLeappToRemove: ['openvswitch2.11','ovn2.11'] diff --git a/environments/standalone/standalone-tripleo.yaml b/environments/standalone/standalone-tripleo.yaml index 75c6fede47..553b41e0de 100644 --- a/environments/standalone/standalone-tripleo.yaml +++ b/environments/standalone/standalone-tripleo.yaml @@ -32,10 +32,6 @@ parameter_defaults: # Type: comma_delimited_list DnsServers: [] - # Set to true to enable package installation at deploy time - # Type: boolean - EnablePackageInstall: True - # Allow to enable/disable safe networking defaults if os-net-config would fail to run with the provided config. # Type: boolean NetworkSafeDefaults: True diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml index ef139f4120..187f6e38c4 100644 --- a/environments/undercloud.yaml +++ b/environments/undercloud.yaml @@ -51,7 +51,6 @@ parameter_defaults: # ensure we enable ip_forward before docker gets run KernelIpForward: 1 KernelIpNonLocalBind: 1 - EnablePackageInstall: true UndercloudNetworkConfigUpdate: True NeutronTunnelTypes: [] NeutronBridgeMappings: ctlplane:br-ctlplane diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 2dd27f537e..5ca113e262 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -335,7 +335,7 @@ parameter_merge_strategies: parameter_defaults: NeutronMechanismDrivers: ovn ContainerCli: podman - EnablePackageInstall: false + EnablePackageInstall: true SoftwareConfigTransport: POLL_SERVER_HEAT OVNIntegrationBridge: br-int ExtraConfig: {} diff --git a/sample-env-generator/standalone.yaml b/sample-env-generator/standalone.yaml index 06a74a1e5e..133485b670 100644 --- a/sample-env-generator/standalone.yaml +++ b/sample-env-generator/standalone.yaml @@ -31,9 +31,6 @@ environments: deployment/timesync/chrony-baremetal-ansible.yaml: parameters: - NtpServer - deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml: - parameters: - - EnablePackageInstall deployment/sshd/sshd-baremetal-ansible.yaml: parameters: - SshFirewallAllowAll @@ -47,7 +44,6 @@ environments: - DnsServers sample_values: AddVipsToEtcHosts: false - EnablePackageInstall: true SwiftReplicas: 1 SshFirewallAllowAll: true StandaloneNetworkConfigTemplate: templates/standalone.j2