X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Foctavia-base.yaml;h=19dc5b47cec327a719050dc2460a44710bc08acb;hb=2cd3c412bf850c087564bcaf652d2c3dce77cab3;hp=b537a2bc4eb28f11e7060fb05530d03cddc6c20e;hpb=46aeff751500474a67854f9d407263c9b6dd4abf;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/octavia-base.yaml b/puppet/services/octavia-base.yaml
index b537a2bc..19dc5b47 100644
--- a/puppet/services/octavia-base.yaml
+++ b/puppet/services/octavia-base.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenStack Octavia base service. Shared for all Octavia services
@@ -13,6 +13,14 @@ parameters:
   DefaultPasswords:
     default: {}
     type: json
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -24,10 +32,10 @@ parameters:
     description: Set to True to enable debugging on all services.
   EnableConfigPurge:
     type: boolean
-    default: true
+    default: false
     description: >
-        Remove configuration that is not generated by TripleO. Setting
-        to false may result in configuration remnants after updates/upgrades.
+        Remove configuration that is not generated by TripleO. Used to avoid
+        configuration remnants after upgrades.
   RabbitPassword:
     description: The password for RabbitMQ
     type: string
@@ -56,7 +64,7 @@ outputs:
          octavia::debug: {get_param: Debug}
          octavia::purge_config: {get_param: EnableConfigPurge}
          octavia::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
-         tripleo::profile::base::octavia::rabbit_user: {get_param: RabbitUserName}
-         tripleo::profile::base::octavia::rabbit_password: {get_param: RabbitPassword}
-         tripleo::profile::base::octavia::rabbit_port: {get_param: RabbitClientPort}
+         octavia::rabbit_userid: {get_param: RabbitUserName}
+         octavia::rabbit_password: {get_param: RabbitPassword}
+         octavia::rabbit_port: {get_param: RabbitClientPort}