aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-07-20 12:52:05 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2018-07-20 12:54:05 +0400
commitf06c752bd1f95df30efbe147a362e612a49e469f (patch)
tree745729087e9df941cf98869cc705993004a26aa3
parentb03bc918a67f86d6a89441739f4a2952993c9e67 (diff)
Align SDN credentials variablesHEADmaster
Change-Id: I731abc6871ddd845b551a837e942d2a2d77a67ee Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
-rw-r--r--mcp/reclass/classes/cluster/mcp-odl-ha/openstack/control.yml4
-rw-r--r--mcp/reclass/classes/cluster/mcp-odl-noha/openstack/control.yml4
2 files changed, 4 insertions, 4 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/control.yml
index 7b03f29..e2912fa 100644
--- a/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/control.yml
@@ -17,7 +17,7 @@ parameters:
openrc_extra:
# For HA, all public services are available through nginx on prx
sdn_controller_ip: ${_param:cluster_public_host}
- sdn_username: admin # Hardcoded to default ODL values for now
- sdn_password: admin
+ sdn_controller_user: admin # Hardcoded to default ODL values for now
+ sdn_controller_password: admin
sdn_controller_webport: ${_param:opendaylight_rest_port}
sdn_controller_restconfport: ${_param:opendaylight_rest_port}
diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/control.yml
index c9c683f..03bd1ef 100644
--- a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/control.yml
@@ -30,7 +30,7 @@ parameters:
openrc_extra:
# For noHA, all public services are available through haproxy on ctl
sdn_controller_ip: ${_param:cluster_vip_address}
- sdn_username: admin # Hardcoded to default ODL values for now
- sdn_password: admin
+ sdn_controller_user: admin # Hardcoded to default ODL values for now
+ sdn_controller_password: admin
sdn_controller_webport: ${_param:opendaylight_rest_port}
sdn_controller_restconfport: ${_param:opendaylight_rest_port}