diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/ansible.cfg | 11 | ||||
| -rw-r--r-- | build/containers-prepare-parameter.yaml | 26 | ||||
| -rw-r--r-- | build/csit-environment.yaml | 23 | ||||
| -rw-r--r-- | build/csit-queens-environment.yaml | 23 | ||||
| -rw-r--r-- | build/csit-rocky-environment.yaml | 23 | ||||
| -rw-r--r-- | build/network-environment.yaml | 22 | ||||
| -rw-r--r-- | build/nics-template.yaml.jinja2 | 8 | ||||
| -rw-r--r-- | build/patches/neutron-patch-NSDriver.patch | 2 |
8 files changed, 136 insertions, 2 deletions
diff --git a/build/ansible.cfg b/build/ansible.cfg new file mode 100644 index 00000000..a9db58a0 --- /dev/null +++ b/build/ansible.cfg @@ -0,0 +1,11 @@ +[defaults] +retry_files_enabled = False +forks = 25 +timeout = 60 +gather_timeout = 30 + +[ssh_connection] +ssh_args = -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ControlMaster=auto -o ControlPersist=30m -o ServerAliveInterval=5 -o ServerAliveCountMax=5 +retries = 8 +pipelining = True + diff --git a/build/containers-prepare-parameter.yaml b/build/containers-prepare-parameter.yaml new file mode 100644 index 00000000..5089c335 --- /dev/null +++ b/build/containers-prepare-parameter.yaml @@ -0,0 +1,26 @@ +--- +parameter_defaults: + ContainerImagePrepare: + - push_destination: true + set: + ceph_image: daemon + ceph_namespace: docker.io/ceph + ceph_tag: v3.1.0-stable-3.1-luminous-centos-7-x86_64 + name_prefix: centos-binary- + name_suffix: '' + namespace: docker.io/tripleomaster + neutron_driver: null + tag: current-tripleo + excludes: + - sensu + - manila + - octavia + - skydive + - drouter + - sahara + - rsys + - fluent + - designate + - barbican + - etcd + - ec2 diff --git a/build/csit-environment.yaml b/build/csit-environment.yaml index 048833d1..39486d32 100644 --- a/build/csit-environment.yaml +++ b/build/csit-environment.yaml @@ -14,6 +14,29 @@ parameter_defaults: ExtraConfig: tripleo::ringbuilder::build_ring: false nova::api::default_floating_pool: 'external' + ControllerExtraConfig: + tripleo::firewall::firewall_rules: + '139 allow NFS TCP': + dport: + - 2049 + - 111 + - 32765 + proto: tcp + action: accept + '140 allow NFS UDP': + dport: + - 2049 + - 111 + - 32765 + proto: udp + action: accept + GlanceNfsEnabled: true + GlanceNfsShare: overcloud-controller-0.opnfvlf.org:/glance + GlanceNfsOptions: + 'rw,sync,context=system_u:object_r:glance_var_lib_t:s0' + NovaNfsEnabled: true + NovaNfsShare: overcloud-controller-0.opnfvlf.org:/nova + NovaNfsOptions: 'rw,sync,context=system_u:object_r:nfs_t:s0' DockerPuppetProcessCount: 10 NeutronNetworkVLANRanges: 'datacentre:500:525' SshServerOptions: diff --git a/build/csit-queens-environment.yaml b/build/csit-queens-environment.yaml index b13dd4df..12c994d1 100644 --- a/build/csit-queens-environment.yaml +++ b/build/csit-queens-environment.yaml @@ -14,6 +14,29 @@ parameter_defaults: ExtraConfig: tripleo::ringbuilder::build_ring: false nova::api::default_floating_pool: 'external' + ControllerExtraConfig: + tripleo::firewall::firewall_rules: + '139 allow NFS TCP': + dport: + - 2049 + - 111 + - 32765 + proto: tcp + action: accept + '140 allow NFS UDP': + dport: + - 2049 + - 111 + - 32765 + proto: udp + action: accept + GlanceNfsEnabled: true + GlanceNfsShare: overcloud-controller-0.opnfvlf.org:/glance + GlanceNfsOptions: + 'rw,sync,context=system_u:object_r:glance_var_lib_t:s0' + NovaNfsEnabled: true + NovaNfsShare: overcloud-controller-0.opnfvlf.org:/nova + NovaNfsOptions: 'rw,sync,context=system_u:object_r:nfs_t:s0' DockerPuppetProcessCount: 10 NeutronNetworkVLANRanges: 'datacentre:500:525' SshServerOptions: diff --git a/build/csit-rocky-environment.yaml b/build/csit-rocky-environment.yaml index 048833d1..39486d32 100644 --- a/build/csit-rocky-environment.yaml +++ b/build/csit-rocky-environment.yaml @@ -14,6 +14,29 @@ parameter_defaults: ExtraConfig: tripleo::ringbuilder::build_ring: false nova::api::default_floating_pool: 'external' + ControllerExtraConfig: + tripleo::firewall::firewall_rules: + '139 allow NFS TCP': + dport: + - 2049 + - 111 + - 32765 + proto: tcp + action: accept + '140 allow NFS UDP': + dport: + - 2049 + - 111 + - 32765 + proto: udp + action: accept + GlanceNfsEnabled: true + GlanceNfsShare: overcloud-controller-0.opnfvlf.org:/glance + GlanceNfsOptions: + 'rw,sync,context=system_u:object_r:glance_var_lib_t:s0' + NovaNfsEnabled: true + NovaNfsShare: overcloud-controller-0.opnfvlf.org:/nova + NovaNfsOptions: 'rw,sync,context=system_u:object_r:nfs_t:s0' DockerPuppetProcessCount: 10 NeutronNetworkVLANRanges: 'datacentre:500:525' SshServerOptions: diff --git a/build/network-environment.yaml b/build/network-environment.yaml index 3fd22e3d..1397a0c8 100644 --- a/build/network-environment.yaml +++ b/build/network-environment.yaml @@ -63,33 +63,53 @@ parameter_defaults: NeutronExternalNetworkBridge: 'br-ex' ServiceNetMap: + ApacheNetwork: internal_api NeutronTenantNetwork: tenant CeilometerApiNetwork: internal_api AodhApiNetwork: internal_api + PankoApiNetwork: internal_api + BarbicanApiNetwork: internal_api + GnocchiApiNetwork: internal_api OpendaylightApiNetwork: internal_api MongoDbNetwork: internal_api CinderApiNetwork: internal_api CinderIscsiNetwork: storage GlanceApiNetwork: internal_api GlanceRegistryNetwork: internal_api + IronicApiNetwork: ctlplane + IronicNetwork: ctlplane + IronicInspectorNetwork: ctlplane KeystoneAdminApiNetwork: ctlplane KeystonePublicApiNetwork: internal_api NeutronApiNetwork: internal_api HeatApiNetwork: internal_api + HeatApiCfnNetwork: internal_api + HeatApiCloudwatchNetwork: internal_api + ManilaApiNetwork: internal_api + MetricsQdrNetwork: internal_api NovaApiNetwork: internal_api NovaMetadataNetwork: internal_api + NovaPlacementNetwork: internal_api NovaVncProxyNetwork: internal_api + NovaLibvirtNetwork: internal_api + NovajoinNetwork: internal_api + OctaviaApiNetwork: internal_api SwiftMgmtNetwork: storage SwiftProxyNetwork: storage TackerApiNetwork: internal_api CongressApiNetwork: internal_api HorizonNetwork: internal_api + OsloMessagingRpcNetwork: internal_api + OsloMessagingNotifyNetwork: internal_api MemcachedNetwork: internal_api RabbitMqNetwork: internal_api RedisNetwork: internal_api MysqlNetwork: internal_api CephClusterNetwork: storage - CephPublicNetwork: storage + CephMonNetwork: storage + PublicNetwork: external + OvnDbsNetwork: internal_api + DockerRegistryNetwork: ctlplane # Define which network will be used for hostname resolution ControllerHostnameResolveNetwork: internal_api ComputeHostnameResolveNetwork: internal_api diff --git a/build/nics-template.yaml.jinja2 b/build/nics-template.yaml.jinja2 index 189654ca..6d1fb9c0 100644 --- a/build/nics-template.yaml.jinja2 +++ b/build/nics-template.yaml.jinja2 @@ -9,6 +9,14 @@ parameters: default: '' description: IP address/subnet on the ctlplane network type: string + ControlPlaneStaticRoutes: + default: [] + description: > + Routes for the ctlplane 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 ExternalNetworkVlanID: default: 10 description: Vlan ID for the external network traffic. diff --git a/build/patches/neutron-patch-NSDriver.patch b/build/patches/neutron-patch-NSDriver.patch index 84b4fb02..95ad58f9 100644 --- a/build/patches/neutron-patch-NSDriver.patch +++ b/build/patches/neutron-patch-NSDriver.patch @@ -139,7 +139,7 @@ index 88d6e67f31..c0fab604d1 100644 + + def _configure_mtu(self, ns_dev, mtu=None): + # Need to set MTU, after added to namespace. See review -+ # https://review.openstack.org/327651 ++ # https://review.opendev.org/327651 + try: + # Note: network_device_mtu will be deprecated in future + mtu_override = self.conf.network_device_mtu |