diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index ba44bc0..7a73f01 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -217,18 +217,6 @@
                 type: string
                 description: Version of formulas for salt-master bootstrap
                 default: "{{formula_pkg_revision}}"
-              EXTRA_REPO:
-                type: string
-                description: Optional extra repository to run tests with
-                default: ''
-              EXTRA_REPO_PIN:
-                type: string
-                description: Optional extra repository pin definition
-                default: ''
-              EXTRA_REPO_PRIORITY:
-                type: string
-                description: Optional extra repository pin priority
-                default: ''
               # openstack api
               OPENSTACK_API_URL:
                 type: string
diff --git a/octavia/api/cluster.yml b/octavia/api/cluster.yml
index 75a4c19..958f3d4 100644
--- a/octavia/api/cluster.yml
+++ b/octavia/api/cluster.yml
@@ -2,8 +2,17 @@
 - service.octavia.api.cluster
 - system.haproxy.proxy.listen.openstack.octavia
 parameters:
+  _param:
+    cluster_internal_protocol: 'http'
   octavia:
     api:
       enabled: true
       bind:
         address: ${_param:cluster_local_address}
+      database:
+        host: ${_param:openstack_database_address}
+      identity:
+        region: ${_param:openstack_region}
+        protocol: ${_param:cluster_internal_protocol}
+      message_queue:
+        host: ${_param:openstack_message_queue_address}
diff --git a/octavia/api/single.yml b/octavia/api/single.yml
index 685c4b4..a9d30a5 100644
--- a/octavia/api/single.yml
+++ b/octavia/api/single.yml
@@ -1,8 +1,17 @@
 classes:
 - service.octavia.api.single
 parameters:
+  _param:
+    internal_protocol: 'http'
   octavia:
     api:
       enabled: true
       bind:
         address: ${_param:single_address}
+      database:
+        host: ${_param:openstack_database_address}
+      identity:
+        region: ${_param:openstack_region}
+        protocol: ${_param:internal_protocol}
+      message_queue:
+        host: ${_param:openstack_message_queue_address}
diff --git a/octavia/manager/single.yml b/octavia/manager/single.yml
index acab136..6071764 100644
--- a/octavia/manager/single.yml
+++ b/octavia/manager/single.yml
@@ -1,6 +1,8 @@
 classes:
 - service.octavia.manager.single
 parameters:
+  _param:
+    internal_protocol: 'http'
   octavia:
     manager:
       enabled: true
@@ -9,3 +11,10 @@
         private_key: ${_param:octavia_private_key}
         user: octavia
         group: octavia
+      database:
+        host: ${_param:openstack_database_address}
+      identity:
+        region: ${_param:openstack_region}
+        protocol: ${_param:internal_protocol}
+      message_queue:
+        host: ${_param:openstack_message_queue_address}