diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-05-17 21:35:53 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-05-17 21:37:35 +0200 |
| commit | 1ff8d3b91440254cf524fe2bed7e8d761acce1f3 (patch) | |
| tree | 2be0c4f785b6e76111908ae6b7c63c1715a82fe4 | |
| parent | 1bd3cdf194b12350026dc9678e6e0187236c4379 (diff) | |
u/fuel: Bump & rebase for gnocchi/panko
Change-Id: I29adc8df9b524c3c94f1916e49e36d9a916e368f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
| -rw-r--r-- | patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch | 4 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0012-Set-volume-name-in-source-file-to-sdX.patch | 10 | ||||
| m--------- | upstream/fuel | 0 |
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 |