Merge "Add Map methods to approved scripts in Jenkins."
diff --git a/jenkins/client/job/deploy/lab/deploy.yml b/jenkins/client/job/deploy/lab/deploy.yml
index 6e716f9..5b63d94 100644
--- a/jenkins/client/job/deploy/lab/deploy.yml
+++ b/jenkins/client/job/deploy/lab/deploy.yml
@@ -1,6 +1,12 @@
parameters:
_param:
jenkins_deploy_jobs: []
+ heat_stack_zone_job_param:
+ type: string
+ default: "mcp-mk"
+ openstack_api_projects_job_param:
+ type: string
+ default: "mcp-mk"
jenkins:
client:
job_template:
@@ -125,9 +131,7 @@
HEAT_STACK_ENVIRONMENT:
type: string
default: "{{stack_env}}"
- HEAT_STACK_ZONE:
- type: string
- default: "mcp-mk"
+ HEAT_STACK_ZONE: ${_param:heat_stack_zone_job_param}
HEAT_STACK_PUBLIC_NET:
type: string
default: "public"
@@ -139,9 +143,7 @@
OPENSTACK_API_CREDENTIALS:
type: string
default: "openstack-devcloud-credentials"
- OPENSTACK_API_PROJECT:
- type: string
- default: "mcp-mk"
+ OPENSTACK_API_PROJECT: ${_param:openstack_api_projects_job_param}
OPENSTACK_API_PROJECT_DOMAIN:
type: string
default: "default"
diff --git a/jenkins/client/job/deploy/lab/release/mcp05.yml b/jenkins/client/job/deploy/lab/release/mcp05.yml
index 61d5399..a80820f 100644
--- a/jenkins/client/job/deploy/lab/release/mcp05.yml
+++ b/jenkins/client/job/deploy/lab/release/mcp05.yml
@@ -5,7 +5,7 @@
jenkins_deploy_jobs:
- stack_name: virtual_mcp05_ovs_dvr
stack_env: devcloud_virtual_mcp05_dvr
- stack_install: core,openstack,dvr
+ stack_install: core,openstack,ovs
stack_type: heat
stack_test: ""
job_timer: ""
diff --git a/jenkins/client/job/deploy/lab/release/mcp10.yml b/jenkins/client/job/deploy/lab/release/mcp10.yml
index 66f08af..bf02797 100644
--- a/jenkins/client/job/deploy/lab/release/mcp10.yml
+++ b/jenkins/client/job/deploy/lab/release/mcp10.yml
@@ -18,7 +18,7 @@
job_timer: ""
- stack_name: mcp10_dvr
stack_env: devcloud
- stack_install: core,kvm,openstack,dvr
+ stack_install: core,kvm,openstack,ovs
stack_type: physical
stack_test: openstack
job_timer: ""
@@ -38,7 +38,7 @@
job_timer: "H H(0-6) * * *"
- stack_name: virtual_mcp10_ovs_dvr
stack_env: devcloud
- stack_install: core,openstack,dvr
+ stack_install: core,openstack,ovs
stack_type: heat
stack_test: ""
job_timer: "H H(0-6) * * *"
diff --git a/jenkins/client/job/deploy/lab/release/mcp11.yml b/jenkins/client/job/deploy/lab/release/mcp11.yml
index 7f12594..9670ef4 100644
--- a/jenkins/client/job/deploy/lab/release/mcp11.yml
+++ b/jenkins/client/job/deploy/lab/release/mcp11.yml
@@ -11,7 +11,7 @@
job_timer: ""
- stack_name: virtual_mcp11_dvr
stack_env: devcloud
- stack_install: core,openstack,dvr
+ stack_install: core,openstack,ovs
stack_type: heat
stack_test: ""
job_timer: ""
@@ -83,7 +83,7 @@
job_timer: ""
- stack_name: virtual_mcp_mitaka_dvr
stack_env: devcloud
- stack_install: core,openstack,dvr
+ stack_install: core,openstack,ovs
stack_type: heat
stack_test: ""
job_timer: ""
@@ -95,19 +95,19 @@
job_timer: ""
- stack_name: virtual_mcp_newton_dvr
stack_env: devcloud
- stack_install: core,openstack,dvr
+ stack_install: core,openstack,ovs
stack_type: heat
stack_test: ""
job_timer: ""
- stack_name: virtual_mcp_pike_dvr
stack_env: devcloud
- stack_install: core,openstack,dvr
+ stack_install: core,openstack,ovs
stack_type: heat
stack_test: ""
job_timer: ""
- stack_name: virtual_mcp_pike_dvr_ssl
stack_env: devcloud
- stack_install: core,openstack,dvr
+ stack_install: core,openstack,ovs
stack_type: heat
stack_test: ""
job_timer: ""
diff --git a/keystone/client/os_client_config/admin_identity.yml b/keystone/client/os_client_config/admin_identity.yml
new file mode 100644
index 0000000..35cdf19
--- /dev/null
+++ b/keystone/client/os_client_config/admin_identity.yml
@@ -0,0 +1,19 @@
+parameters:
+ keystone:
+ client:
+ os_client_config:
+ enabled: true
+ cfgs:
+ root:
+ content:
+ clouds:
+ admin_identity:
+ region_name: ${_param:openstack_region}
+ identity_api_version: '3'
+ auth:
+ username: 'admin'
+ password: ${_param:keystone_admin_password}
+ user_domain_name: 'Default'
+ project_name: 'admin'
+ project_domain_name: 'Default'
+ auth_url: ${_param:keystone_service_protocol}://${_param:keystone_service_host}:5000
diff --git a/keystone/client/single.yml b/keystone/client/single.yml
index a79ed7e..ad2d55a 100644
--- a/keystone/client/single.yml
+++ b/keystone/client/single.yml
@@ -1,4 +1,5 @@
classes:
+- system.keystone.client.os_client_config.admin_identity
- system.keystone.client.service.cinder
- system.keystone.client.service.cinder2
- system.keystone.client.service.glance
diff --git a/manila/client/init.yml b/manila/client/init.yml
new file mode 100644
index 0000000..2fdadfd
--- /dev/null
+++ b/manila/client/init.yml
@@ -0,0 +1,4 @@
+classes:
+- service.manila.client
+- system.keystone.client.os_client_config.admin_identity
+- system.manila.client.share_type
diff --git a/manila/client/share_type/default.yml b/manila/client/share_type/default.yml
new file mode 100644
index 0000000..ba46948
--- /dev/null
+++ b/manila/client/share_type/default.yml
@@ -0,0 +1,13 @@
+parameters:
+ _param:
+ manila_share_type_default_extra_specs:
+ driver_handles_share_servers: False
+ manila:
+ client:
+ enabled: true
+ server:
+ admin_identity:
+ share_type:
+ default:
+ name: 'default'
+ extra_specs: ${_param:manila_share_type_default_extra_specs}
diff --git a/manila/client/share_type/init.yml b/manila/client/share_type/init.yml
new file mode 100644
index 0000000..ca69e74
--- /dev/null
+++ b/manila/client/share_type/init.yml
@@ -0,0 +1,2 @@
+classes:
+- system.manila.client.share_type.default