Align SDN credentials variables

Change-Id: I731abc6871ddd845b551a837e942d2a2d77a67ee
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

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 (file)
--- 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 (file)
--- 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}