u/fuel: Bump & rebase for pharos as lab-config

Change-Id: I78672282dd0bf98509bb2f0848a4df542564d418
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

4 files changed, 32 insertions, 35 deletions

diff --git a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch
index 9f68465a..9d7b25b2 100644
--- a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch
+++ b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch
@@ -44,7 +44,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  create mode 100644 mcp/salt-formulas/armband/vgabios.sls
 
 diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
-index 4948a50..93c73e7 100755
+index 0bbf7cd..c49b27d 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
@@ -56,15 +56,18 @@ index 4948a50..93c73e7 100755
  salt -C 'I@mongodb:server and *01*' state.sls mongodb || true
  wait_for 10 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'"
 diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha
-index bcb7807..09b84b9 100755
+index 9fc30bb..998fc6b 100755
 --- a/mcp/config/states/openstack_noha
 +++ b/mcp/config/states/openstack_noha
-@@ -51,3 +51,5 @@ salt -I 'ceilometer:server' state.sls ceilometer
- salt -I 'ceilometer:agent' state.sls ceilometer
+@@ -52,6 +52,8 @@ salt -I 'ceilometer:agent' state.sls ceilometer
 
  salt -I 'horizon:server' state.sls horizon
-+
+
 +salt -I 'nova:compute' state.sls armband
++
+ # workaround for the pike horizon is missing css, FUEL-324
+ salt -I 'horizon:server' file.symlink \
+   /var/lib/openstack-dashboard/static \
 diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
 index 75347d9..8b162d5 100755
 --- a/mcp/config/states/virtual_control_plane
diff --git a/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch b/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch
index fcfbfe6e..97656b37 100644
--- a/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch
+++ b/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch
@@ -17,7 +17,7 @@ grep -e "10\.16\.0\." -R . -l | \
     -e 's/10\.0\.9\.1/10.0.9.254/g'
 
 NOTE: This should be converted into a dynamic configuration read from
-the universal POD descriptor in securedlab, once that is ready.
+the universal POD descriptor in pharos, once that is ready.
 
 Until then, just align the public network configuration used by the
 virtual POD with the Enea lab configuration specific to arm-virtual2
@@ -29,42 +29,36 @@ network layouts in sync (using all virtual networks created via
 virsh, respectively our lab's static config).
 This will ensure deploys continue to work in both enviroments.
 
-Also, since our new gateway resides at 10.0.9.254, trim the DHCP pool
-range for the public network to not include that address.
-
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- mcp/config/states/networks                                          | 6 +++---
- .../classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml   | 4 ++--
- .../classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml | 2 +-
- .../classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml      | 2 +-
- .../classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml | 2 +-
- .../classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml      | 2 +-
- mcp/scripts/net_public.xml                                          | 2 +-
- 7 files changed, 10 insertions(+), 10 deletions(-)
+ mcp/config/states/networks                                        | 8 ++++----
+ .../classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml | 4 ++--
+ .../cluster/virtual-mcp-pike-common-noha/openstack_init.yml       | 2 +-
+ .../classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml    | 2 +-
+ .../cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml       | 2 +-
+ .../classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml    | 2 +-
+ mcp/scripts/net_public.xml                                        | 2 +-
+ 7 files changed, 11 insertions(+), 11 deletions(-)
 
 diff --git a/mcp/config/states/networks b/mcp/config/states/networks
-index 5beabdb..ca59ee3 100755
+index 222a072..9bbc0ce 100755
 --- a/mcp/config/states/networks
 +++ b/mcp/config/states/networks
-@@ -18,7 +18,7 @@ PUBLIC_NET=$(salt --out yaml -C 'I@nova:compute and *01*' pillar.get _param:exte
-   pillar.get _param:openstack_compute_node01_external_address | \
-   awk --re-interval '/[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/{print $2; exit}')
+@@ -17,10 +17,10 @@ POOL_START_IP=$(get_nova_compute_pillar_data 'opnfv_net_public_pool_start')
+ POOL_END_IP=$(get_nova_compute_pillar_data 'opnfv_net_public_pool_end')
 
--[ -n "${PUBLIC_NET}" ] && PUBLIC_NET="${PUBLIC_NET%.*}.0/24" || PUBLIC_NET="10.16.0.0/24"
-+[ -n "${PUBLIC_NET}" ] && PUBLIC_NET="${PUBLIC_NET%.*}.0/24" || PUBLIC_NET="10.0.9.0/24"
+ # Default values
+-PUBLIC_NET="${PUBLIC_NET:-10.16.0.0/24}"
+-PUBLIC_NET_GATEWAY="${PUBLIC_NET_GATEWAY:-10.16.0.1}"
+-POOL_START_IP="${POOL_START_IP:-10.16.0.130}"
+-POOL_END_IP="${POOL_END_IP:-10.16.0.254}"
++PUBLIC_NET="${PUBLIC_NET:-10.0.9.0/24}"
++PUBLIC_NET_GATEWAY="${PUBLIC_NET_GATEWAY:-10.0.9.254}"
++POOL_START_IP="${POOL_START_IP:-10.0.9.130}"
++POOL_END_IP="${POOL_END_IP:-10.0.9.200}"
 
+ # Print openstack status and setup network
  salt -C 'I@nova:controller and *01*' cmd.run ". /root/keystonercv3; \
-   openstack compute service list; \
-@@ -29,6 +29,6 @@ salt -C 'I@nova:controller and *01*' cmd.run ". /root/keystonercv3; \
-   openstack network create --external --default --provider-network-type flat \
-     --provider-physical-network physnet1 floating_net"
- salt -C 'I@nova:controller and *01*' cmd.run ". /root/keystonercv3; \
--  openstack subnet create --gateway ${PUBLIC_NET%.*}.1 --no-dhcp \
--    --allocation-pool start=${PUBLIC_NET%.*}.130,end=${PUBLIC_NET%.*}.254 \
-+  openstack subnet create --gateway ${PUBLIC_NET%.*}.254 --no-dhcp \
-+    --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-pike-common-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml
 index 7e3a494..3a240b0 100644
 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml
diff --git a/patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch b/patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch
index 997c18d6..7ceb0a1b 100644
--- a/patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch
+++ b/patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch
@@ -33,10 +33,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls
-index 1f04750..45aed3d 100644
+index f953cdd..f966208 100644
 --- a/mcp/salt-formulas/opendaylight/server.sls
 +++ b/mcp/salt-formulas/opendaylight/server.sls
-@@ -85,4 +85,9 @@ opendaylight:
+@@ -91,4 +91,9 @@ opendaylight:
        - service: opendaylight
  {%- endif %}
 
diff --git a/upstream/fuel b/upstream/fuel
-Subproject bb3b6968dbccb74959d394fb6426ba5b8fb2c5e
+Subproject 8b48875e30afa4c60f27310df548a18c18e9af6