diff options
author | Dan Prince <dprince@redhat.com> | 2016-08-15 15:11:38 -0400 |
---|---|---|
committer | Dan Prince <dprince@redhat.com> | 2016-08-17 08:25:37 -0400 |
commit | 0df577c6f0acc672b53d470e4cfedb1d7d9c53d1 (patch) | |
tree | ff4e657b7ee6fa592d12ac13d797cd84a359a289 /puppet/compute.yaml | |
parent | 0b2829480a299dcba6d5471a99ed76fb92ca31a6 (diff) |
Add tripleo-packages composable service
This creates a new service to help manage the puppet-tripleo
class that enables and disables package installation features.
NOTE: we can't move the upgrade setting into the new composable
service yet due to coupling with the UpgradeDeployment resources.
Change-Id: If35cf6a6f023e12ae8ebbc2d9929d244eb3ffa3a
Diffstat (limited to 'puppet/compute.yaml')
-rw-r--r-- | puppet/compute.yaml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/puppet/compute.yaml b/puppet/compute.yaml index bd2eee18..c6dc94d6 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -57,10 +57,6 @@ parameters: NovaPublicIP: type: string default: '' # Has to be here because of the ignored empty value bug - EnablePackageInstall: - default: 'false' - description: Set to true to enable package installation via Puppet - type: boolean ServiceNetMap: default: {} description: Mapping of service_name -> network name. Typically set @@ -297,7 +293,6 @@ resources: nova::compute::vncserver_proxyclient_address: {get_input: nova_vnc_proxyclient_address} neutron::agents::ml2::ovs::local_ip: {get_input: neutron_local_ip} - tripleo::packages::enable_install: {get_input: enable_package_install} tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade} NovaComputeDeployment: @@ -312,7 +307,6 @@ resources: nova_api_host: {get_param: NovaApiHost} nova_vnc_proxyclient_address: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NovaVncProxyNetwork]}]} neutron_local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronTenantNetwork]}]} - enable_package_install: {get_param: EnablePackageInstall} enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]} # Resource for site-specific injection of root certificate |