summaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
Diffstat (limited to 'mcp')
-rw-r--r--mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml1
-rwxr-xr-xmcp/config/states/maas12
-rwxr-xr-xmcp/config/states/neutron_compute4
-rwxr-xr-xmcp/config/states/openstack4
-rwxr-xr-xmcp/config/states/virtual_control_plane20
-rw-r--r--mcp/patches/0001-opendaylight-formula-neutron.patch22
-rw-r--r--mcp/patches/0012-linux.storage.lvm-Disable-filter.patch35
-rw-r--r--mcp/patches/0013-maas-region-Allow-subnets-without-fabrics.patch31
-rwxr-xr-xmcp/patches/patch.sh2
-rw-r--r--mcp/patches/patches.list2
-rw-r--r--mcp/patches/pharos/0006-extend-public-gateway-support.patch62
-rw-r--r--mcp/patches/reclass-system-salt-model/0001-Bring-in-opendaylight-support.patch22
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example1
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml2
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template2
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml4
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_benchmark.yml17
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml4
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_dashboard.yml20
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml24
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml11
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml1
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml11
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml1
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/benchmark.yml11
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml1
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/dashboard.yml11
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml1
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/benchmark.yml11
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml13
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml11
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml1
m---------mcp/reclass/classes/system0
-rwxr-xr-xmcp/scripts/salt.sh50
34 files changed, 290 insertions, 135 deletions
diff --git a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml
index 0d47682c1..1766f9700 100644
--- a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml
+++ b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml
@@ -13,7 +13,6 @@ cluster:
- virtual_control_plane
- dpdk
- openstack_ha
- - neutron_compute
- networks
virtual:
nodes:
diff --git a/mcp/config/states/maas b/mcp/config/states/maas
index eea3e0ef6..7ccf0188e 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -8,6 +8,7 @@
##############################################################################
CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x
+ERASE_ENV=${ERASE_ENV:-0}
# shellcheck disable=SC1090
source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
@@ -52,6 +53,17 @@ function maas_fixup() {
return 0
}
+# Optionally destroy MaaS machines from a previous run
+if [ "${ERASE_ENV}" -gt 1 ]; then
+ dnodes=$(salt 'mas01*' --out yaml state.apply maas.machines.status | \
+ grep -Pzo '\s+system_id: \K.+\n')
+ for node_system_id in ${dnodes}; do
+ salt -C 'mas01*' state.apply maas.machines.delete \
+ pillar="{'system_id': '${node_system_id}'}"
+ sleep 30
+ done
+fi
+
# MaaS rack/region controller, node commissioning
salt -C 'mas01*' cmd.run "add-apt-repository ppa:maas/stable"
diff --git a/mcp/config/states/neutron_compute b/mcp/config/states/neutron_compute
index f1285479e..c6b90e20d 100755
--- a/mcp/config/states/neutron_compute
+++ b/mcp/config/states/neutron_compute
@@ -9,6 +9,4 @@
CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x
-salt -I 'neutron:compute' state.sls neutron || true
-salt -I 'neutron:compute' file.append /etc/sudoers.d/neutron_sudoers \
- args='neutron ALL = (root) NOPASSWD: /usr/bin/neutron-rootwrap-daemon /etc/neutron/rootwrap.conf'
+salt -I 'neutron:compute' state.sls neutron
diff --git a/mcp/config/states/openstack b/mcp/config/states/openstack
index 19cd41703..369e16504 100755
--- a/mcp/config/states/openstack
+++ b/mcp/config/states/openstack
@@ -26,7 +26,11 @@ salt -I 'keystone:server' state.sls keystone.client
salt -I 'keystone:server' cmd.run ". /root/keystonercv3; openstack service list"
salt -I 'glance:server' state.sls glance
+
+# apply nova state twice to complete broken db sync
+salt -I 'nova:controller' state.sls nova
salt -I 'nova:controller' state.sls nova
+
salt -I 'heat:server' state.sls heat
salt -I 'cinder:controller' state.sls cinder
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
index 43d152023..c355126f7 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
@@ -8,13 +8,25 @@
##############################################################################
CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x
+ERASE_ENV=${ERASE_ENV:-0}
# shellcheck disable=SC1090
source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
-# KVM, compute node prereqs (libvirt first), VCP deployment
-salt -C 'kvm* or cmp*' cmd.run 'rm -f /etc/network/interfaces.d/*.cfg'
+# Optionally destroy VCP VMs from a previous run
+if [ "${ERASE_ENV}" -eq 1 ]; then
+ kvm_vms=$(salt --out yaml 'kvm*' virt.list_domains | \
+ sed -e 's/- //g' -e 's/:.*$//g')
+ for line in ${kvm_vms}; do
+ if [[ "${line}" =~ ^kvm ]]; then
+ kvm_node=${line}
+ elif [ -n "${kvm_node}" ]; then
+ salt "${kvm_node}" virt.purge dirs=True "${line}" || true
+ fi
+ done
+fi
+# KVM, compute node prereqs (libvirt first), VCP deployment
# patch the networking module for Debian based distros
debian_ip_source=/usr/lib/python2.7/dist-packages/salt/modules/debian_ip.py
salt -C 'kvm* or cmp*' file.line $debian_ip_source \
@@ -64,3 +76,7 @@ wait_for 10 "! salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply linux,ntp |
wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_USER} \
$(awk 'NR==1{print $2}' "$(eval echo "~${SUDO_USER}/.ssh/authorized_keys")")"
+
+# Disable proxy dhcp routes after installation
+salt -C 'prx*' file.write /etc/dhcp/dhclient-enter-hooks.d/no-default-route \
+ args='unset new_routers'
diff --git a/mcp/patches/0001-opendaylight-formula-neutron.patch b/mcp/patches/0001-opendaylight-formula-neutron.patch
index 157271aa3..8d02cd992 100644
--- a/mcp/patches/0001-opendaylight-formula-neutron.patch
+++ b/mcp/patches/0001-opendaylight-formula-neutron.patch
@@ -60,7 +60,7 @@ index b61e313..02da3b1 100644
+password = {{ server.backend.password }}
+{%- endif %}
diff --git a/neutron/files/ocata/neutron-generic.conf.Debian b/neutron/files/ocata/neutron-generic.conf.Debian
-index 123386d..85b8076 100644
+index 123386d..d77f6c8 100644
--- a/neutron/files/ocata/neutron-generic.conf.Debian
+++ b/neutron/files/ocata/neutron-generic.conf.Debian
@@ -37,7 +37,7 @@ auth_strategy = keystone
@@ -72,6 +72,15 @@ index 123386d..85b8076 100644
{% endif %}
+@@ -668,7 +668,7 @@ root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
+ # needs to execute commands in Dom0 in the hypervisor of XenServer, this item
+ # should be set to 'xenapi_root_helper', so that it will keep a XenAPI session
+ # to pass commands to Dom0. (string value)
+-root_helper_daemon = sudo neutron-rootwrap-daemon /etc/neutron/rootwrap.conf
++#root_helper_daemon = <None>
+
+ # Seconds between nodes reporting state to server; should be less than
+ # agent_down_time, best if it is half or less than agent_down_time. (floating
@@ -2092,3 +2092,8 @@ heartbeat_rate = 2
# Sets the list of available ciphers. value should be a string in the OpenSSL
# cipher list format. (string value)
@@ -82,7 +91,7 @@ index 123386d..85b8076 100644
+ovsdb_connection = {{ neutron.backend.ovsdb_connection }}
+{%- endif %}
diff --git a/neutron/files/ocata/neutron-server.conf.Debian b/neutron/files/ocata/neutron-server.conf.Debian
-index 79376a2..c9630b8 100644
+index 79376a2..a7a4645 100644
--- a/neutron/files/ocata/neutron-server.conf.Debian
+++ b/neutron/files/ocata/neutron-server.conf.Debian
@@ -50,7 +50,7 @@ core_plugin = neutron.plugins.ml2.plugin.Ml2Plugin
@@ -94,6 +103,15 @@ index 79376a2..c9630b8 100644
{%- if server.lbaas is defined -%},lbaasv2{%- endif -%}
{%- if fwaas.get('enabled', False) -%},{{ fwaas[fwaas.api_version]['service_plugin'] }}{%- endif -%}
{%- if server.get('qos', 'True') -%},neutron.services.qos.qos_plugin.QoSPlugin{%- endif -%}
+@@ -703,7 +703,7 @@ root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
+ # needs to execute commands in Dom0 in the hypervisor of XenServer, this item
+ # should be set to 'xenapi_root_helper', so that it will keep a XenAPI session
+ # to pass commands to Dom0. (string value)
+-root_helper_daemon = sudo neutron-rootwrap-daemon /etc/neutron/rootwrap.conf
++#root_helper_daemon = <None>
+
+ # Seconds between nodes reporting state to server; should be less than
+ # agent_down_time, best if it is half or less than agent_down_time. (floating
@@ -2245,3 +2245,8 @@ username = {{ server.identity.user }}
password = {{ server.identity.password }}
auth_url=http://{{ server.identity.host }}:35357
diff --git a/mcp/patches/0012-linux.storage.lvm-Disable-filter.patch b/mcp/patches/0012-linux.storage.lvm-Disable-filter.patch
new file mode 100644
index 000000000..de74fadcd
--- /dev/null
+++ b/mcp/patches/0012-linux.storage.lvm-Disable-filter.patch
@@ -0,0 +1,35 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+:
+: All rights reserved. This program and the accompanying materials
+: are made available under the terms of the Apache License, Version 2.0
+: which accompanies this distribution, and is available at
+: http://www.apache.org/licenses/LICENSE-2.0
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Sat, 18 Nov 2017 22:03:01 +0200
+Subject: [PATCH] linux.storage.lvm: Disable filter
+
+Due to upstream bug [1], mixing OS-managed LVM volumes with Cinder
+LVM volumes leads to a broken filter value in lvm.conf.
+Temporarily disable the filter (whitelisting all devices, similar
+to no-Cinder use-cases) until upstream bug is fixed.
+
+[1] https://github.com/salt-formulas/salt-formula-linux/issues/127
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+
+diff --git a/linux/files/lvm.conf b/linux/files/lvm.conf
+--- a/linux/files/lvm.conf
++++ b/linux/files/lvm.conf
+@@ -129,7 +129,8 @@
+ # Example
+ # Accept every block device:
+
+- filter = [ {%- for vgname, vg in storage.lvm.iteritems() %}{%- if vg.get('enabled', True) %}{%- for dev in vg.devices %}"a|{{ dev }}*|"{%- if not loop.last %},{%- endif %}{%- endfor %}{%- endif %}{%- endfor %}, "r|.*|" ]
++ # NOTE(opnfv): https://github.com/salt-formulas/salt-formula-linux/issues/127
++ # filter = [ {%- for vgname, vg in storage.lvm.iteritems() %}{%- if vg.get('enabled', True) %}{%- for dev in vg.devices %}"a|{{ dev }}*|"{%- if not loop.last %},{%- endif %}{%- endfor %}{%- endif %}{%- endfor %}, "r|.*|" ]
+
+ # filter = [ "a|.*/|" ]
+ # Reject the cdrom drive:
diff --git a/mcp/patches/0013-maas-region-Allow-subnets-without-fabrics.patch b/mcp/patches/0013-maas-region-Allow-subnets-without-fabrics.patch
new file mode 100644
index 000000000..1f55dc696
--- /dev/null
+++ b/mcp/patches/0013-maas-region-Allow-subnets-without-fabrics.patch
@@ -0,0 +1,31 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+:
+: All rights reserved. This program and the accompanying materials
+: are made available under the terms of the Apache License, Version 2.0
+: which accompanies this distribution, and is available at
+: http://www.apache.org/licenses/LICENSE-2.0
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Thu, 23 Nov 2017 03:33:01 +0200
+Subject: [PATCH] maas: region: Allow subnets without fabrics
+
+Configuring subnets should be possible without explicitly configuring
+fabrics.
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+
+diff --git a/maas/region.sls b/maas/region.sls
+--- a/maas/region.sls
++++ b/maas/region.sls
+@@ -186,7 +186,9 @@
+ - name: maas.process_subnets
+ - require:
+ - module: maas_config
++ {%- if region.get('fabrics', False) %}
+ - module: maas_fabrics
++ {%- endif %}
+ {%- endif %}
+
+ {%- if region.get('devices', False) %}
diff --git a/mcp/patches/patch.sh b/mcp/patches/patch.sh
index ca5c14111..1da3bc597 100755
--- a/mcp/patches/patch.sh
+++ b/mcp/patches/patch.sh
@@ -14,7 +14,7 @@ if [ -r "$1" ]; then
if [[ ! "${p_dest}" =~ '^#' ]] && [[ "${p_dest}" =~ $2 ]] && \
! patch --dry-run -Rd "${p_dest}" -r - -s -p1 < \
"/root/fuel/mcp/patches/${p_file}" > /dev/null; then
- patch -fd "${p_dest}" -p1 < "/root/fuel/mcp/patches/${p_file}"
+ patch -d "${p_dest}" -p1 < "/root/fuel/mcp/patches/${p_file}"
fi
done < "$1"
fi
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
index fb5a14cda..6358109ce 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
@@ -16,3 +16,5 @@
/usr/share/salt-formulas/env: 0009-seedng-module-Sync-salt-version.patch
/usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch
/usr/share/salt-formulas/reclass: 0011-service.horizon.server.cluster-Default-to-v2-API.patch
+/usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch
+/usr/share/salt-formulas/env: 0013-maas-region-Allow-subnets-without-fabrics.patch
diff --git a/mcp/patches/pharos/0006-extend-public-gateway-support.patch b/mcp/patches/pharos/0006-extend-public-gateway-support.patch
new file mode 100644
index 000000000..d7b6ae77e
--- /dev/null
+++ b/mcp/patches/pharos/0006-extend-public-gateway-support.patch
@@ -0,0 +1,62 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+:
+: All rights reserved. This program and the accompanying materials
+: are made available under the terms of the Apache License, Version 2.0
+: which accompanies this distribution, and is available at
+: http://www.apache.org/licenses/LICENSE-2.0
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+From: Guillermo Herrero <guillermo.herrero@enea.com>
+Date: Mon, 20 Nov 2017 11:33:29 +0100
+Subject: [PATCH] extend public gateway support
+
+JIRA: FUEL-305
+
+Change-Id: Ic5a2d499925aeec5b597394a059640ddae83fb2d
+Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
+---
+ config/installers/fuel/pod_config.yml.j2 | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2
+index bd815d5..e42e3d5 100644
+--- a/config/installers/fuel/pod_config.yml.j2
++++ b/config/installers/fuel/pod_config.yml.j2
+@@ -8,6 +8,9 @@
+ {%- if conf.net_config.public.dns is defined -%}
+ {%- set dns_public = conf['net_config']['public']['dns'] -%}
+ {%- endif -%}
++ {%- if conf.net_config.public.gateway is defined -%}
++ {%- set net_public_gw = conf['net_config']['public']['gateway'] -%}
++ {%- endif -%}
+ {%- set pxe_interface = conf['net_config']['admin']['interface'] -%}
+ {%- else -%}
+ {%- set net_admin = '192.168.11.0' -%}
+@@ -22,6 +25,10 @@
+ {%- if dns_public is not defined -%}
+ {%- set dns_public = [ '8.8.8.8', '8.8.4.4' ] -%}
+ {%- endif -%}
++{%- if net_public_gw is not defined -%}
++ {%- set net_public_gw = net_public | ipaddr_index('1') -%}
++{%- endif -%}
++
+ ---
+ parameters:
+ _param:
+@@ -55,6 +62,8 @@ parameters:
+ opnfv_openstack_proxy_address: {{ net_public | ipaddr_index('103') }}
+ opnfv_openstack_proxy_node01_address: {{ net_public | ipaddr_index('104') }}
+ opnfv_openstack_proxy_node02_address: {{ net_public | ipaddr_index('105') }}
++ opnfv_openstack_proxy_node01_control_address: {{ net_mgmt | ipaddr_index('104') }}
++ opnfv_openstack_proxy_node02_control_address: {{ net_mgmt | ipaddr_index('105') }}
+ opnfv_openstack_control_address: {{ net_mgmt | ipaddr_index('10') }}
+ opnfv_openstack_control_node01_address: {{ net_mgmt | ipaddr_index('11') }}
+ opnfv_openstack_control_node02_address: {{ net_mgmt | ipaddr_index('12') }}
+@@ -85,6 +94,7 @@ parameters:
+
+ opnfv_opendaylight_server_node01_single_address: {{ net_mgmt | ipaddr_index('111') }}
+
++ opnfv_net_public_gw: {{ net_public_gw }}
+ opnfv_name_servers: {{ dns_public }}
+ opnfv_dns_server01: '{{ dns_public[0] }}'
+
diff --git a/mcp/patches/reclass-system-salt-model/0001-Bring-in-opendaylight-support.patch b/mcp/patches/reclass-system-salt-model/0001-Bring-in-opendaylight-support.patch
index cc2200679..c7ba5a740 100644
--- a/mcp/patches/reclass-system-salt-model/0001-Bring-in-opendaylight-support.patch
+++ b/mcp/patches/reclass-system-salt-model/0001-Bring-in-opendaylight-support.patch
@@ -11,10 +11,22 @@ Date: Thu, 29 Jun 2017 12:22:42 +0400
Subject: [PATCH] Bring in opendaylight support
Change-Id: I3efec9a8b586a6c75b1c1635ad2a7024d73d9ad2
+---
+ neutron/control/opendaylight/cluster.yml | 17 +++++++++++++++++
+ neutron/control/opendaylight/single.yml | 15 +++++++++++++++
+ neutron/gateway/opendaylight/single.yml | 7 +++++++
+ opendaylight/server/single.yml | 2 ++
+ reclass/storage/system/opendaylight_control_single.yml | 13 +++++++++++++
+ 5 files changed, 54 insertions(+)
+ create mode 100644 neutron/control/opendaylight/cluster.yml
+ create mode 100644 neutron/control/opendaylight/single.yml
+ create mode 100644 neutron/gateway/opendaylight/single.yml
+ create mode 100644 opendaylight/server/single.yml
+ create mode 100644 reclass/storage/system/opendaylight_control_single.yml
diff --git a/neutron/control/opendaylight/cluster.yml b/neutron/control/opendaylight/cluster.yml
new file mode 100644
-index 00000000..a32e7abb
+index 0000000..a32e7ab
--- /dev/null
+++ b/neutron/control/opendaylight/cluster.yml
@@ -0,0 +1,17 @@
@@ -37,7 +49,7 @@ index 00000000..a32e7abb
+ driver: opendaylight_v2
diff --git a/neutron/control/opendaylight/single.yml b/neutron/control/opendaylight/single.yml
new file mode 100644
-index 00000000..053f14df
+index 0000000..053f14d
--- /dev/null
+++ b/neutron/control/opendaylight/single.yml
@@ -0,0 +1,15 @@
@@ -58,7 +70,7 @@ index 00000000..053f14df
+ driver: opendaylight_v2
diff --git a/neutron/gateway/opendaylight/single.yml b/neutron/gateway/opendaylight/single.yml
new file mode 100644
-index 00000000..21690017
+index 0000000..2169001
--- /dev/null
+++ b/neutron/gateway/opendaylight/single.yml
@@ -0,0 +1,7 @@
@@ -71,7 +83,7 @@ index 00000000..21690017
+ ovsdb_connection: tcp:127.0.0.1:6639
diff --git a/opendaylight/server/single.yml b/opendaylight/server/single.yml
new file mode 100644
-index 00000000..3d11872c
+index 0000000..3d11872
--- /dev/null
+++ b/opendaylight/server/single.yml
@@ -0,0 +1,2 @@
@@ -79,7 +91,7 @@ index 00000000..3d11872c
+- service.opendaylight.server.single
diff --git a/reclass/storage/system/opendaylight_control_single.yml b/reclass/storage/system/opendaylight_control_single.yml
new file mode 100644
-index 00000000..ad809f59
+index 0000000..ad809f5
--- /dev/null
+++ b/reclass/storage/system/opendaylight_control_single.yml
@@ -0,0 +1,13 @@
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example
index d7876282a..e5b852f32 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example
@@ -61,6 +61,7 @@ parameters:
opnfv_opendaylight_server_node01_single_address: 10.167.4.111
+ opnfv_net_public_gw: 172.30.10.1
opnfv_name_servers: ['8.8.8.8', '8.8.4.4']
opnfv_dns_server01: '8.8.8.8'
opnfv_net_mgmt_vlan: 300
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml
index 9dbc030e3..4fd9e0368 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml
@@ -10,6 +10,8 @@ parameters:
_param:
reclass_config_master: 10.20.0.2
opnfv_maas_mcp_address: 10.20.0.3
+ opnfv_net_mcpcontrol: 10.20.0.0
+ opnfv_net_mcpcontrol_mask: 255.255.255.0
# These should be moved to pod_config.yml and read based on PDF admin net
opnfv_maas_pxe_network_address: 192.168.11.0
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template
index cbd47ef80..1445917e6 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template
@@ -10,6 +10,8 @@ parameters:
_param:
reclass_config_master: ${SALT_MASTER}
opnfv_maas_mcp_address: ${MAAS_IP}
+ opnfv_net_mcpcontrol: ${SALT_MASTER%.*}.0
+ opnfv_net_mcpcontrol_mask: 255.255.255.0
# These should be moved to pod_config.yml and read based on PDF admin net
opnfv_maas_pxe_network_address: ${MAAS_PXE_NETWORK}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
index 004f72a41..7f2f57219 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
@@ -35,6 +35,10 @@ parameters:
# {dhcp,single}_nic are not used, but referenced
dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
+ linux:
+ network:
+ remove_iface_files:
+ - '/etc/network/interfaces.d/50-cloud-init.cfg'
salt:
control:
size: # RAM 4096,8192,16384,32768,65536
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_benchmark.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_benchmark.yml
deleted file mode 100644
index b9c3e168a..000000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_benchmark.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-parameters:
- _param:
- dhcp_nic: eth0
- single_nic: eth1
- linux:
- network:
- interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
index 30dda2f7f..7163a8108 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
@@ -7,7 +7,6 @@
##############################################################################
---
classes:
- - system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.storage.loopback
- system.glusterfs.client.cluster
@@ -47,6 +46,9 @@ parameters:
# yamllint disable-line rule:line-length
opts: "defaults,backup-volfile-servers=${_param:cluster_node01_address}:${_param:cluster_node02_address}:${_param:cluster_node03_address}"
linux:
+ network:
+ remove_iface_files:
+ - '/etc/network/interfaces.d/50-cloud-init.cfg'
system:
kernel:
sysctl:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_dashboard.yml
deleted file mode 100644
index e082d2681..000000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_dashboard.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - system.horizon.server.single
-parameters:
- _param:
- horizon_site_branding: OpenStack Dashboard
- dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
- single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
- linux:
- network:
- interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml
index 1d0e8d1c5..6239df2ef 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml
@@ -37,8 +37,28 @@ parameters:
linux:
network:
interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
+ dhcp:
+ enabled: true
+ type: eth
+ proto: dhcp
+ name: ${_param:dhcp_nic}
+ route:
+ mcpcontol:
+ address: ${_param:opnfv_net_mcpcontrol}
+ netmask: ${_param:opnfv_net_mcpcontrol_mask}
+ gateway: ${_param:opnfv_infra_maas_node01_deploy_address}
+ single:
+ enabled: true
+ type: eth
+ proto: static
+ name: ${_param:single_nic}
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+ route:
+ public:
+ address: 0.0.0.0
+ netmask: 0.0.0.0
+ gateway: ${_param:opnfv_net_public_gw}
control:
enabled: true
type: eth
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml
deleted file mode 100644
index 5ae972da9..000000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - cluster.baremetal-mcp-ocata-common.openstack_benchmark
- - cluster.baremetal-mcp-ocata-odl-ha
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
index fb78d3467..4418b0fde 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
@@ -7,6 +7,7 @@
##############################################################################
---
classes:
+ - system.linux.system.repo.mcp.openstack
- cluster.baremetal-mcp-ocata-common.openstack_compute
- cluster.baremetal-mcp-ocata-odl-ha.openstack.compute_init
- cluster.baremetal-mcp-ocata-odl-ha.infra
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml
deleted file mode 100644
index c60d7c46c..000000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - cluster.baremetal-mcp-ocata-common.openstack_dashboard
- - cluster.baremetal-mcp-ocata-odl-ha
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
index 7cb1c10c2..a516803fa 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
@@ -9,7 +9,6 @@
classes:
- cluster.baremetal-mcp-ocata-common.openstack_proxy
- cluster.baremetal-mcp-ocata-odl-ha.infra
- - cluster.baremetal-mcp-ocata-odl-ha.openstack.dashboard
parameters:
nginx:
server:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/benchmark.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/benchmark.yml
deleted file mode 100644
index 1c02ae4a2..000000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/benchmark.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - cluster.baremetal-mcp-ocata-common.openstack_benchmark
- - cluster.baremetal-mcp-ocata-ovs-dpdk-ha
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
index aa6b4e34f..e610dc930 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
@@ -7,6 +7,7 @@
##############################################################################
---
classes:
+ - system.linux.system.repo.mcp.openstack
- cluster.baremetal-mcp-ocata-common.openstack_compute
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
- system.neutron.compute.nfv.dpdk
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/dashboard.yml
deleted file mode 100644
index 278bf148f..000000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/dashboard.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - cluster.baremetal-mcp-ocata-common.openstack_dashboard
- - cluster.baremetal-mcp-ocata-ovs-dpdk-ha
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml
index 07da7eb19..63ff2c87e 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml
@@ -9,4 +9,3 @@
classes:
- cluster.baremetal-mcp-ocata-common.openstack_proxy
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
- - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.openstack.dashboard
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/benchmark.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/benchmark.yml
deleted file mode 100644
index 783561ad5..000000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/benchmark.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - cluster.baremetal-mcp-ocata-common.openstack_benchmark
- - cluster.baremetal-mcp-ocata-ovs-ha
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
index 128abb0e5..9ed3a80ea 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
@@ -10,3 +10,16 @@ classes:
- cluster.baremetal-mcp-ocata-common.openstack_compute
- cluster.baremetal-mcp-ocata-ovs-ha.openstack.compute_init
- cluster.baremetal-mcp-ocata-ovs-ha.infra
+parameters:
+ nova:
+ compute:
+ libvirt_service: libvirtd
+ libvirt_bin: /etc/default/libvirtd
+ linux:
+ system:
+ repo:
+ uca:
+ source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
+ architectures: amd64
+ key_id: EC4926EA
+ key_server: keyserver.ubuntu.com
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml
deleted file mode 100644
index 8dec9ed17..000000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - cluster.baremetal-mcp-ocata-common.openstack_dashboard
- - cluster.baremetal-mcp-ocata-ovs-ha
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
index f2a9d893a..9288e6f81 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
@@ -9,4 +9,3 @@
classes:
- cluster.baremetal-mcp-ocata-common.openstack_proxy
- cluster.baremetal-mcp-ocata-ovs-ha.infra
- - cluster.baremetal-mcp-ocata-ovs-ha.openstack.dashboard
diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system
-Subproject 4b335b98fae73d59af0eb4bf81e33369d55a94c
+Subproject 4edd3b5eec839a06a3369c8c0d47bbb79681e17
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index a03d25fc4..ab096f3ee 100755
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -12,19 +12,27 @@
CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x
F_GIT_ROOT=$(git rev-parse --show-toplevel)
-OPNFV_TMP_DIR="/home/${SALT_MASTER_USER}/fuel"
+F_GIT_DIR=$(cd "${F_GIT_ROOT}/mcp" && git rev-parse --git-dir)
+F_GIT_SUBD=${F_GIT_ROOT#${F_GIT_DIR%%/.git*}}
+OPNFV_TMP_DIR="/home/${SALT_MASTER_USER}/opnfv"
+OPNFV_GIT_DIR="/root/opnfv"
OPNFV_FUEL_DIR="/root/fuel"
OPNFV_RDIR="reclass/classes/cluster/all-mcp-ocata-common"
+LOCAL_GIT_DIR="${F_GIT_ROOT%${F_GIT_SUBD}}"
LOCAL_PDF_RECLASS=$1
+NODE_MASK='*'
-# push to cfg01 current git repo first (including submodules), at ~ubuntu/fuel
-# later we move it to ~root/fuel and delete the temporary clone
+[[ "${CLUSTER_DOMAIN}" =~ virtual ]] || NODE_MASK='mas01*'
+
+# push to cfg01 current git repo first (including submodules), at ~ubuntu/opnfv
+# later we move it to ~root/opnfv (and ln as ~root/fuel); delete the temp clone
+remote_tmp="${SSH_SALT}:$(basename "${OPNFV_TMP_DIR}")"
rsync -Erl --delete -e "ssh ${SSH_OPTS}" \
--exclude-from="${F_GIT_ROOT}/.gitignore" \
- "${F_GIT_ROOT}/" "${SSH_SALT}:$(basename "${OPNFV_TMP_DIR}")/"
+ "${LOCAL_GIT_DIR}/" "${remote_tmp}/"
if [ -n "${LOCAL_PDF_RECLASS}" ] && [ -f "${LOCAL_PDF_RECLASS}" ]; then
rsync -e "ssh ${SSH_OPTS}" "${LOCAL_PDF_RECLASS}" \
- "${SSH_SALT}:$(basename "${OPNFV_TMP_DIR}")/mcp/${OPNFV_RDIR}/opnfv/"
+ "${remote_tmp}${F_GIT_SUBD}/mcp/${OPNFV_RDIR}/opnfv/"
fi
# ssh to cfg01
@@ -32,14 +40,19 @@ fi
ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END
sudo -i
set -e
+ export CI_DEBUG=${CI_DEBUG}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x
echo -n 'Checking out cloud-init has finished running ...'
while [ ! -f /var/lib/cloud/instance/boot-finished ]; do echo -n '.'; sleep 1; done
echo ' done'
mkdir -p /srv/salt /usr/share/salt-formulas/reclass
- rm -rf ${OPNFV_FUEL_DIR}
- mv ${OPNFV_TMP_DIR} ${OPNFV_FUEL_DIR} && chown -R root.root ${OPNFV_FUEL_DIR}
+ rm -rf ${OPNFV_GIT_DIR}
+ mv ${OPNFV_TMP_DIR} ${OPNFV_GIT_DIR} && chown -R root.root ${OPNFV_GIT_DIR}
+ find ${OPNFV_GIT_DIR} -name '.git' -type f | while read f_git; do
+ sed -i 's@${LOCAL_GIT_DIR}@${OPNFV_GIT_DIR}@g' \$f_git
+ done
+ ln -sf ${OPNFV_GIT_DIR}${F_GIT_SUBD} ${OPNFV_FUEL_DIR}
ln -sf ${OPNFV_FUEL_DIR}/mcp/reclass /srv/salt
ln -sf ${OPNFV_FUEL_DIR}/mcp/deploy/scripts /srv/salt
cd /srv/salt/${OPNFV_RDIR} && rm -f arch && ln -sf "\$(uname -i)" arch
@@ -50,6 +63,7 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END
cd /srv/salt/scripts
export DEBIAN_FRONTEND=noninteractive
+ OLD_DOMAIN=\$(grep -Pzo "id: cfg01\.\K(\S*)" /etc/salt/minion.d/minion.conf) || true
BOOTSTRAP_SALTSTACK_OPTS=" -r -dX stable 2016.11 " \
MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} DISTRIB_REVISION=nightly \
EXTRA_FORMULAS="nfs" \
@@ -61,12 +75,24 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END
cd ${OPNFV_FUEL_DIR}/mcp/patches && ./patch.sh patches.list reclass
salt-call state.apply salt
- salt '*' saltutil.sync_all
- salt '*' state.apply salt | grep -Fq 'No response' && salt '*' state.apply salt
+
+ # In case scenario changed (and implicitly domain name), re-register minions
+ if [ -n "\${OLD_DOMAIN}" ] && [ "\${OLD_DOMAIN}" != "${CLUSTER_DOMAIN}" ]; then
+ salt "*.\${OLD_DOMAIN}" cmd.run "grep \${OLD_DOMAIN} -Rl /etc/salt | \
+ xargs --no-run-if-empty sed -i 's/\${OLD_DOMAIN}/${CLUSTER_DOMAIN}/g'; \
+ service salt-minion restart" || true
+ salt-key -yd "*.\${OLD_DOMAIN}"
+ salt-key -Ay
+ fi
+
+ # Init specific to VMs on FN (all for virtual, cfg|mas for baremetal)
+ salt -C "${NODE_MASK} or cfg01*" saltutil.sync_all
+ salt -C "${NODE_MASK} or cfg01*" state.apply salt | \
+ grep -Fq 'No response' && salt -C "${NODE_MASK} or cfg01*" state.apply salt
salt -C 'I@salt:master' state.sls linux
- salt -C '* and not cfg01*' state.sls linux || true
- salt -C '* and not cfg01*' pkg.upgrade refresh=False
+ salt -C "${NODE_MASK} and not cfg01*" state.sls linux || true
+ salt -C "${NODE_MASK} and not cfg01*" pkg.upgrade refresh=False
- salt '*' state.sls ntp
+ salt -C "${NODE_MASK} or cfg01*" state.sls ntp
SALT_INSTALL_END