diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-17 16:40:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-17 16:40:38 +0000 |
| commit | dc0e2355b21ab954456c9db7af1161359c966d57 (patch) | |
| tree | 76da165eccda65852338f1647c8f5ad92aa53e07 /mcp/patches/0005-maas-vlan-DHCP-enable-on-fabric-2.patch | |
| parent | 7b217895f7b379d396a9bac9a87590be832dc1cf (diff) | |
| parent | 5039d069265df15ed3d8e41f7a1c7f9457a9d58a (diff) | |
Merge "Bring in baremetal support"
Diffstat (limited to 'mcp/patches/0005-maas-vlan-DHCP-enable-on-fabric-2.patch')
| -rw-r--r-- | mcp/patches/0005-maas-vlan-DHCP-enable-on-fabric-2.patch | 28 |
1 files changed, 28 insertions, 0 deletions
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 new file mode 100644 index 000000000..db37e731e --- /dev/null +++ b/mcp/patches/0005-maas-vlan-DHCP-enable-on-fabric-2.patch @@ -0,0 +1,28 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Sat, 5 Aug 2017 02:03:01 +0200 +Subject: [PATCH] maas: vlan DHCP enable on fabric-2 + +MaaS custom py modules does not implement vlan API support, +so use MaaS CLI directly to enable DHCP on vlan 0 on fabric-2. + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com> +--- + +diff --git a/maas/region.sls b/maas/region.sls +index d3227ca..8a2243d 100644 +--- a/maas/region.sls ++++ b/maas/region.sls +@@ -190,4 +190,12 @@ + - require: + - module: maas_config + ++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 }}" ++ - require: ++ - module: maas_subnets ++ - module: maas_dhcp_snippets ++ + {%- endif %} |