aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xmcp/config/states/maas5
-rw-r--r--mcp/patches/0002-maas-region-skip-credentials-update.patch2
-rw-r--r--mcp/patches/0003-maas-region-force-artifact-download.patch2
-rw-r--r--mcp/patches/0004-maas-region-use-authorized_keys-1st-entry.patch2
-rw-r--r--mcp/patches/0005-maas-vlan-DHCP-enable-on-fabric-2.patch2
-rw-r--r--mcp/patches/0006-linux.network.interface-noifupdown-support.patch2
6 files changed, 8 insertions, 7 deletions
diff --git a/mcp/config/states/maas b/mcp/config/states/maas
index 7b3bb6433..e470cea80 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -41,8 +41,9 @@ salt -C 'mas01*' pillar.item\
# KVM, compute node prereqs (libvirt first), VCP deployment
salt -C '* and not cfg01* and not mas01*' saltutil.sync_all
-salt 'kvm*' pkg.install bridge-utils
-salt 'kvm*' cmd.run 'salt-call state.sls linux.network; reboot'
+salt -C 'kvm*' pkg.install bridge-utils
+salt -C 'kvm*' state.apply linux.network
+salt -C 'kvm*' system.reboot
wait_for "! salt '*' test.ping | fgrep -q 'Not connected'"
salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp
diff --git a/mcp/patches/0002-maas-region-skip-credentials-update.patch b/mcp/patches/0002-maas-region-skip-credentials-update.patch
index f2104e51f..59fe457b5 100644
--- a/mcp/patches/0002-maas-region-skip-credentials-update.patch
+++ b/mcp/patches/0002-maas-region-skip-credentials-update.patch
@@ -24,7 +24,7 @@ index d3227ca..8a2243d 100644
- - group: maas
+ file.replace:
+ - pattern: ^maas_url.*$
-+ - repl: "maas_url: http://{{ region.bind.host }}/MAAS"
++ - repl: "maas_url: http://{{ region.bind.host }}:5240/MAAS"
- require:
- pkg: maas_region_packages
diff --git a/mcp/patches/0003-maas-region-force-artifact-download.patch b/mcp/patches/0003-maas-region-force-artifact-download.patch
index 72114bb48..646bed34f 100644
--- a/mcp/patches/0003-maas-region-force-artifact-download.patch
+++ b/mcp/patches/0003-maas-region-force-artifact-download.patch
@@ -24,7 +24,7 @@ index d3227ca..8a2243d 100644
+maas_force_artifact_sync:
+ cmd.run:
-+ - name: "maas login {{ region.admin.username }} http://{{ region.bind.host }}/MAAS/api/2.0 - < /var/lib/maas/.maas_credentials && while ! grep -qzE '(Unable to probe for DHCP servers|DHCP probe complete).*Rack controller' /var/log/maas/rackd.log; do sleep 5; echo -n '.'; done && maas opnfv boot-resources import && while maas opnfv boot-resources is-importing | grep -q -e 'true'; do sleep 5; echo -n '.'; done && maas opnfv rack-controllers import-boot-images && while ! test -d /var/lib/maas/boot-resources/current/ubuntu; do sleep 5; echo -n '.'; done"
++ - name: "maas login {{ region.admin.username }} http://{{ region.bind.host }}:5240/MAAS/api/2.0 - < /var/lib/maas/.maas_credentials && while ! grep -qzE '(Unable to probe for DHCP servers|DHCP probe complete).*Rack controller' /var/log/maas/rackd.log; do sleep 5; echo -n '.'; done && maas opnfv boot-resources import && while maas opnfv boot-resources is-importing | grep -q -e 'true'; do sleep 5; echo -n '.'; done && maas opnfv rack-controllers import-boot-images && while ! test -d /var/lib/maas/boot-resources/current/ubuntu; do sleep 5; echo -n '.'; done"
+ - require:
+ - cmd: maas_login_admin
+
diff --git a/mcp/patches/0004-maas-region-use-authorized_keys-1st-entry.patch b/mcp/patches/0004-maas-region-use-authorized_keys-1st-entry.patch
index 381acb324..b7322e3d2 100644
--- a/mcp/patches/0004-maas-region-use-authorized_keys-1st-entry.patch
+++ b/mcp/patches/0004-maas-region-use-authorized_keys-1st-entry.patch
@@ -27,7 +27,7 @@ index d3227ca..8a2243d 100644
+# - name: maas.process_sshprefs
+# - require:
+ cmd.run:
-+ - name: "maas login {{ region.admin.username }} http://{{ region.bind.host }}/MAAS/api/2.0 - < /var/lib/maas/.maas_credentials && SSH_KEY=$(cat authorized_keys | head -1) && maas opnfv sshkeys create \"key=$SSH_KEY\""
++ - name: "maas login {{ region.admin.username }} http://{{ region.bind.host }}:5240/MAAS/api/2.0 - < /var/lib/maas/.maas_credentials && SSH_KEY=$(cat authorized_keys | head -1) && maas opnfv sshkeys create \"key=$SSH_KEY\""
+ - cwd: "/home/ubuntu/.ssh"
- require:
- module: maas_config
diff --git a/mcp/patches/0005-maas-vlan-DHCP-enable-on-fabric-2.patch b/mcp/patches/0005-maas-vlan-DHCP-enable-on-fabric-2.patch
index db37e731e..777850446 100644
--- a/mcp/patches/0005-maas-vlan-DHCP-enable-on-fabric-2.patch
+++ b/mcp/patches/0005-maas-vlan-DHCP-enable-on-fabric-2.patch
@@ -20,7 +20,7 @@ index d3227ca..8a2243d 100644
+maas_vlan_dhcp:
+# NOTE(armband): To be implemented via _modules/maas.py later
+ cmd.run:
-+ - name: "maas login {{ region.admin.username }} http://{{ region.bind.host }}/MAAS/api/2.0 - < /var/lib/maas/.maas_credentials && maas opnfv vlan update 2 0 dhcp_on=True primary_rack={{ region.maas_config.maas_name }}"
++ - name: "maas login {{ region.admin.username }} http://{{ region.bind.host }}:5240/MAAS/api/2.0 - < /var/lib/maas/.maas_credentials && maas opnfv vlan update 2 0 dhcp_on=True primary_rack={{ region.maas_config.maas_name }}"
+ - require:
+ - module: maas_subnets
+ - module: maas_dhcp_snippets
diff --git a/mcp/patches/0006-linux.network.interface-noifupdown-support.patch b/mcp/patches/0006-linux.network.interface-noifupdown-support.patch
index f4b7de803..5d9ce7be5 100644
--- a/mcp/patches/0006-linux.network.interface-noifupdown-support.patch
+++ b/mcp/patches/0006-linux.network.interface-noifupdown-support.patch
@@ -20,7 +20,7 @@ index d3227ca..8a2243d 100644
'updelay',
'hashing-algorithm',
'hardware-dma-ring-rx',
-+ 'ifupdown',
++ 'noifupdown',
] %}
{% set network = salt['grains.filter_by']({