Browse Source

Merge "Remove remaining implementations for OpenDaylight"

tags/1.7.0
Zuul 4 weeks ago
committed by Gerrit Code Review
parent
commit
fc54057525
4 changed files with 2 additions and 5 deletions
  1. +0
    -1
      tripleo_ansible/roles/tripleo_derived_parameters/molecule/mock_params
  2. +2
    -2
      tripleo_ansible/roles/tripleo_derived_parameters/tasks/main.yml
  3. +0
    -1
      tripleo_ansible/roles/tripleo_hieradata/molecule/ansible_hieradata/molecule.yml
  4. +0
    -1
      tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/molecule.yml

+ 0
- 1
tripleo_ansible/roles/tripleo_derived_parameters/molecule/mock_params View File

@@ -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


+ 2
- 2
tripleo_ansible/roles/tripleo_derived_parameters/tasks/main.yml View File

@@ -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


+ 0
- 1
tripleo_ansible/roles/tripleo_hieradata/molecule/ansible_hieradata/molecule.yml View File

@@ -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


+ 0
- 1
tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/molecule.yml View File

@@ -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


Loading…
Cancel
Save