diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-04-24 18:02:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-04-24 18:02:49 +0000 |
| commit | 901e1e70ec43c716430e58ee7148bc2cb9b64f6f (patch) | |
| tree | ea077769d66127a3eeee2cb4aec7b3d8eb5b3a71 | |
| parent | 67950b05d29a4520352e3337097f81ac9097e816 (diff) | |
| parent | 3c5d2bb2256316595245f1dfd0a2eea74e284fc2 (diff) | |
Merge "u/fuel: Bump & rebase for cmp MCP repos"
| -rw-r--r-- | patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch | 6 | ||||
| m--------- | upstream/fuel | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch b/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch index f8413cbd..ecbe3a5b 100644 --- a/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch +++ b/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch @@ -37,13 +37,13 @@ index df230452..5bbe0fe4 100644 - service.keepalived.cluster.single - system.glusterfs.server.volume.glance diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml -index 741f9d35..5c08d6d2 100644 +index 24acbacf..e9f95f2d 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml -@@ -7,6 +7,7 @@ - ############################################################################## +@@ -8,6 +8,7 @@ --- classes: + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.armband - system.linux.system.repo.glusterfs - system.glusterfs.client.cluster diff --git a/upstream/fuel b/upstream/fuel -Subproject cfc5988be48d1317244e71fd7919480db18745d +Subproject 58aa624bbe7d26ec23986b78f9ba59bafa7666a |