Merge pull request aws#40 in VFS/bamboos from feature/VFS-1129-packag…

…es-deb-and-rpm to develop

# By Tomasz Lichon
# Via Tomasz Lichon
* commit '0bc7c5176781e6dc8f0147d85d7999bd380d0820':
  VFS-1129 Remove old bamboos config
  VFS-1129 Remove old bamboos scripts
  VFS-1129 Rename oneprovider_node -> op_worker in base repo

docker/environment/env.py

@@ -60,8 +60,8 @@ def up(config_path, image=default('image'), bin_am=default('bin_am'),
                                         config_path)
         common.merge(output, op_ccm_output)
 
-    # Start oneprovider_node instances
-    if 'oneprovider_node' in config:
+    # Start op_worker instances
+    if 'op_worker' in config:
         op_worker_output = provider_worker.up(image, bin_op_worker, logdir, dns,
                                               uid, config_path)
         common.merge(output, op_worker_output)

docker/environment/provider_worker.py

@@ -50,9 +50,9 @@ def _node_up(image, bindir, logdir, uid, config, dns_servers, db_node_mappings):
 {gen_dev_args}
 EOF
 escript bamboos/gen_dev/gen_dev.escript /tmp/gen_dev_args.json
-/root/bin/node/bin/oneprovider_node console'''
+/root/bin/node/bin/op_worker console'''
     command = command.format(
-        gen_dev_args=json.dumps({'oneprovider_node': config}),
+        gen_dev_args=json.dumps({'op_worker': config}),
         uid=os.geteuid(),
         gid=os.getegid())
 
@@ -110,7 +110,7 @@ def _riak_up(configs, dns_servers, uid):
 
 
 def up(image, bindir, logdir, dns, uid, config_path):
-    config = common.parse_json_file(config_path)['oneprovider_node']
+    config = common.parse_json_file(config_path)['op_worker']
     config['config']['target_dir'] = '/root/bin'
     configs = [_tweak_config(config, node, uid) for node in config['nodes']]
 

example_env/gen_dev_args.json

@@ -17,9 +17,9 @@
             }
         }
     },
-    "oneprovider_node": {
+    "op_worker": {
         "config": {
-            "input_dir": "rel/oneprovider_node",
+            "input_dir": "rel/op_worker",
             "target_dir": "rel/test_cluster"
         },
         "nodes": {
@@ -96,7 +96,7 @@
             "onepanel1": {
                 "vm.args": {
                     "name": "onepanel@onepanel1",
-                    "setcookie": "oneprovider_node"
+                    "setcookie": "cookie"
                 },
                 "sys.config": {
                     "multicast_address": {"string": "239.255.0.1"}
@@ -105,7 +105,7 @@
             "onepanel2": {
                 "vm.args": {
                     "name": "onepanel@onepanel2",
-                    "setcookie": "oneprovider_node"
+                    "setcookie": "cookie"
                 },
                 "sys.config": {
                     "multicast_address": {"string": "239.255.0.1"}