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/controller.yaml | |
| parent | aca397bcc74bd3e8e7926d4c9e18730e8dfd745a (diff) | |
| parent | 0df577c6f0acc672b53d470e4cfedb1d7d9c53d1 (diff) | |
Merge "Add tripleo-packages composable service"
Diffstat (limited to 'puppet/controller.yaml')
| -rw-r--r-- | puppet/controller.yaml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 801b99ba..c38057d9 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -254,10 +254,6 @@ parameters: MysqlVirtualIP: type: string default: '' - 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 @@ -537,7 +533,6 @@ resources: control_virtual_interface: {get_param: ControlVirtualInterface} public_virtual_interface: {get_param: PublicVirtualInterface} swift_hash_suffix: {get_param: SwiftHashSuffix} - enable_package_install: {get_param: EnablePackageInstall} enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]} swift_proxy_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftProxyNetwork]}]} swift_management_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftMgmtNetwork]}]} @@ -782,7 +777,6 @@ resources: tripleo::haproxy::haproxy_stats_user: {get_input: haproxy_stats_user} tripleo::haproxy::haproxy_stats_password: {get_input: haproxy_stats_password} tripleo::haproxy::redis_password: {get_input: redis_password} - tripleo::packages::enable_install: {get_input: enable_package_install} tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade} # Hook for site-specific additional pre-deployment config, e.g extra hieradata |