diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-05-20 22:33:56 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-05-22 16:46:01 +0000 |
| commit | c70aa3538ef9b1da9b360ae3ba7112d8289ab876 (patch) | |
| tree | 48611daf16d0ba3da633614b97870d867265c95c | |
| parent | d3be5fd69faaf2c5c549c47e20492c269c42c6a3 (diff) | |
u/fuel: Bump & rebase for MCP repos on HA
Switch from UCA pike-staging repository to Mirantis MCP repo.
Change-Id: I7f4935521a0ff649ca0919d0d1be37ca17263051
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 76919718c06a6dd58d63a1bc9b699d56d9086cdb)
| -rw-r--r-- | patches/opnfv-fuel/0012-Set-volume-name-in-source-file-to-sdX.patch | 4 | ||||
| m--------- | upstream/fuel | 0 |
2 files changed, 2 insertions, 2 deletions
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 ade946d5..452bd1a8 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 @@ -17,10 +17,10 @@ Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com> 2 files changed, 2 insertions(+), 2 deletions(-) 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 6f7b33e3..dfc212e2 100644 +index 599c48e8..018253bb 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 -@@ -139,7 +139,7 @@ parameters: +@@ -130,7 +130,7 @@ parameters: server: cacert: /etc/ssl/certs/mcp_os_cacert openrc_extra: diff --git a/upstream/fuel b/upstream/fuel -Subproject fde64636e043bd54057987f3850c784723cd32f +Subproject a021366c0934d74889ac7d64e0857e35bdd0319 |