diff options
5 files changed, 21 insertions, 1 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 index 8ef7376b5..efa04cecf 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 @@ -10,6 +10,7 @@ # NOTE: pod_config is generated and transferred into its final location on # cfg01 only during deployment to prevent leaking sensitive data classes: + - system.linux.system.single.simple - system.maas.region.single - service.maas.cluster.single - cluster.all-mcp-arch-common.opnfv.lab_proxy_pdf @@ -108,7 +109,11 @@ parameters: {%- endif %} salt_master_ip: ${_param:reclass_config_master} domain: ${_param:cluster_domain} - maas_config: + ~maas_config: + maas_name: mas01 + active_discovery_interval: 600 + ntp_external_only: true + upstream_dns: ${_param:dns_server01} commissioning_distro_series: 'xenial' default_distro_series: 'xenial' default_osystem: 'ubuntu' diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 index 413b37378..25521f9c8 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 @@ -71,6 +71,8 @@ parameters: cluster_node03_address: ${_param:openstack_control_node03_address} nova_vncproxy_url: https://${_param:cluster_public_host}:6080 barbican_integration_enabled: 'false' + fernet_rotation_driver: 'shared_filesystem' + credential_rotation_driver: 'shared_filesystem' nova: controller: &db_conn_recycle_time database: diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2 index c23b50993..759bdc1ba 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2 @@ -8,6 +8,7 @@ --- classes: - system.linux.system.repo.mcp.mirror.v1.openstack + - system.linux.system.single.simple - system.nginx.server.single - system.nginx.server.proxy.openstack_api - system.nginx.server.proxy.openstack_vnc @@ -39,6 +40,9 @@ parameters: package: libapache2-mod-wsgi: version: latest + kernel: + ~boot_options: + - ipv6.disable=0 {%- if not conf.MCP_VCP %} nginx: server: diff --git a/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/map.jinja b/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/map.jinja index e0b495952..9874f60cf 100644 --- a/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/map.jinja +++ b/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/map.jinja @@ -16,6 +16,7 @@ 'enable_ha': false, 'ha_node_ips': [], 'ha_node_index': 0, + 'stats_polling_enabled': false, 'dhcp': { 'enabled': false, 'dynamic_allocation_pool_enabled': false, diff --git a/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/server.sls b/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/server.sls index 35ab35391..e0fb0912c 100644 --- a/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/server.sls +++ b/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/server.sls @@ -41,6 +41,8 @@ opendaylight_service_mask: service.masked: - name: opendaylight {%- endif %} + - prereq: + - pkg: opendaylight opendaylight: pkg.installed: @@ -56,6 +58,7 @@ opendaylight: - file: /opt/opendaylight/bin/setenv - ini: /opt/opendaylight/etc/org.apache.karaf.features.cfg - ini: /opt/opendaylight/etc/org.ops4j.pax.web.cfg + - ini: /opt/opendaylight/etc/org.opendaylight.openflowplugin.cfg /opt/opendaylight/etc/jetty.xml: file.managed: @@ -88,6 +91,11 @@ opendaylight: org.ops4j.pax.web.listening.addresses: {{ server.odl_bind_ip }} org.osgi.service.http.port: {{ server.odl_rest_port }} +/opt/opendaylight/etc/org.opendaylight.openflowplugin.cfg: + ini.options_present: + - sections: + is-statistics-polling-on: {{ server.stats_polling_enabled }} + {%- if server.get('router_enabled', false) %} /opt/opendaylight/etc/custom.properties: ini.options_present: |