AMBARI-6733. Could not change values in storm-env.sh from UI.(vbrodetskyi)

ambari-agent/pom.xml

@@ -114,7 +114,7 @@
                 <argument>unitTests.py</argument>
               </arguments>
               <environmentVariables>
-                <PYTHONPATH>${project.basedir}/../ambari-common/src/main/python/jinja2:${project.basedir}/../ambari-common/src/main/python/ambari_commons:${project.basedir}/../ambari-common/src/main/python/resource_management:${project.basedir}/../ambari-common/src/test/python:${project.basedir}/../ambari-common/src/main/python:${project.basedir}/src/main/python/ambari_agent:${project.basedir}/src/test/python/ambari_agent:${project.basedir}/src/test/python/resource_management:${project.basedir}/src/main/python:${project.basedir}/../ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/files:${project.basedir}/../ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/files:$PYTHONPATH</PYTHONPATH>
+                <PYTHONPATH>${project.basedir}/../ambari-common/src/main/python/jinja2:${project.basedir}/../ambari-common/src/main/python/ambari_commons:${project.basedir}/../ambari-common/src/main/python/resource_management:${project.basedir}/../ambari-common/src/test/python:${project.basedir}/../ambari-common/src/main/python:${project.basedir}/src/main/python/ambari_agent:${project.basedir}/src/test/python/ambari_agent:${project.basedir}/src/main/python:${project.basedir}/../ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/files:${project.basedir}/../ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/files:$PYTHONPATH</PYTHONPATH>
               </environmentVariables>
               <skip>${skipTests}</skip>
             </configuration>

ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/storm.py

@@ -44,13 +44,13 @@ def storm():
               owner=params.storm_user,
               group=params.user_group
   )
-  
+
   File(format("{conf_dir}/storm-env.sh"),
     owner=params.storm_user,
-    content="InlineTemplate"
+    content=params.storm_env_sh_template
   )
 
   if params.security_enabled:
     TemplateConfig(format("{conf_dir}/storm_jaas.conf"),
                    owner=params.storm_user
-    )
+    )

ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py

@@ -158,7 +158,7 @@ class TestStormDrpcServer(RMFTestCase):
     )
     self.assertResourceCalled('File', '/etc/storm/conf/storm-env.sh',
                               owner = 'storm',
-                              content = 'InlineTemplate'
+                              content = self.getConfig()['configurations']['storm-env']['content']
                               )
 
   def assert_configure_secured(self):
@@ -195,7 +195,7 @@ class TestStormDrpcServer(RMFTestCase):
     )
     self.assertResourceCalled('File', '/etc/storm/conf/storm-env.sh',
                               owner = 'storm',
-                              content = 'InlineTemplate'
+                              content = self.getConfig()['configurations']['storm-env']['content']
                               )
     self.assertResourceCalled('TemplateConfig', '/etc/storm/conf/storm_jaas.conf',
       owner = 'storm',

ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py

@@ -158,7 +158,7 @@ class TestStormNimbus(RMFTestCase):
     )
     self.assertResourceCalled('File', '/etc/storm/conf/storm-env.sh',
                               owner = 'storm',
-                              content = 'InlineTemplate'
+                              content = self.getConfig()['configurations']['storm-env']['content']
                               )
 
   def assert_configure_secured(self):
@@ -195,7 +195,7 @@ class TestStormNimbus(RMFTestCase):
     )
     self.assertResourceCalled('File', '/etc/storm/conf/storm-env.sh',
                               owner = 'storm',
-                              content = 'InlineTemplate'
+                              content = self.getConfig()['configurations']['storm-env']['content']
                               )
     self.assertResourceCalled('TemplateConfig', '/etc/storm/conf/storm_jaas.conf',
       owner = 'storm',

ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus_prod.py

@@ -45,7 +45,7 @@ class TestStormNimbus(RMFTestCase):
     self.assertResourceCalled('Execute', 'supervisorctl start storm-nimbus',
                         wait_for_finish = False,
     )
-    
+
     self.assertNoMoreResources()
 
   def test_stop_default(self):
@@ -79,7 +79,7 @@ class TestStormNimbus(RMFTestCase):
     self.assertResourceCalled('Execute', 'supervisorctl start storm-nimbus',
                         wait_for_finish = False,
     )
-    
+
     self.assertNoMoreResources()
 
   def test_stop_secured(self):
@@ -98,27 +98,27 @@ class TestStormNimbus(RMFTestCase):
       owner = 'storm',
       group = 'hadoop',
       recursive = True,
-    )    
+    )
     self.assertResourceCalled('Directory', '/var/run/storm',
       owner = 'storm',
       group = 'hadoop',
       recursive = True,
-    )    
+    )
     self.assertResourceCalled('Directory', '/hadoop/storm',
       owner = 'storm',
       group = 'hadoop',
       recursive = True,
-    )    
+    )
     self.assertResourceCalled('Directory', '/etc/storm/conf',
       owner = 'storm',
       group = 'hadoop',
       recursive = True,
-    )    
+    )
     self.assertResourceCalled('File', '/etc/storm/conf/config.yaml',
       owner = 'storm',
       content = Template('config.yaml.j2'),
       group = 'hadoop',
-    )    
+    )
     self.assertResourceCalled('File', '/etc/storm/conf/storm.yaml',
       owner = 'storm',
       content = 'InlineTemplateMock',
@@ -127,7 +127,7 @@ class TestStormNimbus(RMFTestCase):
     )
     self.assertResourceCalled('File', '/etc/storm/conf/storm-env.sh',
                               owner = 'storm',
-                              content = 'InlineTemplate'
+                              content = self.getConfig()['configurations']['storm-env']['content']
                               )
 
   def assert_configure_secured(self):
