u/fuel: Bump & rebase for aodh & ceilometer

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

5 files changed, 44 insertions, 38 deletions

diff --git a/patches/opnfv-fuel/0003-mcp-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0003-mcp-salt-formulas-Add-enable-armband-formula.patch
index 4b427dad..843ea174 100644
--- a/patches/opnfv-fuel/0003-mcp-salt-formulas-Add-enable-armband-formula.patch
+++ b/patches/opnfv-fuel/0003-mcp-salt-formulas-Add-enable-armband-formula.patch
@@ -67,7 +67,7 @@ index eaab135..050b648 100755
 +
 +salt -I 'nova:compute' state.sls armband
 diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
-index fc1fed7..7ba9d82 100755
+index e507ec9..6c68e15 100755
 --- a/mcp/config/states/openstack_ha
 +++ b/mcp/config/states/openstack_ha
 @@ -41,6 +41,7 @@ salt -I 'neutron:server' state.sls neutron -b 1
@@ -76,8 +76,8 @@ index fc1fed7..7ba9d82 100755
  salt -I 'nova:compute' state.sls nova
 +salt -I 'nova:compute' state.sls armband
 
- salt -I 'horizon:server' state.sls horizon
- salt -I 'nginx:server' state.sls nginx
+ salt -I 'mongodb:server' state.sls mongodb -b 1
+ salt -I 'aodh:server' state.sls aodh
 diff --git a/mcp/salt-formulas/armband/files/nova-libvirt-driver.diff b/mcp/salt-formulas/armband/files/nova-libvirt-driver.diff
 new file mode 100644
 index 0000000..a5b08da
diff --git a/patches/opnfv-fuel/0007-classes-baremetal-AArch64-virtio-NIC-names-sync.patch b/patches/opnfv-fuel/0007-classes-baremetal-AArch64-virtio-NIC-names-sync.patch
index 95f40502..39bc4df5 100644
--- a/patches/opnfv-fuel/0007-classes-baremetal-AArch64-virtio-NIC-names-sync.patch
+++ b/patches/opnfv-fuel/0007-classes-baremetal-AArch64-virtio-NIC-names-sync.patch
@@ -52,7 +52,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 a7b08f8..b9bd3e0 100644
+index 3f72e18..bd439a4 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:
@@ -67,7 +67,7 @@ index a7b08f8..b9bd3e0 100644
      master:
        accept_policy: open_mode
 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
-index f73d48e..32fd829 100644
+index 41366f3..766a495 100644
 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
 @@ -25,7 +25,8 @@ parameters:
@@ -309,10 +309,10 @@ index f5312c1..d2e6a40 100644
 +        enp1s0: ${_param:linux_dhcp_interface}
 +        enp2s0: ${_param:linux_single_interface}
 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
-index 93abf2a..8a62cee 100644
+index ee5f639..345a7d4 100644
 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
-@@ -15,7 +15,7 @@ classes:
+@@ -17,7 +17,7 @@ classes:
  # - cluster.baremetal-mcp-ocata-odl-ha.stacklight.proxy
  parameters:
    _param:
@@ -321,7 +321,7 @@ index 93abf2a..8a62cee 100644
      keepalived_vip_virtual_router_id: 240
      nginx_proxy_ssl:
        enabled: true
-@@ -27,8 +27,8 @@ parameters:
+@@ -29,8 +29,8 @@ parameters:
    linux:
      network:
        interface:
@@ -333,19 +333,19 @@ index 93abf2a..8a62cee 100644
        package:
          libapache2-mod-wsgi:
 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml
-index 4a56b65..128ec1b 100644
+index 4e90090..c08f209 100644
 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml
 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml
-@@ -10,7 +10,7 @@ classes:
+@@ -12,7 +12,7 @@ classes:
  - cluster.baremetal-mcp-ocata-odl-ha.infra
  parameters:
    _param:
--    keepalived_vip_interface: ens3
-+    keepalived_vip_interface: enp2s0
+-    keepalived_openstack_telemetry_vip_interface: ens3
++    keepalived_openstack_telemetry_vip_interface: enp2s0
      keepalived_vip_virtual_router_id: 230
      cluster_vip_address: ${_param:openstack_telemetry_address}
      cluster_local_address: ${_param:single_address}
-@@ -23,5 +23,5 @@ parameters:
+@@ -25,8 +25,8 @@ parameters:
    linux:
      network:
        interface:
@@ -353,6 +353,9 @@ index 4a56b65..128ec1b 100644
 -        ens3: ${_param:linux_single_interface}
 +        enp1s0: ${_param:linux_dhcp_interface}
 +        enp2s0: ${_param:linux_single_interface}
+   mongodb:
+     server:
+       logging:
 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 a75b41d..3979fd1 100644
 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml
@@ -369,7 +372,7 @@ index a75b41d..3979fd1 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 d919fe7..5025cd4 100644
+index 5c8026f..ca1b44b 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:
@@ -596,10 +599,10 @@ index 881644b..f510a7b 100644
 +        enp1s0: ${_param:linux_dhcp_interface}
 +        enp2s0: ${_param:linux_single_interface}
 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
-index 2147741..4e25b78 100644
+index 30f2c46..72dac26 100644
 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
-@@ -15,7 +15,7 @@ classes:
+@@ -17,7 +17,7 @@ classes:
  # - cluster.baremetal-mcp-ocata-ovs-ha.stacklight.proxy
  parameters:
    _param:
@@ -608,7 +611,7 @@ index 2147741..4e25b78 100644
      keepalived_vip_virtual_router_id: 240
      nginx_proxy_ssl:
        enabled: true
-@@ -27,8 +27,8 @@ parameters:
+@@ -29,8 +29,8 @@ parameters:
    linux:
      network:
        interface:
@@ -620,19 +623,19 @@ index 2147741..4e25b78 100644
        package:
          libapache2-mod-wsgi:
 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml
-index 505ee7f..6ad13ae 100644
+index 0e3c7bd..9702576 100644
 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml
 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml
-@@ -10,7 +10,7 @@ classes:
+@@ -12,7 +12,7 @@ classes:
  - cluster.baremetal-mcp-ocata-ovs-ha.infra
  parameters:
    _param:
--    keepalived_vip_interface: ens3
-+    keepalived_vip_interface: enp2s0
+-    keepalived_openstack_telemetry_vip_interface: ens3
++    keepalived_openstack_telemetry_vip_interface: enp2s0
      keepalived_vip_virtual_router_id: 230
      cluster_vip_address: ${_param:openstack_telemetry_address}
      cluster_local_address: ${_param:single_address}
-@@ -23,5 +23,5 @@ parameters:
+@@ -25,8 +25,8 @@ parameters:
    linux:
      network:
        interface:
@@ -640,3 +643,6 @@ index 505ee7f..6ad13ae 100644
 -        ens3: ${_param:linux_single_interface}
 +        enp1s0: ${_param:linux_dhcp_interface}
 +        enp2s0: ${_param:linux_single_interface}
+   mongodb:
+     server:
+       logging:
diff --git a/patches/opnfv-fuel/0009-network-public-mgmt-Use-arm-pod3-POD-config.patch b/patches/opnfv-fuel/0009-network-public-mgmt-Use-arm-pod3-POD-config.patch
index 787dd8e1..770b5f8f 100644
--- a/patches/opnfv-fuel/0009-network-public-mgmt-Use-arm-pod3-POD-config.patch
+++ b/patches/opnfv-fuel/0009-network-public-mgmt-Use-arm-pod3-POD-config.patch
@@ -24,12 +24,12 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  7 files changed, 86 insertions(+), 86 deletions(-)
 
 diff --git a/ci/deploy.sh b/ci/deploy.sh
-index f51ba5f..5582727 100755
+index 72dedfc..0f08f1c 100755
 --- a/ci/deploy.sh
 +++ b/ci/deploy.sh
-@@ -139,7 +139,7 @@ URI_REGEXP='(file|https?|ftp)://.*'
-
- export SSH_KEY=${SSH_KEY:-mcp.rsa}
+@@ -143,7 +143,7 @@ URI_REGEXP='(file|https?|ftp)://.*'
+ # unless SSH_KEY is set to point to non-root user's home (e.g. via env var).
+ export SSH_KEY=${SSH_KEY:-"${HOME}/opnfv/mcp.rsa"}
  export SALT_MASTER=${SALT_MASTER_IP:-192.168.10.100}
 -export MAAS_IP=${MAAS_IP:-192.168.10.3}
 +export MAAS_IP=${MAAS_IP:-192.168.10.2}
@@ -50,10 +50,10 @@ index 6c2ae04..787d713 100755
  wait_for 10 "salt -C 'mas01*' state.apply maas.region"
 
 diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
-index 7ba9d82..af3e298 100755
+index 6c68e15..99483f3 100755
 --- a/mcp/config/states/openstack_ha
 +++ b/mcp/config/states/openstack_ha
-@@ -46,5 +46,5 @@ salt -I 'nova:compute' state.sls armband
+@@ -51,5 +51,5 @@ salt -I 'ceilometer:agent' state.sls ceilometer
  salt -I 'horizon:server' state.sls horizon
  salt -I 'nginx:server' state.sls nginx
 
diff --git a/patches/opnfv-fuel/0014-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0014-virtng.py-virt.sls-Extend-libvirt_domain.patch
index 8a8c6b1a..5c5cc131 100644
--- a/patches/opnfv-fuel/0014-virtng.py-virt.sls-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0014-virtng.py-virt.sls-Extend-libvirt_domain.patch
@@ -160,7 +160,7 @@ index 46a9556..f6504ab 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-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
-index 32fd829..78babbb 100644
+index 766a495..80c7156 100644
 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
 @@ -34,16 +34,25 @@ parameters:
@@ -188,7 +188,7 @@ index 32fd829..78babbb 100644
 +          cpu_model: host-passthrough
            disk_profile: small
            net_profile: default
- #        openstack.telemetry:
+         openstack.telemetry:
 @@ -54,6 +63,9 @@ parameters:
          openstack.proxy:
            cpu: 2
@@ -210,7 +210,7 @@ index 32fd829..78babbb 100644
            net_profile: default
        cluster:
 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 5025cd4..f4c6291 100644
+index ca1b44b..78011a9 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
 @@ -34,26 +34,41 @@ parameters:
@@ -240,7 +240,7 @@ index 5025cd4..f4c6291 100644
            net_profile: default
          openstack.telemetry:
            cpu: 2
-           ram: 4096
+           ram: 3072
 +          hw_firmware_type: uefi
 +          virt_machine_model: virt
 +          cpu_model: host-passthrough
diff --git a/patches/opnfv-fuel/0017-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch b/patches/opnfv-fuel/0017-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch
index 39ff8438..84905a4b 100644
--- a/patches/opnfv-fuel/0017-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch
+++ b/patches/opnfv-fuel/0017-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch
@@ -31,11 +31,11 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  1 file changed, 10 insertions(+)
 
 diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
-index 67c960a..ce217e9 100644
+index 1812663..884e852 100644
 --- a/mcp/scripts/lib.sh
 +++ b/mcp/scripts/lib.sh
-@@ -25,6 +25,15 @@ get_base_image() {
-   wget -P /tmp -N "${base_image}"
+@@ -28,6 +28,15 @@ get_base_image() {
+   wget -P "${image_dir}" -N "${base_image}"
  }
 
 +cleanup_uefi() {
@@ -50,11 +50,11 @@ index 67c960a..ce217e9 100644
  cleanup_vms() {
    # clean up existing nodes
    for node in $(virsh list --name | grep -P '\w{3}\d{2}'); do
-@@ -39,6 +48,7 @@ prepare_vms() {
-   local -n vnodes=$1
+@@ -43,6 +52,7 @@ prepare_vms() {
    local base_image=$2
+   local image_dir=$3
 
 +  cleanup_uefi
    cleanup_vms
-   get_base_image "${base_image}"
+   get_base_image "${base_image}" "${image_dir}"
    envsubst '${SALT_MASTER},${CLUSTER_DOMAIN}' < \