summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch4
-rw-r--r--patches/opnfv-fuel/0012-Set-volume-name-in-source-file-to-sdX.patch10
m---------upstream/fuel0
3 files changed, 7 insertions, 7 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 122a72cd..ebcc8065 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
@@ -56,10 +56,10 @@ index 77063d6c..e17f92a5 100755
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 4c8cbcf8..1cf54240 100755
+index a266989a..77557caa 100755
--- a/mcp/config/states/openstack_noha
+++ b/mcp/config/states/openstack_noha
-@@ -53,6 +53,8 @@ salt -I 'ceilometer:agent' state.sls ceilometer
+@@ -55,6 +55,8 @@ salt -I 'ceilometer:agent' state.sls ceilometer
salt -I 'horizon:server' state.sls horizon
diff --git a/patches/opnfv-fuel/0012-Set-volume-name-in-source-file-to-sdX.patch b/patches/opnfv-fuel/0012-Set-volume-name-in-source-file-to-sdX.patch
index 503c6ab1..ade946d5 100644
--- a/patches/opnfv-fuel/0012-Set-volume-name-in-source-file-to-sdX.patch
+++ b/patches/opnfv-fuel/0012-Set-volume-name-in-source-file-to-sdX.patch
@@ -30,15 +30,15 @@ index 6f7b33e3..dfc212e2 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 01b32097..1b970412 100644
+index 29b2d627..3a994b8d 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
-@@ -57,7 +57,7 @@ parameters:
+@@ -71,7 +71,7 @@ parameters:
server:
admin_email: ${_param:admin_email}
openrc_extra:
- volume_device_name: vdc
+ volume_device_name: sdc
- glance:
- server:
- storage:
+ pkgs:
+ - keystone
+ - python-psycopg2
diff --git a/upstream/fuel b/upstream/fuel
-Subproject b9da44077a589ac8debf12d86d8aefe4be5dc84
+Subproject fde64636e043bd54057987f3850c784723cd32f