Merge branch 'sl-config-disk-path' into master

Signed-off-by: Maria Shaldibina <[email protected]>
bingosummer · Oct 10, 2014 · 8e3faf4 · 8e3faf4
2 parents be70bbe + 79fdbc7
commit 8e3faf4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/infrastructure/openstack_metadata_service_provider.go b/infrastructure/openstack_metadata_service_provider.go
@@ -38,6 +38,7 @@ func (inf openstackServiceProvider) Get() MetadataService {
 		configDriveDiskPaths := []string{
 			"/dev/disk/by-label/CONFIG-2",
 			"/dev/disk/by-label/config-2",
+			"/dev/disk/by-label/METADATA",
 		}
 
 		confDriveMetadataService := NewConfigDriveMetadataService(

diff --git a/infrastructure/openstack_metadata_service_provider_test.go b/infrastructure/openstack_metadata_service_provider_test.go
@@ -48,6 +48,7 @@ var _ = Describe("OpenstackMetadataServiceProvider", func() {
 					configDriveDiskPaths := []string{
 						"/dev/disk/by-label/CONFIG-2",
 						"/dev/disk/by-label/config-2",
+						"/dev/disk/by-label/METADATA",
 					}
 
 					configDriveMetadataService := NewConfigDriveMetadataService(