summaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-12-22 22:12:07 +0000
committerGerrit Code Review <review@openstack.org>2016-12-22 22:12:07 +0000
commit8125e6880acab3674ae2963b45d6c3ff7be59b0f (patch)
treef62561bacf5ef4d8df3ccba3047fd88da746fadb /puppet/services
parente2be921333fc513ac8c0fa7169a4ffa11311ffa8 (diff)
parentc5b7aa125f08c297dbef64c71415a12629513e1d (diff)
Merge "Adds missing OpenDaylight username/password from ODL OVS service"
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/opendaylight-ovs.yaml11
1 files changed, 11 insertions, 0 deletions
diff --git a/puppet/services/opendaylight-ovs.yaml b/puppet/services/opendaylight-ovs.yaml
index 907ecddc..63d12fe2 100644
--- a/puppet/services/opendaylight-ovs.yaml
+++ b/puppet/services/opendaylight-ovs.yaml
@@ -8,6 +8,15 @@ parameters:
default: 8081
description: Set opendaylight service port
type: number
+ OpenDaylightUsername:
+ default: 'admin'
+ description: The username for the opendaylight server.
+ type: string
+ OpenDaylightPassword:
+ default: 'admin'
+ type: string
+ description: The password for the opendaylight server.
+ hidden: true
OpenDaylightConnectionProtocol:
description: L7 protocol used for REST access
type: string
@@ -46,6 +55,8 @@ outputs:
service_name: opendaylight_ovs
config_settings:
opendaylight::odl_rest_port: {get_param: OpenDaylightPort}
+ opendaylight::username: {get_param: OpenDaylightUsername}
+ opendaylight::password: {get_param: OpenDaylightPassword}
opendaylight_check_url: {get_param: OpenDaylightCheckURL}
opendaylight::nb_connection_protocol: {get_param: OpenDaylightConnectionProtocol}
neutron::agents::ml2::ovs::local_ip: {get_param: [ServiceNetMap, NeutronTenantNetwork]}