From b32133663920815b9cced1cb9b7e50c102fbb034 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 29 Aug 2020 18:13:33 +0900 Subject: [PATCH] Remove remaining implementations for OpenDaylight ... because OpenDaylight is no longer supported by TripleO. Change-Id: I321ce7706eb16e6c9498ace67965e951516806a4 --- .../roles/tripleo_derived_parameters/molecule/mock_params | 1 - .../roles/tripleo_derived_parameters/tasks/main.yml | 4 ++-- .../tripleo_hieradata/molecule/ansible_hieradata/molecule.yml | 1 - .../tripleo_hieradata/molecule/hieradata_vars/molecule.yml | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/tripleo_ansible/roles/tripleo_derived_parameters/molecule/mock_params b/tripleo_ansible/roles/tripleo_derived_parameters/molecule/mock_params index ce6aca5b2..f73a62c1e 100644 --- a/tripleo_ansible/roles/tripleo_derived_parameters/molecule/mock_params +++ b/tripleo_ansible/roles/tripleo_derived_parameters/molecule/mock_params @@ -743,7 +743,6 @@ stack_data: NovaVncProxyNetwork: internal_api NovajoinNetwork: internal_api OctaviaApiNetwork: internal_api - OpendaylightApiNetwork: internal_api OsloMessagingNotifyNetwork: internal_api OsloMessagingRpcNetwork: internal_api OvnDbsNetwork: internal_api diff --git a/tripleo_ansible/roles/tripleo_derived_parameters/tasks/main.yml b/tripleo_ansible/roles/tripleo_derived_parameters/tasks/main.yml index e393e6f2e..9cd10abd4 100644 --- a/tripleo_ansible/roles/tripleo_derived_parameters/tasks/main.yml +++ b/tripleo_ansible/roles/tripleo_derived_parameters/tasks/main.yml @@ -47,9 +47,9 @@ - name: Set feature fact set_fact: feature_dict: - DPDK: "{{ dpdk or odl_dpdk }}" + DPDK: "{{ dpdk }}" SRIOV: "{{ sriov }}" - HOST: "{{ dpdk or odl_dpdk or sriov }}" + HOST: "{{ dpdk or sriov }}" HCI: "{{ hci }}" - name: Set role feature fact diff --git a/tripleo_ansible/roles/tripleo_hieradata/molecule/ansible_hieradata/molecule.yml b/tripleo_ansible/roles/tripleo_hieradata/molecule/ansible_hieradata/molecule.yml index 7c9bf25f7..3b187fa37 100644 --- a/tripleo_ansible/roles/tripleo_hieradata/molecule/ansible_hieradata/molecule.yml +++ b/tripleo_ansible/roles/tripleo_hieradata/molecule/ansible_hieradata/molecule.yml @@ -229,7 +229,6 @@ provisioner: nova_vnc_proxy_network: ctlplane novajoin_network: ctlplane octavia_api_network: ctlplane - opendaylight_api_network: ctlplane openshift_infra_network: ctlplane openshift_master_network: ctlplane oslo_messaging_notify_network: ctlplane diff --git a/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/molecule.yml b/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/molecule.yml index 76167e0df..9e8c6f750 100644 --- a/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/molecule.yml +++ b/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/molecule.yml @@ -232,7 +232,6 @@ provisioner: nova_vnc_proxy_network: ctlplane novajoin_network: ctlplane octavia_api_network: ctlplane - opendaylight_api_network: ctlplane openshift_infra_network: ctlplane openshift_master_network: ctlplane oslo_messaging_notify_network: ctlplane