add rabbit_host, rabbit_user, and rabbit_password to controller Tosca object
diff --git a/xos/tosca/custom_types/xos.m4 b/xos/tosca/custom_types/xos.m4
index 039b433..e125150 100644
--- a/xos/tosca/custom_types/xos.m4
+++ b/xos/tosca/custom_types/xos.m4
@@ -491,6 +491,18 @@
type: string
required: false
description: OpenStack domain (or "Default")
+ rabbit_host:
+ type: string
+ required: false
+ description: Rabbit host
+ rabbit_user:
+ type: string
+ required: false
+ description: Rabbit user
+ rabbit_password:
+ type: string
+ required: false
+ description: Rabbit password
tosca.nodes.Site:
derived_from: tosca.nodes.Root
diff --git a/xos/tosca/custom_types/xos.yaml b/xos/tosca/custom_types/xos.yaml
index 3cbe4b2..24be6af 100644
--- a/xos/tosca/custom_types/xos.yaml
+++ b/xos/tosca/custom_types/xos.yaml
@@ -641,6 +641,18 @@
type: string
required: false
description: OpenStack domain (or "Default")
+ rabbit_host:
+ type: string
+ required: false
+ description: Rabbit host
+ rabbit_user:
+ type: string
+ required: false
+ description: Rabbit user
+ rabbit_password:
+ type: string
+ required: false
+ description: Rabbit password
tosca.nodes.Site:
derived_from: tosca.nodes.Root
diff --git a/xos/tosca/resources/controller.py b/xos/tosca/resources/controller.py
index 9a20ea5..2aa208c 100644
--- a/xos/tosca/resources/controller.py
+++ b/xos/tosca/resources/controller.py
@@ -15,7 +15,7 @@
class XOSController(XOSResource):
provides = "tosca.nodes.Controller"
xos_model = Controller
- copyin_props = ["backend_type", "version", "auth_url", "admin_user", "admin_password", "admin_tenant", "domain"]
+ copyin_props = ["backend_type", "version", "auth_url", "admin_user", "admin_password", "admin_tenant", "domain", "rabbit_host", "rabbit_user", "rabbit_password"]
def get_xos_args(self):
args = super(XOSController, self).get_xos_args()
diff --git a/xos/tosca/samples/new_site_deploy_slice.yaml b/xos/tosca/samples/new_site_deploy_slice.yaml
index 6ccadc1..5e36bcb 100644
--- a/xos/tosca/samples/new_site_deploy_slice.yaml
+++ b/xos/tosca/samples/new_site_deploy_slice.yaml
@@ -27,6 +27,9 @@
admin_password: letmeout
admin_tenant: 12345678
domain: mydomain
+ rabbit_host: rabhost
+ rabbit_user: rabuser
+ rabbit_password: rabpw
newsite:
type: tosca.nodes.Site