diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-16 17:53:55 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-18 15:00:05 +0000 |
| commit | fc7fb36396fe650d0f39c6bfb132e95495d84d7d (patch) | |
| tree | 37c411eb845ec543caf2c8c832dcb8fe0f24c3e9 /patches/opnfv-fuel | |
| parent | 59e383882c027befc50dbd6ef9d59a7e26815183 (diff) | |
u/fuel: Bump & rebase for keystone.client retry
Change-Id: I1a1d91af5c7dc92307ccd7a52e97cc95c70149f0
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit adbf9f707a702eff262d8437a68bc6c04e12d786)
Diffstat (limited to 'patches/opnfv-fuel')
3 files changed, 4 insertions, 4 deletions
diff --git a/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch index 8be2e806..d15cb934 100644 --- a/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch +++ b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch @@ -58,7 +58,7 @@ index 19cd417..73983d2 100755 + +salt -I 'nova:compute' state.sls armband || true diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha -index 9eaa3a1..2439ad6 100755 +index e1fdf73..e1f705c 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -52,6 +52,7 @@ salt -I 'neutron:server' state.sls neutron -b 1 diff --git a/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch b/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch index 6d86c083..1dc8f99b 100644 --- a/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch +++ b/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch @@ -63,10 +63,10 @@ index d4735ad..e566903 100755 + --allocation-pool start=${PUBLIC_NET%.*}.130,end=${PUBLIC_NET%.*}.200 \ --network floating_net --subnet-range ${PUBLIC_NET} floating_subnet" diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml -index 21ed8d3..306adc2 100644 +index 3c3d526..e114ec2 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml -@@ -70,13 +70,13 @@ parameters: +@@ -61,13 +61,13 @@ parameters: params: single_address: 172.16.10.105 tenant_address: 10.1.0.105 diff --git a/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch index 6370297b..b19103b7 100644 --- a/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch @@ -160,7 +160,7 @@ index d3352cc..059e3ef 100644 +/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-common/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml -index d098fa6..d88512e 100644 +index 004f72a..b7054e9 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml @@ -42,21 +42,33 @@ parameters: |