Merge "sm-storage: fixed installation of storage role for new framewo…

…rk" into R2.1

contrail/environment/modules/contrail/files/config-storage-ceph-log-rotate

@@ -0,0 +1,33 @@
+## This is file is managed by puppet.
+## DON'T CHANGE ANYTHING HERE. 
+## ANY CHANGES MADE WILL BE OVER-WRITTEN
+/var/log/ceph/*.log {
+    rotate 7
+    daily
+    size 500M
+    compress
+    sharedscripts
+    postrotate
+        if which invoke-rc.d > /dev/null 2>&1 && [ -x `which invoke-rc.d` ]; then
+            invoke-rc.d ceph reload >/dev/null
+        elif which service > /dev/null 2>&1 && [ -x `which service` ]; then
+            service ceph reload >/dev/null
+        fi
+        # Possibly reload twice, but depending on ceph.conf the reload above may be a no-op
+        if which initctl > /dev/null 2>&1 && [ -x `which initctl` ]; then
+            for daemon in osd mon mds ; do
+              find -L /var/lib/ceph/$daemon/ -mindepth 1 -maxdepth 1 -regextype posix-egrep -regex '.*/[A-Za-z0-9]+-[A-Za-z0-9._-]+' -printf '%P\n' \
+                | while read f; do
+                    if [ -e "/var/lib/ceph/$daemon/$f/done" ] && [ -e "/var/lib/ceph/$daemon/$f/upstart" ] && [ ! -e "/var/lib/ceph/$daemon/$f/sysvinit" ]; then
+                      cluster="${f%%-*}"
+                      id="${f#*-}"
+
+                      initctl reload ceph-$daemon cluster="$cluster" id="$id" 2>/dev/null || :
+                    fi
+                  done
+            done
+        fi
+    endscript
+    missingok
+    notifempty
+}

contrail/environment/modules/contrail/manifests/compute.pp

@@ -610,7 +610,12 @@
 	    require => Exec["setup-compute-server-setup"],
 	    provider => "shell",
 	    logoutput => 'true'
-	}
+	} -> 
+        file { "/etc/contrail/interface_renamed" :
+            ensure  => present,
+            mode => 0644,
+            content => "2"
+        }
         contrail::lib::report_status { "compute_completed": state => "compute_completed" }
 
     }

contrail/environment/modules/contrail/manifests/lib/storage_common.pp

@@ -30,15 +30,15 @@
 		command => "service ceph-rest-api restart",
 		provider => shell,
 		require => File['contrail-storage-rest-api.conf']
-	}
+	} ->
 	file { "ceph-osd-setup-file":
 	    path => "/etc/contrail/contrail_setup_utils/config-storage-add-osd.sh",
 	    ensure  => present,
 	    mode => 0755,
 	    owner => root,
 	    group => root,
 	    source => "puppet:///modules/$module_name/config-storage-add-osd.sh",
-	}
+	} ->
 
 	file { "ceph-disk-clean-file":
 	    path => "/etc/contrail/contrail_setup_utils/config-storage-disk-clean.sh",
@@ -47,7 +47,7 @@
 	    owner => root,
 	    group => root,
 	    source => "puppet:///modules/$module_name/config-storage-disk-clean.sh",
-	}
+	} ->
         file { "ceph-log-rotate":
 	    path => "/etc/logrotate.d/ceph",
 	    ensure  => present,
@@ -77,7 +77,7 @@
 		mon_host => "$contrail_storage_mon_hosts",
 		keyring => '/etc/ceph/$cluster.$name.keyring',
 		cluster_network => $contrail_storage_cluster_network,
-		require => Package['contrail-storage'],
+		#require => Package['contrail-storage'],
 	} ->
 	ceph::mon { $contrail_storage_hostname: 
 		key => $contrail_storage_mon_secret
@@ -173,6 +173,7 @@
 	    Ceph::Key<| title == 'client.bootstrap-osd' |> -> Exec['setup-config-storage-compute']
 	    file { "config-storage-compute.sh":
 		ensure  => present,
+                path => "/etc/contrail/contrail_setup_utils/config-storage-compute.sh",
 		mode => 0755,
 		owner => root,
 		group => root,