diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-18 09:29:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-18 09:29:35 +0000 |
| commit | f737847c33c4a518fcb9c5909ed077a2e3811b43 (patch) | |
| tree | 62350a185c38afb35f16a2930380590599fdece4 /puppet/compute.yaml | |
| parent | aca397bcc74bd3e8e7926d4c9e18730e8dfd745a (diff) | |
| parent | 0df577c6f0acc672b53d470e4cfedb1d7d9c53d1 (diff) | |
Merge "Add tripleo-packages composable service"
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 |