diff options
| -rw-r--r-- | jjb/yaml/verizoncloudplatform.com/ob-ctl.yaml | 27 | ||||
| -rw-r--r-- | jjb/yaml/verizoncloudplatform.com/ob-deploy-branch.yaml | 3 | ||||
| -rw-r--r-- | pillar/openbook/ansible.sls | 30 | ||||
| -rw-r--r-- | salt/openbook/ansible/files/inventory_json.rb | 2 |
4 files changed, 61 insertions, 1 deletions
diff --git a/jjb/yaml/verizoncloudplatform.com/ob-ctl.yaml b/jjb/yaml/verizoncloudplatform.com/ob-ctl.yaml index 81a530a..dbfae0f 100644 --- a/jjb/yaml/verizoncloudplatform.com/ob-ctl.yaml +++ b/jjb/yaml/verizoncloudplatform.com/ob-ctl.yaml @@ -74,6 +74,33 @@ - "ob-ctl-{action}-{branch}": branch: "master_db" action: "restart" + - "ob-ctl-{action}-{branch}": + branch: "v3_lab_db" + action: "stop" + - "ob-ctl-{action}-{branch}": + branch: "v3_lab_db" + action: "start" + - "ob-ctl-{action}-{branch}": + branch: "v3_lab_db" + action: "restart" + - "ob-ctl-{action}-{branch}": + branch: "v3_staging_db" + action: "stop" + - "ob-ctl-{action}-{branch}": + branch: "v3_staging_db" + action: "start" + - "ob-ctl-{action}-{branch}": + branch: "v3_staging_db" + action: "restart" + - "ob-ctl-{action}-{branch}": + branch: "v3_prod_db" + action: "stop" + - "ob-ctl-{action}-{branch}": + branch: "v3_prod_db" + action: "start" + - "ob-ctl-{action}-{branch}": + branch: "v3_prod_db" + action: "restart" - job-template: name: "ob-ctl-{action}-{branch}" diff --git a/jjb/yaml/verizoncloudplatform.com/ob-deploy-branch.yaml b/jjb/yaml/verizoncloudplatform.com/ob-deploy-branch.yaml index baf74dc..83e70c4 100644 --- a/jjb/yaml/verizoncloudplatform.com/ob-deploy-branch.yaml +++ b/jjb/yaml/verizoncloudplatform.com/ob-deploy-branch.yaml @@ -10,6 +10,9 @@ - "stage_db" - "master" - "master_db" + - "v3_lab_db" + - "v3_stage_db" + - "v3_prod_db" jobs: - "ob-deploy-branch-{branch}" diff --git a/pillar/openbook/ansible.sls b/pillar/openbook/ansible.sls index aa98e8a..48e838a 100644 --- a/pillar/openbook/ansible.sls +++ b/pillar/openbook/ansible.sls @@ -243,6 +243,36 @@ ansible: mode: "0755" relative_to_buildroot: True is_template: False + inventory_json_v3_lab_db_rb: + name: inventory_json_v3_lab_db.rb + source: inventory_json.rb + mode: "0755" + relative_to_buildroot: True + is_template: False + inventory_json_v3_staging_db_rb: + name: inventory_json_v3_staging_db.rb + source: inventory_json.rb + mode: "0755" + relative_to_buildroot: True + is_template: False + inventory_json_v3_prod_db_rb: + name: inventory_json_v3_prod_db.rb + source: inventory_json.rb + mode: "0755" + relative_to_buildroot: True + is_template: False + inventory_json_master_db_rb: + name: inventory_json_master_db.rb + source: inventory_json.rb + mode: "0755" + relative_to_buildroot: True + is_template: False + inventory_json_master_db_rb: + name: inventory_json_master_db.rb + source: inventory_json.rb + mode: "0755" + relative_to_buildroot: True + is_template: False ob_deploy_branch_sh: name: ob-deploy-branch.sh source: ob-deploy-branch.sh diff --git a/salt/openbook/ansible/files/inventory_json.rb b/salt/openbook/ansible/files/inventory_json.rb index 4a41f97..8d42c80 100644 --- a/salt/openbook/ansible/files/inventory_json.rb +++ b/salt/openbook/ansible/files/inventory_json.rb @@ -10,7 +10,7 @@ def doit() exit(1) end environ = "" - ["unstable_db", "unstable", "develop_db", "develop", "stage_db", "stage", "master_db", "master"].each do |env| + ["v3_lab_db", "v3_staging_db", "v3_prod_db", "unstable_db", "unstable", "develop_db", "develop", "stage_db", "stage", "master_db", "master"].each do |env| if File.basename($0).include?(env) environ = env break |