@@ -135,27 +135,27 @@ class TestStormNimbus(RMFTestCase):
       owner = 'storm',
       group = 'hadoop',
       recursive = True,
-    )    
+    )
     self.assertResourceCalled('Directory', '/var/run/storm',
       owner = 'storm',
       group = 'hadoop',
       recursive = True,
-    )    
+    )
     self.assertResourceCalled('Directory', '/hadoop/storm',
       owner = 'storm',
       group = 'hadoop',
       recursive = True,
-    )    
+    )
     self.assertResourceCalled('Directory', '/etc/storm/conf',
       owner = 'storm',
       group = 'hadoop',
       recursive = True,
-    )    
+    )
     self.assertResourceCalled('File', '/etc/storm/conf/config.yaml',
       owner = 'storm',
       content = Template('config.yaml.j2'),
       group = 'hadoop',
-    )    
+    )
     self.assertResourceCalled('File', '/etc/storm/conf/storm.yaml',
       owner = 'storm',
       content = 'InlineTemplateMock',
@@ -164,7 +164,7 @@ class TestStormNimbus(RMFTestCase):
     )
     self.assertResourceCalled('File', '/etc/storm/conf/storm-env.sh',
                               owner = 'storm',
-                              content = 'InlineTemplate'
+                              content = self.getConfig()['configurations']['storm-env']['content']
                               )
     self.assertResourceCalled('TemplateConfig', '/etc/storm/conf/storm_jaas.conf',
       owner = 'storm',

ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py

@@ -158,7 +158,7 @@ class TestStormRestApi(RMFTestCase):
     )
     self.assertResourceCalled('File', '/etc/storm/conf/storm-env.sh',
                               owner = 'storm',
-                              content = 'InlineTemplate'
+                              content = self.getConfig()['configurations']['storm-env']['content']
                               )
 
   def assert_configure_secured(self):
@@ -195,7 +195,7 @@ class TestStormRestApi(RMFTestCase):
     )
     self.assertResourceCalled('File', '/etc/storm/conf/storm-env.sh',
                               owner = 'storm',
-                              content = 'InlineTemplate'
+                              content = self.getConfig()['configurations']['storm-env']['content']
                               )
     self.assertResourceCalled('TemplateConfig', '/etc/storm/conf/storm_jaas.conf',
       owner = 'storm',

ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py

@@ -197,7 +197,7 @@ class TestStormSupervisor(RMFTestCase):
     )
     self.assertResourceCalled('File', '/etc/storm/conf/storm-env.sh',
                               owner = 'storm',
-                              content = 'InlineTemplate'
+                              content = self.getConfig()['configurations']['storm-env']['content']
                               )
 
   def assert_configure_secured(self):
@@ -234,7 +234,7 @@ class TestStormSupervisor(RMFTestCase):
     )
     self.assertResourceCalled('File', '/etc/storm/conf/storm-env.sh',
                               owner = 'storm',
-                              content = 'InlineTemplate'
+                              content = self.getConfig()['configurations']['storm-env']['content']
                               )
     self.assertResourceCalled('TemplateConfig', '/etc/storm/conf/storm_jaas.conf',
       owner = 'storm',

ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py

@@ -42,7 +42,7 @@ class TestStormSupervisor(RMFTestCase):
     )
 
     self.assert_configure_default()
-    
+
     self.assertResourceCalled('Execute', 'supervisorctl start storm-supervisor',
       wait_for_finish = False,
     )
@@ -57,7 +57,7 @@ class TestStormSupervisor(RMFTestCase):
       user = 'storm',
       try_sleep = 10,
     )
-    
+
     self.assertNoMoreResources()
 
   def test_stop_default(self):
@@ -78,7 +78,7 @@ class TestStormSupervisor(RMFTestCase):
     )
     self.assertResourceCalled('Execute', 'rm -f /var/run/storm/logviewer.pid',
     )
-    
+
     self.assertNoMoreResources()
 
   def test_configure_default(self):
