diff options
| author |   Feng Pan <fpan@redhat.com> | 2017-10-13 13:14:46 +0000 |
|---|---|---|
| committer | Feng Pan <fpan@redhat.com> | 2017-10-13 09:35:14 -0400 |
| commit | 649f2727b4c7621e541957d79d92259b637bdbf6 (patch) | |
| tree | 383cf514d26e63aec55c3aed1965e099877924e8 | |
| parent | 51d315eed319df4e325aed4ed6ae585004273533 (diff) | |
Revert "Update Honeycomb interface role mapping for 17.07"v17.10
ODL is not ready to read the new role mapping config. Reverting to old path until ODL is updated.
This reverts commit a6e575c8f0af17e62990653bcf4a12c688c21aad.
Change-Id: I52ea68ca6d5971563f42593645f28b32b9077cc8
Signed-off-by: Feng Pan <fpan@redhat.com>
| -rw-r--r-- | manifests/honeycomb/configure_role_mappings.pp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/manifests/honeycomb/configure_role_mappings.pp b/manifests/honeycomb/configure_role_mappings.pp index 43d742b..826f6e6 100644 --- a/manifests/honeycomb/configure_role_mappings.pp +++ b/manifests/honeycomb/configure_role_mappings.pp @@ -28,15 +28,10 @@ define fdio::honeycomb::configure_role_mappings ( $mapping = split($interface_role_mapping, ':') $vpp_int = regsubst($mapping[0], '/', '%2F', 'G') $role_name = $mapping[1] - case $role_name { - 'tenant-interface': { $role_type = 'virtual-domain-interface' } - 'public-interface': { $role_type = 'public-interface' } - default: { fail("Unsupported interface role: ${role_name}") } - } - $config_url = "${honeycomb_url}/restconf/config/ietf-interfaces:interfaces/ietf-interfaces:interface/${vpp_int}/interface-role:roles/interface-role:role/${role_name}" + $config_url = "${honeycomb_url}/restconf/config/ietf-interfaces:interfaces/interface/${vpp_int}" exec { "Register interface ${mapping[0]} with role ${role_name}": - command => "curl -XPOST --fail -H 'Content-Type: application/json' -u ${honeycomb_username}:${honeycomb_password} ${config_url} -d \"{'role-type': '${role_type}'}\"", + command => "curl -XPOST --fail -H 'Content-Type: application/json' -u ${honeycomb_username}:${honeycomb_password} ${config_url} -d \"{'description': '${role_name}'}\"", tries => 5, try_sleep => 30, path => '/usr/sbin:/usr/bin:/sbin:/bin', |