X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fcinder-storage.yaml;h=ef3f08fffc16474c862f3018e43dfa48e6cf7167;hb=c89097c20220bc2266872d7bb01cce28fa01793b;hp=30609f3dc61aae70b4d6291a9415e9d0f6b650b7;hpb=bacc2c6f6cb0b80bd39c4164e8487e583b6976ba;p=apex-tripleo-heat-templates.git

diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml
index 30609f3d..ef3f08ff 100644
--- a/puppet/cinder-storage.yaml
+++ b/puppet/cinder-storage.yaml
@@ -38,10 +38,6 @@ parameters:
     description: The user password for SNMPd with readonly rights running on all Overcloud nodes
     type: string
     hidden: true
-  EnablePackageInstall:
-    default: 'false'
-    description: Set to true to enable package installation via Puppet
-    type: boolean
   UpdateIdentifier:
     default: ''
     type: string
@@ -110,7 +106,7 @@ resources:
     properties:
       image:
         {get_param: BlockStorageImage}
-      flavor: {get_param: Flavor}
+      flavor: {get_param: OvercloudBlockStorageFlavor}
       key_name: {get_param: KeyName}
       networks:
         - network: ctlplane
@@ -238,19 +234,6 @@ resources:
       input_values:
         snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}
         snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
-        cinder_iscsi_ip_address:
-          str_replace:
-            template: "'IP'"
-            params:
-              IP:
-                get_attr:
-                  - NetIpMap
-                  - net_ip_map
-                  - str_replace:
-                      template: "NETWORK_uri"
-                      params:
-                        NETWORK: {get_param: [ServiceNetMap, CinderIscsiNetwork]}
-        enable_package_install: {get_param: EnablePackageInstall}
         enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
 
   # Map heat metadata into hiera datafiles
@@ -286,9 +269,6 @@ resources:
               mapped_data: {get_param: ExtraConfig}
             volume:
               mapped_data:
-                # Cinder
-                tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_ip_address: {get_input: cinder_iscsi_ip_address}
-                tripleo::packages::enable_install: {get_input: enable_package_install}
                 tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
                 snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name}
                 snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password}