virtual labs new way
Change-Id: I5ce5858bd27d2d181ef4354f95e08aeafef79ab5
diff --git a/jenkins/client/job/deploy/lab/release/mcp05.yml b/jenkins/client/job/deploy/lab/release/mcp05.yml
index 5ec2787..05e74d9 100644
--- a/jenkins/client/job/deploy/lab/release/mcp05.yml
+++ b/jenkins/client/job/deploy/lab/release/mcp05.yml
@@ -4,13 +4,13 @@
_param:
jenkins_deploy_jobs:
- stack_name: virtual_mcp05_dvr
- stack_env: virtual_mcp05_dvr/devcloud
+ stack_env: devcloud
stack_install: core,openstack,dvr
stack_type: heat
stack_test: ""
job_timer: ""
- stack_name: virtual_mcp05_ovs
- stack_env: virtual_mcp05_ovs/devcloud
+ stack_env: devcloud
stack_install: core,openstack,ovs
stack_type: heat
stack_test: ""
diff --git a/jenkins/client/job/deploy/lab/release/mcp10.yml b/jenkins/client/job/deploy/lab/release/mcp10.yml
index 516d533..a692378 100644
--- a/jenkins/client/job/deploy/lab/release/mcp10.yml
+++ b/jenkins/client/job/deploy/lab/release/mcp10.yml
@@ -5,25 +5,25 @@
jenkins_deploy_jobs:
# physical
- stack_name: mcp10_contrail
- stack_env: mcp10_contrail/devcloud
+ stack_env: devcloud
stack_install: core,kvm,openstack,contrail
stack_type: physical
stack_test: openstack
job_timer: ""
- stack_name: mcp10_opencontrail_nfv
- stack_env: mcp10_opencontrail_nfv/devcloud
+ stack_env: devcloud
stack_install: core,kvm,openstack,nfv
stack_type: physical
stack_test: openstack
job_timer: ""
- stack_name: mcp10_dvr
- stack_env: mcp10_dvr/devcloud
+ stack_env: devcloud
stack_install: core,kvm,openstack,dvr
stack_type: physical
stack_test: openstack
job_timer: ""
- stack_name: mcp10_non_dvr
- stack_env: mcp10_non_dvr/devcloud
+ stack_env: devcloud
stack_install: core,kvm,openstack
stack_type: physical
stack_test: openstack
@@ -31,19 +31,19 @@
# virtual
- stack_name: virtual_mcp10_contrail
- stack_env: virtual_mcp10_contrail/devcloud
+ stack_env: devcloud
stack_install: core,openstack,contrail
stack_type: heat
stack_test: ""
job_timer: "H H(0-6) * * *"
- stack_name: virtual_mcp10_dvr
- stack_env: virtual_mcp10_dvr/devcloud
+ stack_env: devcloud
stack_install: core,openstack,dvr
stack_type: heat
stack_test: ""
job_timer: "H H(0-6) * * *"
- stack_name: virtual_mcp10_ovs
- stack_env: virtual_mcp10_ovs/devcloud
+ stack_env: devcloud
stack_install: core,openstack,ovs
stack_type: heat
stack_test: ""
diff --git a/jenkins/client/job/deploy/lab/release/mcp11.yml b/jenkins/client/job/deploy/lab/release/mcp11.yml
index c8fc663..b147427 100644
--- a/jenkins/client/job/deploy/lab/release/mcp11.yml
+++ b/jenkins/client/job/deploy/lab/release/mcp11.yml
@@ -4,25 +4,25 @@
_param:
jenkins_deploy_jobs:
- stack_name: virtual_mcp11_contrail
- stack_env: virtual_mcp11_contrail/devcloud
+ stack_env: devcloud
stack_install: core,openstack,contrail
stack_type: heat
stack_test: ""
job_timer: ""
- stack_name: virtual_mcp11_dvr
- stack_env: virtual_mcp11_dvr/devcloud
+ stack_env: devcloud
stack_install: core,openstack,dvr
stack_type: heat
stack_test: ""
job_timer: ""
- stack_name: virtual_mcp11_ovs
- stack_env: virtual_mcp11_ovs/devcloud
+ stack_env: devcloud
stack_install: core,openstack,ovs
stack_type: heat
stack_test: ""
job_timer: ""
- stack_name: virtual_mcp11_ironic_small
- stack_env: virtual_mcp11_ironic_small/devcloud
+ stack_env: devcloud
stack_install: core,openstack
stack_type: heat
stack_test: ""
@@ -34,25 +34,25 @@
stack_test: ""
job_timer: ""
- stack_name: virtual_mcp11_k8s_calico
- stack_env: virtual_mcp11_k8s_calico/devcloud
+ stack_env: devcloud
stack_install: core,k8s,calico
stack_type: heat
stack_test: k8s
job_timer: "H H(0-6) * * *"
- stack_name: virtual_mcp11_k8s_contrail
- stack_env: virtual_mcp11_k8s_contrail/devcloud
+ stack_env: devcloud
stack_install: core,k8s,contrail
stack_type: heat
stack_test: k8s
job_timer: "H H(0-6) * * *"
- stack_name: virtual_mcp11_contrail_nfv
- stack_env: virtual_mcp11_contrail_nfv/devcloud
+ stack_env: devcloud
stack_install: core,openstack,contrail
stack_type: heat
stack_test: ""
job_timer: "H H(0-6) * * *"
- stack_name: virtual_mcp11_ovs_dpdk
- stack_env: virtual_mcp11_ovs_dpdk/devcloud
+ stack_env: devcloud
stack_install: core,openstack,ovs
stack_type: heat
stack_test: ""
diff --git a/jenkins/client/job/deploy/lab/release/mk.yml b/jenkins/client/job/deploy/lab/release/mk.yml
index 1be1057..4968285 100644
--- a/jenkins/client/job/deploy/lab/release/mk.yml
+++ b/jenkins/client/job/deploy/lab/release/mk.yml
@@ -5,26 +5,26 @@
jenkins_deploy_jobs:
# mk20
- stack_name: virtual_mk20_advanced
- stack_env: virtual_mk20_advanced/devcloud
+ stack_env: devcloud
stack_install: core,openstack
stack_type: heat
stack_test: ""
job_timer: ""
- stack_name: virtual_mk20_basic
- stack_env: virtual_mk20_basic/devcloud
+ stack_env: devcloud
stack_install: core,openstack
stack_type: heat
stack_test: ""
job_timer: ""
# mk22
- stack_name: virtual_mk22_advanced
- stack_env: virtual_mk22_advanced/devcloud
+ stack_env: devcloud
stack_install: core,openstack
stack_type: heat
stack_test: ""
job_timer: ""
- stack_name: virtual_mk22_basic
- stack_env: virtual_mk22_basic/devcloud
+ stack_env: devcloud
stack_install: core,openstack
stack_type: heat
stack_test: ""
diff --git a/linux/network/hosts.yml b/linux/network/hosts.yml
new file mode 100644
index 0000000..1b29324
--- /dev/null
+++ b/linux/network/hosts.yml
@@ -0,0 +1,9 @@
+parameters:
+ linux:
+ network:
+ host:
+ localhost_hostname:
+ address: ${_param:single_address}
+ names:
+ - ${linux:network:fqdn}
+ - ${linux:network:hostname}