patches/opnfv-fuel/0008-classes-baremetal-AArch64-virtio-NIC-names-sync.patch

   1 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
   2 Date: Sun, 6 Aug 2017 20:42:47 +0200
   3 Subject: [PATCH] classes: baremetal: AArch64: virtio NIC names sync
   4
   5 grep -e "ens[[:digit:]]" -R . -l | \
   6   xargs sed -i \
   7     -e 's/ens3/enp1s0/g' \
   8     -e 's/ens4/enp2s0/g' \
   9     -e 's/ens5/enp3s0/g' \
  10     -e 's/ens6/enp4s0/g'
  11
  12 Since AArch64 will be using virtio-net-pci NIC model for guests,
  13 predictable interface naming yields a slightly different scheme.
  14
  15 Update all configuration to reflect this.
  16
  17 NOTE: Above configuration is expected with libvirt 3.x, which puts
  18 each NIC on a separate PCIe bus (which also imposes virtio modern
  19 is used).
  20
  21 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  22 ---
  23  .../baremetal-mcp-ocata-ovs-ha/infra/config.yml    |  4 ++--
  24  .../baremetal-mcp-ocata-ovs-ha/infra/kvm.yml       | 18 ++++++++++-----
  25  .../baremetal-mcp-ocata-ovs-ha/infra/maas.yml      |  8 +++----
  26  .../openstack/compute.yml                          | 27 ++++++++--------------
  27  .../openstack/control.yml                          |  6 ++---
  28  .../openstack/dashboard.yml                        |  4 ++--
  29  .../openstack/database.yml                         |  6 ++---
  30  .../openstack/message_queue.yml                    |  6 ++---
  31  .../baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml |  6 ++---
  32  .../openstack/telemetry.yml                        |  6 ++---
  33  10 files changed, 45 insertions(+), 46 deletions(-)
  34
  35 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml
  36 index ce2c951..7d95ebc 100644
  37 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml
  38 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml
  39 @@ -32,8 +32,8 @@ parameters:
  40    linux:
  41      network:
  42        interface:
  43 -        ens3: ${_param:linux_dhcp_interface}
  44 -        ens4: ${_param:linux_single_interface}
  45 +        enp1s0: ${_param:linux_dhcp_interface}
  46 +        enp2s0: ${_param:linux_single_interface}
  47    salt:
  48      master:
  49        accept_policy: open_mode
  50 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
  51 index 1608c65..8677a79 100644
  52 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
  53 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
  54 @@ -25,7 +25,8 @@ parameters:
  55      cluster_node03_address: ${_param:infra_kvm_node03_address}
  56      keepalived_vip_interface: br-ctl
  57      keepalived_vip_virtual_router_id: 69
  58 -    deploy_nic: enp6s0
  59 +    deploy_nic: eth0
  60 +    trunk_nic: eth1
  61    salt:
  62      control:
  63        size: #RAM 4096,8192,16384,32768,65536
  64 @@ -115,7 +116,7 @@ parameters:
  65    linux:
  66      network:
  67        interface:
  68 -        eth3:
  69 +        eth0:
  70            enabled: true
  71            type: eth
  72            proto: manual
  73 @@ -123,6 +124,11 @@ parameters:
  74            netmask: 255.255.255.0
  75            name: ${_param:deploy_nic}
  76            noifupdown: true
  77 +        eth1:
  78 +          enabled: true
  79 +          type: eth
  80 +          proto: manual
  81 +          name: ${_param:trunk_nic}
  82          br-mgmt:
  83            enabled: true
  84            proto: dhcp
  85 @@ -133,13 +139,13 @@ parameters:
  86            use_interfaces:
  87            - ${_param:deploy_nic}
  88            noifupdown: true
  89 -        vlan300:
  90 +        vlan2183:
  91            enabled: true
  92            proto: manual
  93            type: vlan
  94 -          name: ${_param:deploy_nic}.300
  95 +          name: ${_param:trunk_nic}.2183
  96            use_interfaces:
  97 -          - ${_param:deploy_nic}
  98 +          - ${_param:trunk_nic}
  99          br-ctl:
 100            enabled: true
 101            type: bridge
 102 @@ -147,4 +153,4 @@ parameters:
 103            address: ${_param:single_address}
 104            netmask: 255.255.255.0
 105            use_interfaces:
 106 -          - ${_param:deploy_nic}.300
 107 +          - ${_param:trunk_nic}.2183
 108 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
 109 index d193469..73215ee 100644
 110 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
 111 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
 112 @@ -4,10 +4,10 @@ classes:
 113  - cluster.baremetal-mcp-ocata-ovs-ha.infra
 114  parameters:
 115    _param:
 116 -    dhcp_interface: ens3
 117 -    primary_interface: ens4
 118 -    pxe_interface: ens5
 119 -    external_interface: ens6
 120 +    dhcp_interface: enp1s0
 121 +    primary_interface: enp2s0
 122 +    pxe_interface: enp3s0
 123 +    external_interface: enp4s0
 124      interface_mtu: 1500
 125      # MaaS has issues using MTU > 1500 for PXE interface
 126      pxe_interface_mtu: 1500
 127 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
 128 index 070ab78..88150b0 100644
 129 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
 130 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
 131 @@ -19,9 +19,8 @@ parameters:
 132      cluster_node03_hostname: ctl03
 133      cluster_node03_address: ${_param:openstack_control_node03_address}
 134      nova_vncproxy_url: https://${_param:cluster_public_host}:6080
 135 -    mgmt_nic: enp6s0
 136 -    tenant_nic: enp7s0
 137 -    external_nic: enp8s0
 138 +    mgmt_nic: eth0
 139 +    tenant_nic: eth1
 140      linux_system_codename: xenial
 141      interface_mtu: 1500
 142      keepalived_vip_interface: br-ctl
 143 @@ -40,12 +39,6 @@ parameters:
 144            type: eth
 145            proto: manual
 146            name: ${_param:tenant_nic}
 147 -        external_nic:
 148 -          enabled: true
 149 -          name: ${_param:external_nic}
 150 -          mtu: ${_param:interface_mtu}
 151 -          proto: manual
 152 -          type: eth
 153          br-mesh:
 154            enabled: true
 155            type: bridge
 156 @@ -53,19 +46,19 @@ parameters:
 157            netmask: 255.255.255.0
 158            mtu: 1500
 159            use_interfaces:
 160 -          - ${_param:tenant_nic}.302
 161 -        vlan300:
 162 +          - ${_param:tenant_nic}.2185
 163 +        vlan2183:
 164            enabled: true
 165            proto: manual
 166            type: vlan
 167 -          name: ${_param:mgmt_nic}.300
 168 +          name: ${_param:tenant_nic}.2183
 169            use_interfaces:
 170 -          - ${_param:mgmt_nic}
 171 -        vlan302:
 172 +          - ${_param:tenant_nic}
 173 +        vlan2185:
 174            enabled: true
 175            proto: manual
 176            type: vlan
 177 -          name: ${_param:tenant_nic}.302
 178 +          name: ${_param:tenant_nic}.2185
 179            use_interfaces:
 180            - ${_param:tenant_nic}
 181          br-ctl:
 182 @@ -75,7 +68,7 @@ parameters:
 183            address: ${_param:single_address}
 184            netmask: 255.255.255.0
 185            use_interfaces:
 186 -          - ${_param:mgmt_nic}.300
 187 +          - ${_param:tenant_nic}.2183
 188          br-floating:
 189            enabled: true
 190            type: ovs_bridge
 191 @@ -92,6 +85,6 @@ parameters:
 192            address: ${_param:external_address}
 193            netmask: 255.255.255.0
 194            use_interfaces:
 195 -          - ${_param:external_nic}
 196 +          - ${_param:tenant_nic}
 197            use_ovs_ports:
 198            - float-to-ex
 199 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml
 200 index 6f47f8a..5ba1411 100644
 201 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml
 202 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml
 203 @@ -23,7 +23,7 @@ classes:
 204  - cluster.baremetal-mcp-ocata-ovs-ha.infra
 205  parameters:
 206    _param:
 207 -    keepalived_vip_interface: ens3
 208 +    keepalived_vip_interface: enp2s0
 209      keepalived_vip_virtual_router_id: 50
 210      cluster_vip_address: ${_param:openstack_control_address}
 211      cluster_local_address: ${_param:single_address}
 212 @@ -37,8 +37,8 @@ parameters:
 213    linux:
 214      network:
 215        interface:
 216 -        ens2: ${_param:linux_dhcp_interface}
 217 -        ens3: ${_param:linux_single_interface}
 218 +        enp1s0: ${_param:linux_dhcp_interface}
 219 +        enp2s0: ${_param:linux_single_interface}
 220    bind:
 221      server:
 222        control:
 223 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
 224 index 39cc073..18f622c 100644
 225 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml
 226 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml
 227 @@ -7,5 +7,5 @@ parameters:
 228    linux:
 229      network:
 230        interface:
 231 -        ens2: ${_param:linux_dhcp_interface}
 232 -        ens3: ${_param:linux_single_interface}
 233 +        enp1s0: ${_param:linux_dhcp_interface}
 234 +        enp2s0: ${_param:linux_single_interface}
 235 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml
 236 index dabda49..7a6934b 100644
 237 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml
 238 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml
 239 @@ -16,7 +16,7 @@ classes:
 240  - cluster.baremetal-mcp-ocata-ovs-ha
 241  parameters:
 242    _param:
 243 -    keepalived_vip_interface: ens3
 244 +    keepalived_vip_interface: enp2s0
 245      keepalived_vip_virtual_router_id: 80
 246      galera_server_cluster_name: openstack_cluster
 247      cluster_vip_address: ${_param:openstack_database_address}
 248 @@ -30,5 +30,5 @@ parameters:
 249    linux:
 250      network:
 251        interface:
 252 -        ens2: ${_param:linux_dhcp_interface}
 253 -        ens3: ${_param:linux_single_interface}
 254 +        enp1s0: ${_param:linux_dhcp_interface}
 255 +        enp2s0: ${_param:linux_single_interface}
 256 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml
 257 index 881644b..f510a7b 100644
 258 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml
 259 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml
 260 @@ -7,7 +7,7 @@ classes:
 261  - cluster.baremetal-mcp-ocata-ovs-ha
 262  parameters:
 263    _param:
 264 -    keepalived_vip_interface: ens3
 265 +    keepalived_vip_interface: enp2s0
 266      keepalived_vip_virtual_router_id: 90
 267      cluster_vip_address: ${_param:openstack_message_queue_address}
 268      cluster_local_address: ${_param:single_address}
 269 @@ -20,5 +20,5 @@ parameters:
 270    linux:
 271      network:
 272        interface:
 273 -        ens2: ${_param:linux_dhcp_interface}
 274 -        ens3: ${_param:linux_single_interface}
 275 +        enp1s0: ${_param:linux_dhcp_interface}
 276 +        enp2s0: ${_param:linux_single_interface}
 277 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
 278 index 2147741..4e25b78 100644
 279 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
 280 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
 281 @@ -15,7 +15,7 @@ classes:
 282  # - cluster.baremetal-mcp-ocata-ovs-ha.stacklight.proxy
 283  parameters:
 284    _param:
 285 -    keepalived_vip_interface: ens3
 286 +    keepalived_vip_interface: enp2s0
 287      keepalived_vip_virtual_router_id: 240
 288      nginx_proxy_ssl:
 289        enabled: true
 290 @@ -27,8 +27,8 @@ parameters:
 291    linux:
 292      network:
 293        interface:
 294 -        ens2: ${_param:linux_dhcp_interface}
 295 -        ens3: ${_param:linux_single_interface}
 296 +        enp1s0: ${_param:linux_dhcp_interface}
 297 +        enp2s0: ${_param:linux_single_interface}
 298      system:
 299        package:
 300          libapache2-mod-wsgi:
 301 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml
 302 index 505ee7f..6ad13ae 100644
 303 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml
 304 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml
 305 @@ -10,7 +10,7 @@ classes:
 306  - cluster.baremetal-mcp-ocata-ovs-ha.infra
 307  parameters:
 308    _param:
 309 -    keepalived_vip_interface: ens3
 310 +    keepalived_vip_interface: enp2s0
 311      keepalived_vip_virtual_router_id: 230
 312      cluster_vip_address: ${_param:openstack_telemetry_address}
 313      cluster_local_address: ${_param:single_address}
 314 @@ -23,5 +23,5 @@ parameters:
 315    linux:
 316      network:
 317        interface:
 318 -        ens2: ${_param:linux_dhcp_interface}
 319 -        ens3: ${_param:linux_single_interface}
 320 +        enp1s0: ${_param:linux_dhcp_interface}
 321 +        enp2s0: ${_param:linux_single_interface}