patches/opnfv-fuel/0009-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  .../cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml   | 18 ++++++++++++------
  25  .../cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml  |  8 ++++----
  26  .../baremetal-mcp-ocata-ovs-ha/openstack/compute.yml   | 18 +++++++++---------
  27  .../baremetal-mcp-ocata-ovs-ha/openstack/control.yml   |  4 ++--
  28  .../baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml |  2 +-
  29  .../baremetal-mcp-ocata-ovs-ha/openstack/database.yml  |  4 ++--
  30  .../openstack/message_queue.yml                        |  4 ++--
  31  .../baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml     |  4 ++--
  32  .../baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml |  4 ++--
  33  10 files changed, 38 insertions(+), 32 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 77443de..824b979 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 @@ -33,8 +33,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 5c33f9e..8b09e76 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 a7a502f..694fae7 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 18a7a0b..d052e23 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,8 +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 +    mgmt_nic: eth0
 138 +    tenant_nic: eth1
 139      linux_system_codename: xenial
 140    linux:
 141      network:
 142 @@ -43,19 +43,19 @@ parameters:
 143            netmask: 255.255.255.0
 144            mtu: 1500
 145            use_interfaces:
 146 -          - ${_param:tenant_nic}.302
 147 -        vlan300:
 148 +          - ${_param:tenant_nic}.2185
 149 +        vlan2183:
 150            enabled: true
 151            proto: manual
 152            type: vlan
 153 -          name: ${_param:mgmt_nic}.300
 154 +          name: ${_param:tenant_nic}.2183
 155            use_interfaces:
 156 -          - ${_param:mgmt_nic}
 157 -        vlan302:
 158 +          - ${_param:tenant_nic}
 159 +        vlan2185:
 160            enabled: true
 161            proto: manual
 162            type: vlan
 163 -          name: ${_param:tenant_nic}.302
 164 +          name: ${_param:tenant_nic}.2185
 165            use_interfaces:
 166            - ${_param:tenant_nic}
 167          br-ctl:
 168 @@ -65,4 +65,4 @@ parameters:
 169            address: ${_param:single_address}
 170            netmask: 255.255.255.0
 171            use_interfaces:
 172 -          - ${_param:mgmt_nic}.300
 173 +          - ${_param:tenant_nic}.2183
 174 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
 175 index 995c50c..97f44ca 100644
 176 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml
 177 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml
 178 @@ -23,7 +23,7 @@ classes:
 179  - cluster.baremetal-mcp-ocata-ovs-ha.infra
 180  parameters:
 181    _param:
 182 -    keepalived_vip_interface: ens3
 183 +    keepalived_vip_interface: enp1s0
 184      keepalived_vip_virtual_router_id: 50
 185      cluster_vip_address: ${_param:openstack_control_address}
 186      cluster_local_address: ${_param:single_address}
 187 @@ -37,7 +37,7 @@ parameters:
 188    linux:
 189      network:
 190        interface:
 191 -        ens3: ${_param:linux_single_interface}
 192 +        enp1s0: ${_param:linux_single_interface}
 193    bind:
 194      server:
 195        control:
 196 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
 197 index b7ed814..bfca091 100644
 198 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml
 199 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml
 200 @@ -7,4 +7,4 @@ parameters:
 201    linux:
 202      network:
 203        interface:
 204 -        ens3: ${_param:linux_single_interface}
 205 +        enp1s0: ${_param:linux_single_interface}
 206 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
 207 index c0e21aa..3fcf34b 100644
 208 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml
 209 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml
 210 @@ -16,7 +16,7 @@ classes:
 211  - cluster.baremetal-mcp-ocata-ovs-ha
 212  parameters:
 213    _param:
 214 -    keepalived_vip_interface: ens3
 215 +    keepalived_vip_interface: enp1s0
 216      keepalived_vip_virtual_router_id: 80
 217      galera_server_cluster_name: openstack_cluster
 218      cluster_vip_address: ${_param:openstack_database_address}
 219 @@ -30,4 +30,4 @@ parameters:
 220    linux:
 221      network:
 222        interface:
 223 -        ens3: ${_param:linux_single_interface}
 224 +        enp1s0: ${_param:linux_single_interface}
 225 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
 226 index 3b79030..4910196 100644
 227 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml
 228 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml
 229 @@ -7,7 +7,7 @@ classes:
 230  - cluster.baremetal-mcp-ocata-ovs-ha
 231  parameters:
 232    _param:
 233 -    keepalived_vip_interface: ens3
 234 +    keepalived_vip_interface: enp1s0
 235      keepalived_vip_virtual_router_id: 90
 236      cluster_vip_address: ${_param:openstack_message_queue_address}
 237      cluster_local_address: ${_param:single_address}
 238 @@ -20,4 +20,4 @@ parameters:
 239    linux:
 240      network:
 241        interface:
 242 -        ens3: ${_param:linux_single_interface}
 243 +        enp1s0: ${_param:linux_single_interface}
 244 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
 245 index 2695c96..d146d8a 100644
 246 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
 247 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
 248 @@ -15,7 +15,7 @@ classes:
 249  # - cluster.baremetal-mcp-ocata-ovs-ha.stacklight.proxy
 250  parameters:
 251    _param:
 252 -    keepalived_vip_interface: ens3
 253 +    keepalived_vip_interface: enp1s0
 254      keepalived_vip_virtual_router_id: 240
 255      nginx_proxy_ssl:
 256        enabled: true
 257 @@ -27,7 +27,7 @@ parameters:
 258    linux:
 259      network:
 260        interface:
 261 -        ens3: ${_param:linux_single_interface}
 262 +        enp1s0: ${_param:linux_single_interface}
 263      system:
 264        package:
 265          libapache2-mod-wsgi:
 266 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
 267 index ca655dd..69ca07f 100644
 268 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml
 269 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml
 270 @@ -10,7 +10,7 @@ classes:
 271  - cluster.baremetal-mcp-ocata-ovs-ha.infra
 272  parameters:
 273    _param:
 274 -    keepalived_vip_interface: ens3
 275 +    keepalived_vip_interface: enp1s0
 276      keepalived_vip_virtual_router_id: 230
 277      cluster_vip_address: ${_param:openstack_telemetry_address}
 278      cluster_local_address: ${_param:single_address}
 279 @@ -23,4 +23,4 @@ parameters:
 280    linux:
 281      network:
 282        interface:
 283 -        ens3: ${_param:linux_single_interface}
 284 +        enp1s0: ${_param:linux_single_interface}