Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
- .../baremetal-mcp-ocata-odl-ha/infra/config.yml | 4 ++--
- .../baremetal-mcp-ocata-odl-ha/infra/kvm.yml | 18 ++++++++++-----
- .../baremetal-mcp-ocata-odl-ha/infra/maas.yml | 6 ++---
- .../opendaylight/control.yml | 2 +-
- .../openstack/compute.yml | 27 ++++++++--------------
- .../openstack/control.yml | 6 ++---
- .../openstack/dashboard.yml | 4 ++--
- .../openstack/database.yml | 6 ++---
- .../openstack/message_queue.yml | 6 ++---
- .../baremetal-mcp-ocata-odl-ha/openstack/proxy.yml | 6 ++---
- .../openstack/telemetry.yml | 6 ++---
- .../baremetal-mcp-ocata-ovs-ha/infra/config.yml | 4 ++--
- .../baremetal-mcp-ocata-ovs-ha/infra/kvm.yml | 16 +++++++++----
- .../baremetal-mcp-ocata-ovs-ha/infra/maas.yml | 6 ++---
- .../openstack/compute.yml | 19 +++++----------
- .../openstack/control.yml | 6 ++---
- .../openstack/dashboard.yml | 4 ++--
- .../openstack/database.yml | 6 ++---
- .../openstack/message_queue.yml | 6 ++---
- .../baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml | 6 ++---
- .../openstack/telemetry.yml | 6 ++---
- 21 files changed, 84 insertions(+), 86 deletions(-)
+ .../baremetal-mcp-ocata-odl-ha/infra/config.yml | 4 ++--
+ .../cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml | 16 +++++++++++-----
+ .../cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml | 6 +++---
+ .../opendaylight/control.yml | 2 +-
+ .../baremetal-mcp-ocata-odl-ha/openstack/compute.yml | 19 ++++++-------------
+ .../baremetal-mcp-ocata-odl-ha/openstack/control.yml | 6 +++---
+ .../openstack/dashboard.yml | 4 ++--
+ .../baremetal-mcp-ocata-odl-ha/openstack/database.yml | 6 +++---
+ .../openstack/message_queue.yml | 6 +++---
+ .../baremetal-mcp-ocata-odl-ha/openstack/proxy.yml | 6 +++---
+ .../openstack/telemetry.yml | 6 +++---
+ .../baremetal-mcp-ocata-ovs-ha/infra/config.yml | 4 ++--
+ .../cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml | 16 +++++++++++-----
+ .../cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml | 6 +++---
+ .../baremetal-mcp-ocata-ovs-ha/openstack/compute.yml | 19 ++++++-------------
+ .../baremetal-mcp-ocata-ovs-ha/openstack/control.yml | 6 +++---
+ .../openstack/dashboard.yml | 4 ++--
+ .../baremetal-mcp-ocata-ovs-ha/openstack/database.yml | 6 +++---
+ .../openstack/message_queue.yml | 6 +++---
+ .../baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml | 6 +++---
+ .../openstack/telemetry.yml | 6 +++---
+ 21 files changed, 79 insertions(+), 81 deletions(-)
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml
-index 4cf2a60..697e697 100644
+index 15202f1..6ddb8a2 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml
-@@ -35,8 +35,8 @@ parameters:
+@@ -34,8 +34,8 @@ parameters:
linux:
network:
interface:
master:
accept_policy: open_mode
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
-index 99ac02e..f9427be 100644
+index da26254..5e4ea66 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
@@ -26,7 +26,8 @@ parameters:
br-mgmt:
enabled: true
proto: dhcp
-@@ -159,13 +165,13 @@ parameters:
- use_interfaces:
- - ${_param:deploy_nic}
- noifupdown: true
-- vlan300:
-+ vlan2183:
+@@ -161,9 +167,9 @@ parameters:
enabled: true
proto: manual
type: vlan
-- name: ${_param:deploy_nic}.300
-+ name: ${_param:trunk_nic}.2183
+- name: ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
++ name: ${_param:trunk_nic}.${_param:opnfv_net_mgmt_vlan}
use_interfaces:
- - ${_param:deploy_nic}
+ - ${_param:trunk_nic}
br-ctl:
enabled: true
type: bridge
-@@ -173,4 +179,4 @@ parameters:
+@@ -171,4 +177,4 @@ parameters:
address: ${_param:single_address}
netmask: 255.255.255.0
use_interfaces:
-- - ${_param:deploy_nic}.300
-+ - ${_param:trunk_nic}.2183
+- - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
++ - ${_param:trunk_nic}.${_param:opnfv_net_mgmt_vlan}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
-index 2a2fedb..cb98e0e 100644
+index cbb1caf..e54621c 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
@@ -5,9 +5,9 @@ classes:
type: eth
proto: static
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
-index 82b1a6e..605bfe1 100644
+index ba0f385..a41df69 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
@@ -25,10 +25,9 @@ parameters:
br-mesh:
enabled: true
type: bridge
-@@ -91,19 +84,19 @@ parameters:
- netmask: 255.255.255.0
- mtu: 1500
- use_interfaces:
-- - ${_param:tenant_nic}.302
-- vlan300:
-+ - ${_param:tenant_nic}.2185
-+ vlan2183:
+@@ -96,9 +89,9 @@ parameters:
enabled: true
proto: manual
type: vlan
-- name: ${_param:mgmt_nic}.300
-+ name: ${_param:tenant_nic}.2183
+- name: ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
++ name: ${_param:tenant_nic}.${_param:opnfv_net_mgmt_vlan}
use_interfaces:
- - ${_param:mgmt_nic}
-- vlan302:
+ - ${_param:tenant_nic}
-+ vlan2185:
+ tenant-vlan:
enabled: true
proto: manual
- type: vlan
-- name: ${_param:tenant_nic}.302
-+ name: ${_param:tenant_nic}.2185
- use_interfaces:
- - ${_param:tenant_nic}
- br-ctl:
@@ -113,7 +106,7 @@ parameters:
address: ${_param:single_address}
netmask: 255.255.255.0
use_interfaces:
-- - ${_param:mgmt_nic}.300
-+ - ${_param:tenant_nic}.2183
+- - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
++ - ${_param:tenant_nic}.${_param:opnfv_net_mgmt_vlan}
br-floating:
enabled: true
type: ovs_bridge
+++ /dev/null
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Tue, 8 Aug 2017 03:49:53 +0200
-Subject: [PATCH] network: public, mgmt: Use arm-pod3 POD config
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- .../baremetal-mcp-ocata-odl-ha/infra/init.yml | 18 +++----
- .../baremetal-mcp-ocata-odl-ha/openstack/init.yml | 62 +++++++++++-----------
- 2 files changed, 40 insertions(+), 40 deletions(-)
-
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
-index b1cd5d2..50c590d 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
-@@ -18,18 +18,18 @@ parameters:
- infra_maas_database_password: opnfv_secret
-
- # infra service addresses
-- infra_config_address: 10.167.4.100
-+ infra_config_address: 172.16.10.100
- infra_config_deploy_address: 10.20.0.2
-- infra_maas_node01_address: 10.167.4.3
-+ infra_maas_node01_address: 172.16.10.3
- infra_maas_node01_deploy_address: ${_param:opnfv_maas_pxe_address}
-- infra_compute_node01_address: 10.167.4.141
-- infra_compute_node02_address: 10.167.4.142
-- infra_compute_node03_address: 10.167.4.143
-+ infra_compute_node01_address: 172.16.10.141
-+ infra_compute_node02_address: 172.16.10.142
-+ infra_compute_node03_address: 172.16.10.143
-
-- infra_kvm_address: 10.167.4.140
-- infra_kvm_node01_address: 10.167.4.141
-- infra_kvm_node02_address: 10.167.4.142
-- infra_kvm_node03_address: 10.167.4.143
-+ infra_kvm_address: 172.16.10.140
-+ infra_kvm_node01_address: 172.16.10.141
-+ infra_kvm_node02_address: 172.16.10.142
-+ infra_kvm_node03_address: 172.16.10.143
-
- infra_maas_node01_hostname: mas01
- infra_kvm_node01_hostname: kvm01
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
-index 16bdc06..e288322 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
-@@ -4,9 +4,9 @@ parameters:
-
- openstack_version: ocata
-
-- openstack_gateway_node01_address: 10.167.4.124
-- openstack_gateway_node02_address: 10.167.4.125
-- openstack_gateway_node03_address: 10.167.4.126
-+ openstack_gateway_node01_address: 172.16.10.124
-+ openstack_gateway_node02_address: 172.16.10.125
-+ openstack_gateway_node03_address: 172.16.10.126
- openstack_gateway_node01_tenant_address: 10.1.0.6
- openstack_gateway_node02_tenant_address: 10.1.0.7
- openstack_gateway_node03_tenant_address: 10.1.0.9
-@@ -15,21 +15,21 @@ parameters:
- openstack_gateway_node03_hostname: gtw03
-
- # openstack service addresses
-- openstack_proxy_address: 10.167.4.80
-- openstack_proxy_node01_address: 10.167.4.81
-- openstack_proxy_node02_address: 10.167.4.82
-- openstack_control_address: 10.167.4.10
-- openstack_control_node01_address: 10.167.4.11
-- openstack_control_node02_address: 10.167.4.12
-- openstack_control_node03_address: 10.167.4.13
-- openstack_database_address: 10.167.4.50
-- openstack_database_node01_address: 10.167.4.51
-- openstack_database_node02_address: 10.167.4.52
-- openstack_database_node03_address: 10.167.4.53
-- openstack_message_queue_address: 10.167.4.40
-- openstack_message_queue_node01_address: 10.167.4.41
-- openstack_message_queue_node02_address: 10.167.4.42
-- openstack_message_queue_node03_address: 10.167.4.43
-+ openstack_proxy_address: 172.16.10.80
-+ openstack_proxy_node01_address: 172.16.10.81
-+ openstack_proxy_node02_address: 172.16.10.82
-+ openstack_control_address: 172.16.10.10
-+ openstack_control_node01_address: 172.16.10.11
-+ openstack_control_node02_address: 172.16.10.12
-+ openstack_control_node03_address: 172.16.10.13
-+ openstack_database_address: 172.16.10.50
-+ openstack_database_node01_address: 172.16.10.51
-+ openstack_database_node02_address: 172.16.10.52
-+ openstack_database_node03_address: 172.16.10.53
-+ openstack_message_queue_address: 172.16.10.40
-+ openstack_message_queue_node01_address: 172.16.10.41
-+ openstack_message_queue_node02_address: 172.16.10.42
-+ openstack_message_queue_node03_address: 172.16.10.43
-
-
- openstack_telemetry_hostname: mdb
-@@ -37,26 +37,26 @@ parameters:
- openstack_telemetry_node02_hostname: mdb02
- openstack_telemetry_node03_hostname: mdb03
-
-- openstack_telemetry_address: 10.167.4.75
-- openstack_telemetry_node01_address: 10.167.4.76
-- openstack_telemetry_node02_address: 10.167.4.77
-- openstack_telemetry_node03_address: 10.167.4.78
-+ openstack_telemetry_address: 172.16.10.75
-+ openstack_telemetry_node01_address: 172.16.10.76
-+ openstack_telemetry_node02_address: 172.16.10.77
-+ openstack_telemetry_node03_address: 172.16.10.78
-
- # OpenStack Compute
-- openstack_compute_node01_single_address: 10.167.4.101
-- openstack_compute_node02_single_address: 10.167.4.102
-- openstack_compute_node03_single_address: 10.167.4.103
-- openstack_compute_node01_control_address: 10.167.4.101
-- openstack_compute_node02_control_address: 10.167.4.102
-- openstack_compute_node03_control_address: 10.167.4.103
-+ openstack_compute_node01_single_address: 172.16.10.101
-+ openstack_compute_node02_single_address: 172.16.10.102
-+ openstack_compute_node03_single_address: 172.16.10.103
-+ openstack_compute_node01_control_address: 172.16.10.101
-+ openstack_compute_node02_control_address: 172.16.10.102
-+ openstack_compute_node03_control_address: 172.16.10.103
- openstack_compute_node01_tenant_address: 10.1.0.101
- openstack_compute_node02_tenant_address: 10.1.0.102
- openstack_compute_node03_tenant_address: 10.1.0.103
-- openstack_compute_node01_external_address: 172.30.10.2
-- openstack_compute_node02_external_address: 172.30.10.3
-+ openstack_compute_node01_external_address: 10.0.8.101
-+ openstack_compute_node02_external_address: 10.0.8.102
-
- # opendaylight options
-- opendaylight_server_node01_single_address: 10.167.4.111
-+ opendaylight_server_node01_single_address: 172.16.10.111
- # yamllint disable rule:line-length
- opendaylight_service_host: ${_param:opendaylight_server_node01_single_address}
- opendaylight_server_node01_hostname: odl01
+++ /dev/null
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Thu, 10 Aug 2017 18:32:37 +0200
-Subject: [PATCH] classes: baremetal: arm-pod3 config hardcode
-
-Populate MaaS configuration with node information for arm-pod3.
-
-FIXME: Read all this info from PDF (Pod Descriptor File) later.
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- .../baremetal-mcp-ocata-odl-ha/infra/maas.yml | 40 +++++++++++-----------
- 1 file changed, 20 insertions(+), 20 deletions(-)
-
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
-index cb98e0e..ebee892 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
-@@ -48,57 +48,57 @@ parameters:
- machines:
- kvm01:
- interface:
-- mac: "00:25:b5:a0:00:2a"
-+ mac: "e0:ff:f7:00:08:ae"
- power_parameters:
-- power_address: "172.30.8.75"
-- power_password: "octopus"
-+ power_address: "10.0.8.3"
-+ power_password: "admin"
- power_type: ipmi
- power_user: "admin"
-- architecture: 'amd64/generic'
-+ architecture: 'arm64/generic'
- distro_series: xenial
- hwe_kernel: hwe-16.04
- kvm02:
- interface:
-- mac: "00:25:b5:a0:00:3a"
-+ mac: "e0:ff:f7:00:08:b1"
- power_parameters:
-- power_address: "172.30.8.65"
-- power_password: "octopus"
-+ power_address: "10.0.8.4"
-+ power_password: "admin"
- power_type: ipmi
- power_user: "admin"
-- architecture: 'amd64/generic'
-+ architecture: 'arm64/generic'
- distro_series: xenial
- hwe_kernel: hwe-16.04
- kvm03:
- interface:
-- mac: "00:25:b5:a0:00:4a"
-+ mac: "e0:ff:f7:00:08:bd"
- power_parameters:
-- power_address: "172.30.8.74"
-- power_password: "octopus"
-+ power_address: "10.0.8.5"
-+ power_password: "admin"
- power_type: ipmi
- power_user: "admin"
-- architecture: 'amd64/generic'
-+ architecture: 'arm64/generic'
- distro_series: xenial
- hwe_kernel: hwe-16.04
- cmp001:
- interface:
-- mac: "00:25:b5:a0:00:5a"
-+ mac: "e0:ff:f7:00:08:c6"
- power_parameters:
-- power_address: "172.30.8.73"
-- power_password: "octopus"
-+ power_address: "10.0.8.6"
-+ power_password: "admin"
- power_type: ipmi
- power_user: "admin"
-- architecture: 'amd64/generic'
-+ architecture: 'arm64/generic'
- distro_series: xenial
- hwe_kernel: hwe-16.04
- cmp002:
- interface:
-- mac: "00:25:b5:a0:00:6a"
-+ mac: "e0:ff:f7:00:08:cf"
- power_parameters:
-- power_address: "172.30.8.72"
-- power_password: "octopus"
-+ power_address: "10.0.8.7"
-+ power_password: "admin"
- power_type: ipmi
- power_user: "admin"
-- architecture: 'amd64/generic'
-+ architecture: 'arm64/generic'
- distro_series: xenial
- hwe_kernel: hwe-16.04
- linux:
+/usr/share/salt-formulas/env: 0103-virtng-module-Extend-libvirt_domain.patch
+/usr/share/salt-formulas/env: 0104-salt-control-virt-Extend-libvirt_domain.patch
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
-index f9427be..a5cc5b0 100644
+index 5e4ea66..3b717d8 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
@@ -35,26 +35,41 @@ parameters:
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
-index 605bfe1..51f5635 100644
+index a41df69..10a5a88 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
@@ -6,8 +6,8 @@ classes:
- system.neutron.gateway.cluster
- system.cinder.volume.single
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
-index e288322..a40d23e 100644
+index c7df472..4db9ee0 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
@@ -102,11 +102,11 @@ parameters:
--- /dev/null
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2017 Enea AB and others.
+:
+: All rights reserved. This program and the accompanying materials
+: are made available under the terms of the Apache License, Version 2.0
+: which accompanies this distribution, and is available at
+: http://www.apache.org/licenses/LICENSE-2.0
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Wed, 30 Aug 2017 22:15:07 +0200
+Subject: [PATCH] baremetal, virtual: Extend arch list for UCA repo
+
+JIRA: https://jira.opnfv.org/browse/ARMBAND-304
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ .../classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml | 2 +-
+ .../cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml | 2 +-
+ .../classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml | 2 +-
+ .../classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml | 2 +-
+ .../classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
+index 4db9ee0..9e37954 100644
+--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
++++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
+@@ -203,7 +203,7 @@ parameters:
+ repo:
+ uca:
+ source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
+- architectures: amd64
++ architectures: amd64,arm64
+ key_id: EC4926EA
+ key_server: keyserver.ubuntu.com
+ kernel:
+diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
+index 696c5a5..b90b20b 100644
+--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
++++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
+@@ -61,7 +61,7 @@ parameters:
+ uca:
+ # yamllint disable-line rule:line-length
+ source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
+- architectures: amd64
++ architectures: amd64,arm64
+ key_id: EC4926EA
+ key_server: keyserver.ubuntu.com
+ network:
+diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml
+index 9fa69ba..3f3cdb4 100644
+--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml
++++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml
+@@ -204,7 +204,7 @@ parameters:
+ repo:
+ uca:
+ source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
+- architectures: amd64
++ architectures: amd64,arm64
+ key_id: EC4926EA
+ key_server: keyserver.ubuntu.com
+ kernel:
+diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
+index d072956..e96e091 100644
+--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
+@@ -59,7 +59,7 @@ parameters:
+ uca:
+ # yamllint disable-line rule:line-length
+ source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
+- architectures: amd64
++ architectures: amd64,arm64
+ key_id: EC4926EA
+ key_server: keyserver.ubuntu.com
+ kernel:
+diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml
+index ed03eb4..40fb60d 100644
+--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml
++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml
+@@ -11,7 +11,7 @@ parameters:
+ uca:
+ # yamllint disable-line rule:line-length
+ source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
+- architectures: amd64
++ architectures: amd64,arm64
+ key_id: EC4926EA
+ key_server: keyserver.ubuntu.com
+ network:
+++ /dev/null
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Wed, 30 Aug 2017 22:15:07 +0200
-Subject: [PATCH] baremetal: odl: Extend arch list for UCA repo
-
-JIRA: https://jira.opnfv.org/browse/ARMBAND-304
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- .../classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
-index a40d23e..8590fb8 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
-@@ -203,7 +203,7 @@ parameters:
- repo:
- uca:
- source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
-- architectures: amd64
-+ architectures: amd64,arm64
- key_id: EC4926EA
- key_server: keyserver.ubuntu.com
- kernel:
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
- .../all-mcp-ocata-common/opnfv/pod_config.yml | 125 +++++++++++----------
- 1 file changed, 63 insertions(+), 62 deletions(-)
+ .../all-mcp-ocata-common/opnfv/pod_config.yml | 126 ++++++++++-----------
+ 1 file changed, 63 insertions(+), 63 deletions(-)
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml
-index 90c3c85..68b048f 100644
+index ecc8dad..1775ea4 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml
-@@ -2,92 +2,93 @@
+@@ -2,93 +2,93 @@
parameters:
_param:
# infra service addresses
+ opnfv_openstack_compute_node01_external_address: 10.0.8.101
+ opnfv_openstack_compute_node02_external_address: 10.0.8.102
+- opnfv_opendaylight_server_node01_single_address: 10.167.4.111
+ # opendaylight options
-+ #opnfv_opendaylight_server_node01_single_address: 172.16.10.111
++ opnfv_opendaylight_server_node01_single_address: 172.16.10.111
opnfv_name_servers: ['8.8.8.8', '8.8.4.4']
opnfv_dns_server01: '8.8.8.8'
-Subproject commit 533b81df35acd7c2f16cd347cf3167583e870d38
+Subproject commit d02f6752929c0c38a7890c6f496102076bfe6afa
Code Review / armband.git / commitdiff