summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/deploy.sh1
-rw-r--r--mcp/reclass/classes/cluster/.gitignore4
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j26
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j22
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j24
-rw-r--r--mcp/salt-formulas/salt-formula-opendaylight/opendaylight/map.jinja1
-rw-r--r--mcp/salt-formulas/salt-formula-opendaylight/opendaylight/server.sls8
-rw-r--r--mcp/scripts/globals.sh1
-rw-r--r--mcp/scripts/lib.sh7
9 files changed, 31 insertions, 3 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 8e9312d98..3a0f9f9e5 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -309,6 +309,7 @@ else
do_sysctl_cfg
do_udev_cfg
create_vms "${MCP_STORAGE_DIR}" "${virtual_nodes_data}" "${OPNFV_BRIDGES[@]}"
+ update_mcpcontrol_network
start_vms "${virtual_nodes[@]}"
# https://github.com/docker/libnetwork/issues/1743
diff --git a/mcp/reclass/classes/cluster/.gitignore b/mcp/reclass/classes/cluster/.gitignore
index 9266b7cbc..0179ad987 100644
--- a/mcp/reclass/classes/cluster/.gitignore
+++ b/mcp/reclass/classes/cluster/.gitignore
@@ -6,7 +6,7 @@ mcp-common-ha/infra/init.yml
all-mcp-arch-common/infra/maas.yml
mcp-common-ha/infra/kvm_novcp.yml
all-mcp-arch-common/opnfv/maas_proxy.yml
-mcp-common-ha/openstack_control.yml
+mcp-common-*/openstack_control.yml
mcp-common-ha/openstack_telemetry.yml
mcp*common-*/openstack_init.yml
mcp-common-ha/openstack_interface_vcp_biport.yml
@@ -15,7 +15,7 @@ mcp-common-ha/openstack_proxy.yml
mcp-*-ha/infra/kvm.yml
mcp-*-ha/infra/init_vcp.yml
mcp-odl-ha/infra/maas.yml
-mcp-odl-ha/opendaylight/control.yml
+mcp-odl-*/opendaylight/control.yml
mcp-odl-ha/openstack/init.yml
mcp-odl-noha/infra/config.yml
mcp-*-noha/openstack/compute.yml
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 ed9920ad6..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
@@ -109,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:
diff --git a/mcp/scripts/globals.sh b/mcp/scripts/globals.sh
index d95448d45..629bac8ca 100644
--- a/mcp/scripts/globals.sh
+++ b/mcp/scripts/globals.sh
@@ -16,6 +16,7 @@ export SALT_MASTER_USER=${SALT_MASTER_USER:-ubuntu}
# Derived from INSTALLER_IP
export MCPCONTROL_NET=${MCPCONTROL_NET:-${SALT_MASTER%.*}.0}
export MCPCONTROL_PREFIX=${MCPCONTROL_PREFIX:-24}
+export MAAS_IP=${MAAS_IP:-${SALT_MASTER%.*}.3}
# Derived from above global vars, not overideable
export SSH_OPTS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ${SSH_KEY}"
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
index 3a996279f..c6a3d219e 100644
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -463,6 +463,13 @@ function create_vms {
done
}
+function update_mcpcontrol_network {
+ # set static ip address for salt master node, MaaS node
+ local amac=$(virsh domiflist mas01 2>&1| awk '/mcpcontrol/ {print $5; exit}')
+ [ -z "${amac}" ] || virsh net-update "mcpcontrol" add ip-dhcp-host \
+ "<host mac='${amac}' name='mas01' ip='${MAAS_IP}'/>" --live --config
+}
+
function reset_vms {
local vnodes=("$@")
local cmd_str="ssh ${SSH_OPTS} ${SSH_SALT}"