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                           | 21 ++++++++++-----------
  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(+), 40 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..e932f0d 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 @@ -53,19 +52,19 @@ parameters:
 144            netmask: 255.255.255.0
 145            mtu: 1500
 146            use_interfaces:
 147 -          - ${_param:tenant_nic}.302
 148 -        vlan300:
 149 +          - ${_param:tenant_nic}.2185
 150 +        vlan2183:
 151            enabled: true
 152            proto: manual
 153            type: vlan
 154 -          name: ${_param:mgmt_nic}.300
 155 +          name: ${_param:tenant_nic}.2183
 156            use_interfaces:
 157 -          - ${_param:mgmt_nic}
 158 -        vlan302:
 159 +          - ${_param:tenant_nic}
 160 +        vlan2185:
 161            enabled: true
 162            proto: manual
 163            type: vlan
 164 -          name: ${_param:tenant_nic}.302
 165 +          name: ${_param:tenant_nic}.2185
 166            use_interfaces:
 167            - ${_param:tenant_nic}
 168          br-ctl:
 169 @@ -75,7 +74,7 @@ parameters:
 170            address: ${_param:single_address}
 171            netmask: 255.255.255.0
 172            use_interfaces:
 173 -          - ${_param:mgmt_nic}.300
 174 +          - ${_param:tenant_nic}.2183
 175          br-floating:
 176            enabled: true
 177            type: ovs_bridge
 178 @@ -92,6 +91,6 @@ parameters:
 179            address: ${_param:external_address}
 180            netmask: 255.255.255.0
 181            use_interfaces:
 182 -          - ${_param:external_nic}
 183 +          - ${_param:tenant_nic}
 184            use_ovs_ports:
 185            - float-to-ex
 186 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
 187 index 6f47f8a..5ba1411 100644
 188 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml
 189 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml
 190 @@ -23,7 +23,7 @@ classes:
 191  - cluster.baremetal-mcp-ocata-ovs-ha.infra
 192  parameters:
 193    _param:
 194 -    keepalived_vip_interface: ens3
 195 +    keepalived_vip_interface: enp2s0
 196      keepalived_vip_virtual_router_id: 50
 197      cluster_vip_address: ${_param:openstack_control_address}
 198      cluster_local_address: ${_param:single_address}
 199 @@ -37,8 +37,8 @@ parameters:
 200    linux:
 201      network:
 202        interface:
 203 -        ens2: ${_param:linux_dhcp_interface}
 204 -        ens3: ${_param:linux_single_interface}
 205 +        enp1s0: ${_param:linux_dhcp_interface}
 206 +        enp2s0: ${_param:linux_single_interface}
 207    bind:
 208      server:
 209        control:
 210 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
 211 index 39cc073..18f622c 100644
 212 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml
 213 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml
 214 @@ -7,5 +7,5 @@ parameters:
 215    linux:
 216      network:
 217        interface:
 218 -        ens2: ${_param:linux_dhcp_interface}
 219 -        ens3: ${_param:linux_single_interface}
 220 +        enp1s0: ${_param:linux_dhcp_interface}
 221 +        enp2s0: ${_param:linux_single_interface}
 222 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
 223 index dabda49..7a6934b 100644
 224 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml
 225 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml
 226 @@ -16,7 +16,7 @@ classes:
 227  - cluster.baremetal-mcp-ocata-ovs-ha
 228  parameters:
 229    _param:
 230 -    keepalived_vip_interface: ens3
 231 +    keepalived_vip_interface: enp2s0
 232      keepalived_vip_virtual_router_id: 80
 233      galera_server_cluster_name: openstack_cluster
 234      cluster_vip_address: ${_param:openstack_database_address}
 235 @@ -30,5 +30,5 @@ parameters:
 236    linux:
 237      network:
 238        interface:
 239 -        ens2: ${_param:linux_dhcp_interface}
 240 -        ens3: ${_param:linux_single_interface}
 241 +        enp1s0: ${_param:linux_dhcp_interface}
 242 +        enp2s0: ${_param:linux_single_interface}
 243 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
 244 index 881644b..f510a7b 100644
 245 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml
 246 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml
 247 @@ -7,7 +7,7 @@ classes:
 248  - cluster.baremetal-mcp-ocata-ovs-ha
 249  parameters:
 250    _param:
 251 -    keepalived_vip_interface: ens3
 252 +    keepalived_vip_interface: enp2s0
 253      keepalived_vip_virtual_router_id: 90
 254      cluster_vip_address: ${_param:openstack_message_queue_address}
 255      cluster_local_address: ${_param:single_address}
 256 @@ -20,5 +20,5 @@ parameters:
 257    linux:
 258      network:
 259        interface:
 260 -        ens2: ${_param:linux_dhcp_interface}
 261 -        ens3: ${_param:linux_single_interface}
 262 +        enp1s0: ${_param:linux_dhcp_interface}
 263 +        enp2s0: ${_param:linux_single_interface}
 264 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
 265 index 2147741..4e25b78 100644
 266 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
 267 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
 268 @@ -15,7 +15,7 @@ classes:
 269  # - cluster.baremetal-mcp-ocata-ovs-ha.stacklight.proxy
 270  parameters:
 271    _param:
 272 -    keepalived_vip_interface: ens3
 273 +    keepalived_vip_interface: enp2s0
 274      keepalived_vip_virtual_router_id: 240
 275      nginx_proxy_ssl:
 276        enabled: true
 277 @@ -27,8 +27,8 @@ parameters:
 278    linux:
 279      network:
 280        interface:
 281 -        ens2: ${_param:linux_dhcp_interface}
 282 -        ens3: ${_param:linux_single_interface}
 283 +        enp1s0: ${_param:linux_dhcp_interface}
 284 +        enp2s0: ${_param:linux_single_interface}
 285      system:
 286        package:
 287          libapache2-mod-wsgi:
 288 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
 289 index 505ee7f..6ad13ae 100644
 290 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml
 291 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml
 292 @@ -10,7 +10,7 @@ classes:
 293  - cluster.baremetal-mcp-ocata-ovs-ha.infra
 294  parameters:
 295    _param:
 296 -    keepalived_vip_interface: ens3
 297 +    keepalived_vip_interface: enp2s0
 298      keepalived_vip_virtual_router_id: 230
 299      cluster_vip_address: ${_param:openstack_telemetry_address}
 300      cluster_local_address: ${_param:single_address}
 301 @@ -23,5 +23,5 @@ parameters:
 302    linux:
 303      network:
 304        interface:
 305 -        ens2: ${_param:linux_dhcp_interface}
 306 -        ens3: ${_param:linux_single_interface}
 307 +        enp1s0: ${_param:linux_dhcp_interface}
 308 +        enp2s0: ${_param:linux_single_interface}