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/0010-network-public-mgmt-Use-arm-pod3-POD-config.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/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch')
-rw-r--r-- | patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch b/patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch index 5bbe783a..27690dfd 100644 --- a/patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch +++ b/patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch @@ -28,7 +28,7 @@ index f51ba5f..5582727 100755 # Variables below are disabled for now, to be re-introduced or removed later diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index 1e14e5f..db0241b 100755 +index 2dd62f9..3731c31 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas @@ -52,7 +52,7 @@ salt -C 'mas01*' state.apply linux.network.interface @@ -41,7 +41,7 @@ index 1e14e5f..db0241b 100755 wait_for 10 "salt -C 'mas01*' state.apply maas.region" 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 2374dee..fb5b856 100644 +index 066a6e2..eae7586 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 @@ -16,19 +16,19 @@ parameters: @@ -170,7 +170,7 @@ index e49a205..ad99447 100644 opendaylight_server_node01_hostname: odl01 opendaylight_router: odl-router_v2 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml -index 93e2de0..1d75356 100644 +index acf2b43..57fb461 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml @@ -16,19 +16,19 @@ parameters: |