From 3dd58f27b33ec53c802809764ff5fa8293dcdd17 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 17 Feb 2018 21:43:21 +0100 Subject: u/fuel: Bump & rebase for virtual PDF support Finally drop hardcoded IP addresses for virtual deploys from reclass, but keep one small patch adjusting the local vPDF to achieve the same goal. JIRA: FUEL-322 Change-Id: I56a3b0487f564355a4c51b4eb71ec97e92531f1d Signed-off-by: Alexandru Avadanii --- ...etal-Add-Armband-Openstack-repos-to-kvm-cmp.patch | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch') diff --git a/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch b/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch index 3c4420f5..90e9f7cd 100644 --- a/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch +++ b/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch @@ -20,14 +20,14 @@ handle it via Salt for baremetal kvm* and cmp* nodes. Signed-off-by: Alexandru Avadanii --- - mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml | 1 + - .../classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml | 1 + + mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml | 1 + + mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml | 1 + 2 files changed, 2 insertions(+) -diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml -index dcd78a2..a604d0a 100644 ---- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml -+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml +diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml +index 9f85366..3a6eb84 100644 +--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml ++++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml @@ -7,6 +7,7 @@ ############################################################################## --- @@ -36,10 +36,10 @@ index dcd78a2..a604d0a 100644 - system.linux.system.repo.glusterfs - service.keepalived.cluster.single - system.glusterfs.server.volume.glance -diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml -index 60a01a8..a2c6fa0 100644 ---- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml -+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml +diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml +index 2e79f80..8fe5c37 100644 +--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml ++++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml @@ -7,6 +7,7 @@ ############################################################################## --- -- cgit 1.2.3-korg