summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Noriega <rnoriega@redhat.com>2018-09-11 18:28:29 +0200
committerRicardo Noriega <rnoriega@redhat.com>2018-09-17 19:23:16 +0200
commit82bf9da27ea0c973068720d440e3391084e8a9d9 (patch)
tree2554a0d8b216ee12183b334afe193148783b3b9d
parent70cade4f8df150281c16e72d9234fa3751f097c8 (diff)
Fix per-network routes to NIC templates dependency
Change-Id: I9e01f1164fc72915b92dfb1c0aad7414c484567e Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
-rw-r--r--build/nics-template.yaml.jinja2108
-rw-r--r--lib/ansible/playbooks/configure_undercloud.yml4
2 files changed, 88 insertions, 24 deletions
diff --git a/build/nics-template.yaml.jinja2 b/build/nics-template.yaml.jinja2
index 11e0b115..189654ca 100644
--- a/build/nics-template.yaml.jinja2
+++ b/build/nics-template.yaml.jinja2
@@ -9,30 +9,6 @@ parameters:
default: ''
description: IP address/subnet on the ctlplane network
type: string
- ExternalIpSubnet:
- default: ''
- description: IP address/subnet on the external network
- type: string
- InternalApiIpSubnet:
- default: ''
- description: IP address/subnet on the internal API network
- type: string
- StorageIpSubnet:
- default: ''
- description: IP address/subnet on the storage network
- type: string
- StorageMgmtIpSubnet:
- default: ''
- description: IP address/subnet on the storage mgmt network
- type: string
- TenantIpSubnet:
- default: ''
- description: IP address/subnet on the tenant network
- type: string
- ManagementIpSubnet: # Only populated when including environments/network-management.yaml
- default: ''
- description: IP address/subnet on the management network
- type: string
ExternalNetworkVlanID:
default: 10
description: Vlan ID for the external network traffic.
@@ -75,6 +51,90 @@ parameters:
EC2MetadataIp: # Override this via parameter_defaults
description: The IP address of the EC2 metadata server.
type: string
+ ExternalIpSubnet:
+ default: ''
+ description: IP address/subnet on the external network
+ type: string
+ ExternalInterfaceRoutes:
+ default: []
+ description: >
+ Routes for the external network traffic.
+ JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+ Unless the default is changed, the parameter is automatically resolved
+ from the subnet host_routes attribute.
+ type: json
+ InternalApiIpSubnet:
+ default: ''
+ description: IP address/subnet on the internal_api network
+ type: string
+ InternalApiInterfaceRoutes:
+ default: []
+ description: >
+ Routes for the internal_api network traffic.
+ JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+ Unless the default is changed, the parameter is automatically resolved
+ from the subnet host_routes attribute.
+ type: json
+ StorageIpSubnet:
+ default: ''
+ description: IP address/subnet on the storage network
+ type: string
+ StorageInterfaceRoutes:
+ default: []
+ description: >
+ Routes for the storage network traffic.
+ JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+ Unless the default is changed, the parameter is automatically resolved
+ from the subnet host_routes attribute.
+ type: json
+ StorageMgmtIpSubnet:
+ default: ''
+ description: IP address/subnet on the storage_mgmt network
+ type: string
+ StorageMgmtInterfaceRoutes:
+ default: []
+ description: >
+ Routes for the storage_mgmt network traffic.
+ JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+ Unless the default is changed, the parameter is automatically resolved
+ from the subnet host_routes attribute.
+ type: json
+ StorageNFSIpSubnet:
+ default: ''
+ description: IP address/subnet on the storage_nfs network
+ type: string
+ StorageNFSRoutes:
+ default: []
+ description: >
+ Routes for the storage_nfs network traffic.
+ JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+ Unless the default is changed, the parameter is automatically resolved
+ from the subnet host_routes attribute.
+ type: json
+ TenantIpSubnet:
+ default: ''
+ description: IP address/subnet on the tenant network
+ type: string
+ TenantInterfaceRoutes:
+ default: []
+ description: >
+ Routes for the tenant network traffic.
+ JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+ Unless the default is changed, the parameter is automatically resolved
+ from the subnet host_routes attribute.
+ type: json
+ ManagementIpSubnet:
+ default: ''
+ description: IP address/subnet on the management network
+ type: string
+ ManagementInterfaceRoutes:
+ default: []
+ description: >
+ Routes for the management network traffic.
+ JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+ Unless the default is changed, the parameter is automatically resolved
+ from the subnet host_routes attribute.
+ type: json
resources:
OsNetConfigImpl:
diff --git a/lib/ansible/playbooks/configure_undercloud.yml b/lib/ansible/playbooks/configure_undercloud.yml
index 578ab13c..1fb2283b 100644
--- a/lib/ansible/playbooks/configure_undercloud.yml
+++ b/lib/ansible/playbooks/configure_undercloud.yml
@@ -81,6 +81,10 @@
shell: openstack-config --set /etc/nova/nova.conf DEFAULT {{ item }}
become: yes
with_items: "{{ nova_config }}"
+ - name: change nova filters
+ shell: openstack-config --set /etc/nova/nova.conf filter_scheduler {{ item }}
+ become: yes
+ with_items: "enabled_filters RetryFilter,TripleOCapabilitiesFilter,ComputeCapabilitiesFilter,AvailabilityZoneFilter,ComputeFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter"
- name: restart nova services
service:
name: "{{ item }}"