diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/deploy/os-odl-nofeature-ha.yaml | 4 | ||||
| -rw-r--r-- | config/deploy/os-odl-nofeature-noha.yaml | 5 | ||||
| -rw-r--r-- | config/network/network_settings.yaml | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/config/deploy/os-odl-nofeature-ha.yaml b/config/deploy/os-odl-nofeature-ha.yaml index 313cb1f4..53b3bcd4 100644 --- a/config/deploy/os-odl-nofeature-ha.yaml +++ b/config/deploy/os-odl-nofeature-ha.yaml @@ -5,6 +5,10 @@ global_params: undercloud: - change-id: Ib8ff69a4bc869de21ad838b3bc6c38a8676036c6 project: openstack/tripleo-heat-templates + overcloud: + - change-id: Ie988ba6a2d444a614e97c0edf5fce24b23970310 + project: openstack/puppet-tripleo + branch: master deploy_options: containers: true os_version: master diff --git a/config/deploy/os-odl-nofeature-noha.yaml b/config/deploy/os-odl-nofeature-noha.yaml index e2b34642..e57d1d3c 100644 --- a/config/deploy/os-odl-nofeature-noha.yaml +++ b/config/deploy/os-odl-nofeature-noha.yaml @@ -5,7 +5,10 @@ global_params: undercloud: - change-id: Ib8ff69a4bc869de21ad838b3bc6c38a8676036c6 project: openstack/tripleo-heat-templates - + overcloud: + - change-id: Ie988ba6a2d444a614e97c0edf5fce24b23970310 + project: openstack/puppet-tripleo + branch: master deploy_options: containers: true os_version: master diff --git a/config/network/network_settings.yaml b/config/network/network_settings.yaml index a8ddca1a..4c3b63a2 100644 --- a/config/network/network_settings.yaml +++ b/config/network/network_settings.yaml @@ -180,7 +180,7 @@ networks: nic_mapping: # Mapping for compute profile (nodes assigned as Compute nodes) compute: - # Physical interface type (interface or bond) + # Physical interface type (ovs_bridge, interface or bond) # Note that this phys_type for external network will be changed # to vpp_interface for odl_fdio scenarios and linux_bridge for # nosdn_fdio scenarios. |