@@ -98,7 +98,7 @@ class TestStormSupervisor(RMFTestCase):
     )
 
     self.assert_configure_secured()
-    
+
     self.assertResourceCalled('Execute', 'supervisorctl start storm-supervisor',
                         wait_for_finish = False,
     )
@@ -113,7 +113,7 @@ class TestStormSupervisor(RMFTestCase):
       user = 'storm',
       try_sleep = 10,
     )
-    
+
     self.assertNoMoreResources()
 
   def test_stop_secured(self):
@@ -122,7 +122,7 @@ class TestStormSupervisor(RMFTestCase):
                        command = "stop",
                        config_file="secured.json"
     )
-    
+
     self.assertResourceCalled('Execute', 'supervisorctl stop storm-supervisor',
                               wait_for_finish = False,
     )
@@ -135,7 +135,7 @@ class TestStormSupervisor(RMFTestCase):
     )
     self.assertResourceCalled('Execute', 'rm -f /var/run/storm/logviewer.pid',
     )
-    
+
     self.assertNoMoreResources()
 
   def assert_configure_default(self):
@@ -143,27 +143,27 @@ class TestStormSupervisor(RMFTestCase):
       owner = 'storm',
       group = 'hadoop',
       recursive = True,
-    )    
+    )
     self.assertResourceCalled('Directory', '/var/run/storm',
       owner = 'storm',
       group = 'hadoop',
       recursive = True,
-    )    
+    )
     self.assertResourceCalled('Directory', '/hadoop/storm',
       owner = 'storm',
       group = 'hadoop',
       recursive = True,
-    )    
+    )
     self.assertResourceCalled('Directory', '/etc/storm/conf',
       owner = 'storm',
       group = 'hadoop',
       recursive = True,
-    )    
+    )
     self.assertResourceCalled('File', '/etc/storm/conf/config.yaml',
       owner = 'storm',
       content = Template('config.yaml.j2'),
       group = 'hadoop',
-    )    
+    )
     self.assertResourceCalled('File', '/etc/storm/conf/storm.yaml',
       owner = 'storm',
       content = 'InlineTemplateMock',
@@ -172,7 +172,7 @@ class TestStormSupervisor(RMFTestCase):
     )
     self.assertResourceCalled('File', '/etc/storm/conf/storm-env.sh',
                               owner = 'storm',
-                              content = 'InlineTemplate'
+                              content = self.getConfig()['configurations']['storm-env']['content']
                               )
 
   def assert_configure_secured(self):
@@ -180,27 +180,27 @@ class TestStormSupervisor(RMFTestCase):
       owner = 'storm',
       group = 'hadoop',
       recursive = True,
-    )    
+    )
     self.assertResourceCalled('Directory', '/var/run/storm',
       owner = 'storm',
       group = 'hadoop',
       recursive = True,
-    )    
+    )
     self.assertResourceCalled('Directory', '/hadoop/storm',
       owner = 'storm',
       group = 'hadoop',
       recursive = True,
-    )    
+    )
     self.assertResourceCalled('Directory', '/etc/storm/conf',
       owner = 'storm',
       group = 'hadoop',
       recursive = True,
-    )    
+    )
     self.assertResourceCalled('File', '/etc/storm/conf/config.yaml',
       owner = 'storm',
       content = Template('config.yaml.j2'),
       group = 'hadoop',
-    )    
+    )
     self.assertResourceCalled('File', '/etc/storm/conf/storm.yaml',
       owner = 'storm',
       content = 'InlineTemplateMock',
@@ -209,7 +209,7 @@ class TestStormSupervisor(RMFTestCase):
     )
     self.assertResourceCalled('File', '/etc/storm/conf/storm-env.sh',
                               owner = 'storm',
-                              content = 'InlineTemplate'
+                              content = self.getConfig()['configurations']['storm-env']['content']
                               )
     self.assertResourceCalled('TemplateConfig', '/etc/storm/conf/storm_jaas.conf',
       owner = 'storm',

ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py

@@ -158,7 +158,7 @@ class TestStormUiServer(RMFTestCase):
     )
     self.assertResourceCalled('File', '/etc/storm/conf/storm-env.sh',
                               owner = 'storm',
-                              content = 'InlineTemplate'
+                              content = self.getConfig()['configurations']['storm-env']['content']
                               )
 
   def assert_configure_secured(self):
@@ -195,7 +195,7 @@ class TestStormUiServer(RMFTestCase):
     )
     self.assertResourceCalled('File', '/etc/storm/conf/storm-env.sh',
                               owner = 'storm',
-                              content = 'InlineTemplate'
+                              content = self.getConfig()['configurations']['storm-env']['content']
                               )
     self.assertResourceCalled('TemplateConfig', '/etc/storm/conf/storm_jaas.conf',
       owner = 'storm',