diff options
| -rw-r--r-- | apex/overcloud/deploy.py | 5 | ||||
| -rw-r--r-- | build/nics-template.yaml.jinja2 | 2 | ||||
| -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 |
5 files changed, 14 insertions, 4 deletions
diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py index 92b42fff..db7e42c3 100644 --- a/apex/overcloud/deploy.py +++ b/apex/overcloud/deploy.py @@ -410,6 +410,11 @@ def prep_image(ds, ns, img, tmp_dir, root_pw=None, docker_tag=None, {con.VIRT_RUN_CMD: 'systemctl daemon-reload'}, {con.VIRT_RUN_CMD: 'systemctl enable losetup.service'}, ]) + # TODO(trozet) remove this after LP#173474 is fixed + dhcp_unit = '/usr/lib/systemd/system/dhcp-interface@.service' + virt_cmds.append( + {con.VIRT_RUN_CMD: "crudini --del {} Unit " + "ConditionPathExists".format(dhcp_unit)}) virt_utils.virt_customize(virt_cmds, tmp_oc_image) logging.info("Overcloud image customization complete") return patched_containers diff --git a/build/nics-template.yaml.jinja2 b/build/nics-template.yaml.jinja2 index 959a3926..073d6680 100644 --- a/build/nics-template.yaml.jinja2 +++ b/build/nics-template.yaml.jinja2 @@ -242,7 +242,6 @@ resources: name: {{ nets['external'][0]['nic_mapping'][role]['members'][0] }} # force the MAC address of the bridge to this interface primary: true - {%- if role == 'controller' %} dns_servers: {get_param: DnsServers} addresses: - @@ -252,7 +251,6 @@ resources: default: true ip_netmask: 0.0.0.0/0 next_hop: {get_param: ExternalInterfaceDefaultRoute} - {%- endif %} {%- endif %} {%- if nets['storage']['enabled'] and nets['storage']['nic_mapping'][role]['vlan'] == 'native' %} - 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. |