diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-28 19:45:08 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-28 19:48:36 +0200 |
| commit | 2da79800d8ee9bc4210740255a42f7ec7a65c072 (patch) | |
| tree | 4ea8e4651f485b918a2fe51732583c511e852eb0 /patches/opnfv-fuel/0008-classes-baremetal-AArch64-virtio-NIC-names-sync.patch | |
| parent | e0d9c392488c74393574fcd93ad1f8a3ad576130 (diff) | |
p/fuel: Rebase for os cacert
While rebasing, drop batch apply of linux.network state for VCP nodes,
as it does not fix the underlying problem and only introduces extra
delay.
Reverts commits: 4f1bfdd
Change-Id: I365b029aa2855334e295907cdde623b1717fc69a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0008-classes-baremetal-AArch64-virtio-NIC-names-sync.patch')
| -rw-r--r-- | patches/opnfv-fuel/0008-classes-baremetal-AArch64-virtio-NIC-names-sync.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/patches/opnfv-fuel/0008-classes-baremetal-AArch64-virtio-NIC-names-sync.patch b/patches/opnfv-fuel/0008-classes-baremetal-AArch64-virtio-NIC-names-sync.patch index 08c5b7a6..b15de97c 100644 --- a/patches/opnfv-fuel/0008-classes-baremetal-AArch64-virtio-NIC-names-sync.patch +++ b/patches/opnfv-fuel/0008-classes-baremetal-AArch64-virtio-NIC-names-sync.patch @@ -44,7 +44,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 21 files changed, 91 insertions(+), 94 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 202799f..424a868 100644 +index a7b08f8..b9bd3e0 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 @@ -33,8 +33,8 @@ parameters: @@ -223,7 +223,7 @@ index 6f0c52c..cd1456a 100644 - float-to-ex - diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml -index 227c649..e50b2ce 100644 +index e8666d6..149d29d 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml @@ -23,7 +23,7 @@ classes: @@ -243,9 +243,9 @@ index 227c649..e50b2ce 100644 - ens3: ${_param:linux_single_interface} + enp1s0: ${_param:linux_dhcp_interface} + enp2s0: ${_param:linux_single_interface} - neutron: + keystone: server: - backend: + cacert: /etc/ssl/certs/mcp_os_cacert diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml index 9748c4c..a5317b1 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml @@ -346,7 +346,7 @@ index 4a56b65..128ec1b 100644 + enp1s0: ${_param:linux_dhcp_interface} + enp2s0: ${_param:linux_single_interface} 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 -index ce2c951..7d95ebc 100644 +index a75b41d..3979fd1 100644 --- 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 @@ -32,8 +32,8 @@ parameters: @@ -361,7 +361,7 @@ index ce2c951..7d95ebc 100644 master: accept_policy: open_mode 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 -index 1608c65..8677a79 100644 +index 44301a0..31e87e4 100644 --- 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 @@ -25,7 +25,8 @@ parameters: @@ -510,7 +510,7 @@ index 070ab78..88150b0 100644 use_ovs_ports: - float-to-ex 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 -index 6f47f8a..5ba1411 100644 +index a5913dd..638abba 100644 --- 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 @@ -23,7 +23,7 @@ classes: @@ -530,9 +530,9 @@ index 6f47f8a..5ba1411 100644 - ens3: ${_param:linux_single_interface} + enp1s0: ${_param:linux_dhcp_interface} + enp2s0: ${_param:linux_single_interface} - bind: + keystone: server: - control: + cacert: /etc/ssl/certs/mcp_os_cacert 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 index 39cc073..18f622c 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml |