Merge "Test contrail lab after deployment by default"
diff --git a/aodh/server/cluster.yml b/aodh/server/cluster.yml
index 91ebe12..d1f6583 100644
--- a/aodh/server/cluster.yml
+++ b/aodh/server/cluster.yml
@@ -9,6 +9,7 @@
aodh:
server:
enabled: true
+ role: ${_param:openstack_node_role}
version: ${_param:aodh_version}
cluster: true
ttl: 86400
diff --git a/aodh/server/single.yml b/aodh/server/single.yml
index 6eec70e..b2a55a6 100644
--- a/aodh/server/single.yml
+++ b/aodh/server/single.yml
@@ -5,6 +5,7 @@
openstack_event_alarm_topic: alarm.all
aodh:
server:
+ role: ${_param:openstack_node_role}
region: ${_param:openstack_region}
event_alarm_topic: ${_param:openstack_event_alarm_topic}
identity:
diff --git a/galera/server/database/tacker.yml b/galera/server/database/tacker.yml
new file mode 100644
index 0000000..9cd76b5
--- /dev/null
+++ b/galera/server/database/tacker.yml
@@ -0,0 +1,19 @@
+parameters:
+ _param:
+ mysql_tacker_ssl_option: []
+ mysql:
+ server:
+ database:
+ tacker:
+ encoding: utf8
+ users:
+ - name: tacker
+ password: ${_param:mysql_tacker_password}
+ host: '%'
+ rights: all
+ ssl_option: ${_param:mysql_tacker_ssl_option}
+ - name: tacker
+ password: ${_param:mysql_tacker_password}
+ host: ${_param:cluster_local_address}
+ rights: all
+ ssl_option: ${_param:mysql_tacker_ssl_option}
diff --git a/keystone/client/service/tacker.yml b/keystone/client/service/tacker.yml
new file mode 100644
index 0000000..335bc6e
--- /dev/null
+++ b/keystone/client/service/tacker.yml
@@ -0,0 +1,34 @@
+parameters:
+ _param:
+ cluster_public_protocol: https
+ tacker_service_protocol: http
+ tacker_public_host: ${_param:cluster_public_host}
+ keystone:
+ client:
+ server:
+ identity:
+ project:
+ service:
+ user:
+ tacker:
+ is_admin: true
+ password: ${_param:keystone_tacker_password}
+ email: ${_param:admin_email}
+ service:
+ tacker:
+ type: nfv-orchestration
+ description: OpenStack Tacker NFV Orchestrator Service
+ endpoints:
+ - region: ${_param:openstack_region}
+ public_address: ${_param:tacker_public_host}
+ public_protocol: ${_param:cluster_public_protocol}
+ public_port: 9890
+ public_path: '/'
+ internal_address: ${_param:tacker_service_host}
+ internal_port: 9890
+ internal_path: '/'
+ internal_protocol: ${_param:tacker_service_protocol}
+ admin_protocol: ${_param:tacker_service_protocol}
+ admin_address: ${_param:tacker_service_host}
+ admin_port: 9890
+ admin_path: '/'
diff --git a/keystone/client/v3/service/tacker.yml b/keystone/client/v3/service/tacker.yml
new file mode 100644
index 0000000..c5187dd
--- /dev/null
+++ b/keystone/client/v3/service/tacker.yml
@@ -0,0 +1,34 @@
+parameters:
+ _param:
+ cluster_public_protocol: https
+ tacker_service_protocol: http
+ tacker_public_host: ${_param:cluster_public_host}
+ keystone:
+ client:
+ resources:
+ v3:
+ users:
+ tacker:
+ password: ${_param:keystone_tacker_password}
+ email: ${_param:admin_email}
+ roles:
+ service_admin:
+ name: admin
+ project_id: service
+ service:
+ tacker:
+ type: nfv-orchestration
+ description: OpenStack Tacker NFV Orchestrator Service
+ endpoints:
+ tacker_public:
+ interface: 'public'
+ url: ${_param:cluster_public_protocol}://${_param:tacker_public_host}:9890/
+ region: ${_param:openstack_region}
+ tacker_internal:
+ interface: 'internal'
+ url: ${_param:tacker_service_protocol}://${_param:tacker_service_host}:9890/
+ region: ${_param:openstack_region}
+ tacker_admin:
+ interface: 'admin'
+ url: ${_param:tacker_service_protocol}://${_param:tacker_service_host}:9890/
+ region: ${_param:openstack_region}
diff --git a/panko/server/cluster.yml b/panko/server/cluster.yml
index c258c9a..e277c30 100644
--- a/panko/server/cluster.yml
+++ b/panko/server/cluster.yml
@@ -11,6 +11,7 @@
panko_memcached_node03_address: ${_param:cluster_node03_address}
panko:
server:
+ role: ${_param:openstack_node_role}
identity:
host: ${_param:openstack_control_address}
database: