[patch] Rebase latest changes

Change-Id: I2ada30db2d076dab8895c77075255c1bac062fe2
Signed-off-by: Delia Popescu <delia.popescu@enea.com>

5 files changed, 38 insertions, 34 deletions

diff --git a/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch
index e228b805..6a2af3c8 100644
--- a/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch
+++ b/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch
@@ -26,15 +26,15 @@ Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
 Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- mcp/config/states/openstack_ha                |   1 +
- mcp/config/states/openstack_noha              |   2 +
- mcp/config/states/virtual_control_plane       |   1 +
- .../files/nova-libvirt-aarch64-rollup.diff    | 106 ++++++++++++++++++
- mcp/salt-formulas/armband/init.sls            |   7 ++
- mcp/salt-formulas/armband/nova_config.sls     |  35 ++++++
- mcp/salt-formulas/armband/nova_libvirt.sls    |   7 ++
- mcp/salt-formulas/armband/qemu_efi.sls        |   2 +
- mcp/salt-formulas/armband/vgabios.sls         |   7 ++
+ mcp/config/states/openstack_ha                     |   1 +
+ mcp/config/states/openstack_noha                   |   2 +
+ mcp/config/states/virtual_control_plane            |   1 +
+ .../armband/files/nova-libvirt-aarch64-rollup.diff | 106 +++++++++++++++++++++
+ mcp/salt-formulas/armband/init.sls                 |   7 ++
+ mcp/salt-formulas/armband/nova_config.sls          |  35 +++++++
+ mcp/salt-formulas/armband/nova_libvirt.sls         |   7 ++
+ mcp/salt-formulas/armband/qemu_efi.sls             |   2 +
+ mcp/salt-formulas/armband/vgabios.sls              |   7 ++
  9 files changed, 168 insertions(+)
  create mode 100644 mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff
  create mode 100644 mcp/salt-formulas/armband/init.sls
@@ -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 73c44bb6..4ac5d6d5 100755
+index 576a47e1..217a899e 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
@@ -53,13 +53,13 @@ index 73c44bb6..4ac5d6d5 100755
  salt -I 'nova:compute' state.sls nova
 +wait_for 5.0 "salt -I 'nova:compute' state.sls armband"
 
- salt -I 'redis:cluster:role:master' state.sls redis
- salt -I 'redis:server' state.sls redis
+ salt -C 'I@mongodb:server and *01*' state.sls mongodb || true
+ wait_for 10.0 "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 70db238b..52d643df 100755
+index 0fffd7a5..3a5b7cbd 100755
 --- a/mcp/config/states/openstack_noha
 +++ b/mcp/config/states/openstack_noha
-@@ -54,3 +54,5 @@ salt -I 'ceilometer:server' state.sls ceilometer
+@@ -52,3 +52,5 @@ salt -I 'ceilometer:server' state.sls ceilometer
  salt -I 'ceilometer:agent' state.sls ceilometer
 
  salt -I 'horizon:server' state.sls horizon
diff --git a/patches/opnfv-fuel/0003-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0003-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
index 07c447be..37fb9dd4 100644
--- a/patches/opnfv-fuel/0003-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0003-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
@@ -33,9 +33,9 @@ to pick up the changes, so we'll run it before rebooting kvm nodes.
 
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- mcp/config/states/baremetal_init              |   1 +
- .../files/salt-minion-aarch64-rollup.diff     | 101 ++++++++++++++++++
- mcp/salt-formulas/armband/salt_minion.sls     |   7 ++
+ mcp/config/states/baremetal_init                   |   1 +
+ .../armband/files/salt-minion-aarch64-rollup.diff  | 101 +++++++++++++++++++++
+ mcp/salt-formulas/armband/salt_minion.sls          |   7 ++
  3 files changed, 109 insertions(+)
  create mode 100644 mcp/salt-formulas/armband/files/salt-minion-aarch64-rollup.diff
  create mode 100644 mcp/salt-formulas/armband/salt_minion.sls
diff --git a/patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch
index 04792e16..7dc5fb6d 100644
--- a/patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch
@@ -23,11 +23,11 @@ specific values.
 
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- ...-virtng-module-Extend-libvirt_domain.patch | 54 +++++++++++++++++++
- ...t-control-virt-Extend-libvirt_domain.patch | 51 ++++++++++++++++++
- mcp/patches/patches.list                      |  2 +
- .../cluster/mcp-pike-common-ha/infra/kvm.yml  | 15 ++++++
- .../cluster/mcp-pike-odl-ha/infra/kvm.yml.j2  |  3 ++
+ .../0103-virtng-module-Extend-libvirt_domain.patch | 54 ++++++++++++++++++++++
+ ...4-salt-control-virt-Extend-libvirt_domain.patch | 51 ++++++++++++++++++++
+ mcp/patches/patches.list                           |  2 +
+ .../cluster/mcp-pike-common-ha/infra/kvm.yml       | 15 ++++++
+ .../cluster/mcp-pike-odl-ha/infra/kvm.yml.j2       |  3 ++
  5 files changed, 125 insertions(+)
  create mode 100644 mcp/patches/0103-virtng-module-Extend-libvirt_domain.patch
  create mode 100644 mcp/patches/0104-salt-control-virt-Extend-libvirt_domain.patch
diff --git a/patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch b/patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch
index 65d58a78..1b2da2d9 100644
--- a/patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch
+++ b/patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch
@@ -12,15 +12,15 @@ Subject: [PATCH] Set volume name in source file to sdX
 
 Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
 ---
- .../classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 | 2 +-
- .../classes/cluster/mcp-pike-common-noha/openstack_control.yml  | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ .../classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2     | 2 +-
+ .../classes/cluster/mcp-pike-common-noha/openstack_control.yml      | 6 ++++++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2
-index 599c48e8..018253bb 100644
+index 6f7b33e3..dfc212e2 100644
 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2
 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2
-@@ -130,7 +130,7 @@ parameters:
+@@ -139,7 +139,7 @@ parameters:
      server:
        cacert: /etc/ssl/certs/mcp_os_cacert
        openrc_extra:
@@ -30,15 +30,19 @@ index 599c48e8..018253bb 100644
      server:
        control:
 diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml
-index 29b2d627..3a994b8d 100644
+index 1c94738a..74667e21 100644
 --- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml
 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml
-@@ -71,7 +71,7 @@ parameters:
-     server:
+@@ -58,6 +58,12 @@ parameters:
        admin_email: ${_param:admin_email}
        openrc_extra:
--        volume_device_name: vdc
+         volume_device_name: vdc
 +        volume_device_name: sdc
-       pkgs:
-         - keystone
-         - python-psycopg2
++      pkgs:
++        - keystone
++        - python-psycopg2
++        - python-mysqldb
++        - python-openstackclient
+   glance:
+     server:
+       storage:
diff --git a/upstream/fuel b/upstream/fuel
-Subproject 78d368731c9582361cc291d5618e01702982f2b
+Subproject c6de9021d6b387e24363dcf4eb35692ef82d439