summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/deploy.sh6
-rw-r--r--mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml (renamed from mcp/config/scenario/baremetal/os-odl_l3-nofeature-ha.yaml)0
-rw-r--r--mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml (renamed from mcp/config/scenario/virtual/os-odl_l3-nofeature-noha.yaml)0
-rw-r--r--mcp/config/scenario/virtual/os-odl_l2-nofeature-noha.yaml22
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml69
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/init.yml14
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/init.yml11
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml31
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml20
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml4
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml32
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml20
12 files changed, 3 insertions, 226 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 72dedfc31..f73fdfc3e 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -78,7 +78,7 @@ $(notify "Input parameters to the build script are:" 2)
-l Lab name as defined in the configuration directory, e.g. lf
-p POD name as defined in the configuration directory, e.g. pod-1
-s Deployment-scenario, this points to a short deployment scenario name, which
- has to be defined in config directory (e.g. os-odl_l2-nofeature-noha).
+ has to be defined in config directory (e.g. os-odl-nofeature-ha).
-S Storage dir for VM images, default is mcp/deploy/images
$(notify "Disabled input parameters (not yet supported with MCP):" 3)
@@ -98,8 +98,8 @@ Example:
$(notify "sudo $(basename "$0") \\
-b file:///home/jenkins/lab-config \\
- -l lf -p pod1 \\
- -s os-odl_l2-nofeature-noha" 2)
+ -l lf -p pod2 \\
+ -s os-odl-nofeature-ha" 2)
EOF
}
diff --git a/mcp/config/scenario/baremetal/os-odl_l3-nofeature-ha.yaml b/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml
index 2d5339068..2d5339068 100644
--- a/mcp/config/scenario/baremetal/os-odl_l3-nofeature-ha.yaml
+++ b/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml
diff --git a/mcp/config/scenario/virtual/os-odl_l3-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml
index de95e503d..de95e503d 100644
--- a/mcp/config/scenario/virtual/os-odl_l3-nofeature-noha.yaml
+++ b/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml
diff --git a/mcp/config/scenario/virtual/os-odl_l2-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-odl_l2-nofeature-noha.yaml
deleted file mode 100644
index feb78c93a..000000000
--- a/mcp/config/scenario/virtual/os-odl_l2-nofeature-noha.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-cluster:
- domain: virtual-mcp-ocata-odl.local
- states:
- - opendaylight
- - openstack
- - networks
-virtual:
- nodes:
- - cfg01
- - ctl01
- - cmp01
- - cmp02
- - gtw01
- - odl01
- ctl01:
- vcpus: 4
- ram: 14336
- gtw01:
- ram: 2048
- odl01:
- vcpus: 4
- ram: 5120
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml
deleted file mode 100644
index 328d6df46..000000000
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-classes:
-- service.git.client
-- system.linux.system.single
-- system.linux.system.repo.mcp.salt
-- system.salt.master.api
-- system.salt.master.pkg
-- system.reclass.storage.salt
-- system.salt.minion.ca.salt_master
-- system.salt.minion.cert.proxy
-- system.mysql.client.single
-- system.reclass.storage.system.openstack_compute_multi
-- system.reclass.storage.system.openstack_gateway_single
-- system.reclass.storage.system.opendaylight_control_single
-- cluster.virtual-mcp-ocata-odl
-parameters:
- _param:
- openstack_control_node01_hostname: ctl01
- reclass_data_repository: local
- salt_master_environment_repository: "https://github.com/tcpcloud"
- salt_master_environment_revision: master
- reclass_config_master: 192.168.10.100
- single_address: 172.16.10.100
- salt_master_host: 127.0.0.1
- salt_master_base_environment: prd
- salt_minion_ca_host: ${linux:network:fqdn}
- salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
- linux:
- network:
- interface:
- ens4:
- enabled: true
- type: eth
- proto: static
- address: ${_param:single_address}
- netmask: 255.255.255.0
- reclass:
- storage:
- data_source:
- engine: local
- node:
- openstack_control_node01:
- name: ${_param:openstack_control_node01_hostname}
- domain: ${_param:cluster_domain}
- classes:
- - cluster.${_param:cluster_name}.openstack.control
- params:
- linux_system_codename: xenial
- salt_master_host: ${_param:reclass_config_master}
- single_address: ${_param:openstack_control_node01_address}
- openstack_compute_node01:
- params:
- single_address: 172.16.10.105
- tenant_address: 10.1.0.105
- external_address: 10.16.0.105
- openstack_compute_node02:
- params:
- single_address: 172.16.10.106
- tenant_address: 10.1.0.106
- external_address: 10.16.0.106
- openstack_gateway_node01:
- params:
- tenant_address: 10.1.0.110
- external_address: 10.16.0.110
- opendaylight_control_node01:
- classes:
- - cluster.${_param:cluster_name}.opendaylight.control
- params:
- linux_system_codename: xenial
- single_address: 172.16.10.111
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/init.yml
deleted file mode 100644
index 9140bd0bc..000000000
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/init.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-parameters:
- linux:
- network:
- host:
- cfg01:
- address: ${_param:infra_config_address}
- names:
- - cfg01
- - cfg01.${_param:cluster_domain}
- cfg:
- address: ${_param:infra_config_address}
- names:
- - cfg
- - cfg.${_param:cluster_domain}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/init.yml
deleted file mode 100644
index dad16d69a..000000000
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/init.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-classes:
-- system.linux.system.single
-- cluster.virtual-mcp-ocata-common.init_options
-- cluster.virtual-mcp-ocata-odl.infra
-- cluster.virtual-mcp-ocata-odl.openstack
-
-parameters:
- _param:
- cluster_domain: virtual-mcp-ocata-odl.local
- cluster_name: virtual-mcp-ocata-odl
- opendaylight_service_host: 172.16.10.111
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml
deleted file mode 100644
index 38431a58c..000000000
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.opendaylight.server.single
-- cluster.virtual-mcp-ocata-odl
-parameters:
- _param:
- linux_system_codename: xenial
- linux:
- network:
- interface:
- ens4:
- enabled: true
- type: eth
- proto: static
- address: ${_param:single_address}
- netmask: 255.255.255.0
- opendaylight:
- server:
- odl_bind_ip: ${_param:single_address}
- odl_rest_port: 8282
- java_min_mem: 3g
- java_max_mem: 3g
- karaf_features:
- odl_default:
- - odl-restconf-all
- - odl-aaa-authn
- - odl-dlux-all
- netvirt:
- - odl-netvirt-openstack
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml
deleted file mode 100644
index f3f8520dd..000000000
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-classes:
-- cluster.virtual-mcp-ocata-common.openstack_compute
-- cluster.virtual-mcp-ocata-odl
-parameters:
- opendaylight:
- client:
- ovsdb_server_iface: ptcp:6639:127.0.0.1
- ovsdb_odl_iface: tcp:${_param:opendaylight_service_host}:6640
- tunnel_ip: ${_param:tenant_address}
- linux:
- network:
- interface:
- br-mesh:
- enabled: true
- type: bridge
- proto: static
- address: ${_param:tenant_address}
- netmask: 255.255.255.0
- use_interfaces:
- - ${_param:tenant_interface}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml
deleted file mode 100644
index 11c23916f..000000000
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-classes:
-- system.neutron.control.opendaylight.single
-- cluster.virtual-mcp-ocata-common.openstack_control
-- cluster.virtual-mcp-ocata-odl
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml
deleted file mode 100644
index fd01f3c32..000000000
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-classes:
-- cluster.virtual-mcp-ocata-common.openstack_gateway
-- system.neutron.gateway.opendaylight.single
-- cluster.virtual-mcp-ocata-odl
-parameters:
- _param:
- neutron_agents:
- - neutron-l3-agent
- - neutron-dhcp-agent
- - neutron-metadata-agent
- neutron:
- gateway:
- pkgs: ${_param:neutron_agents}
- services: ${_param:neutron_agents}
- opendaylight:
- client:
- ovsdb_server_iface: ptcp:6639:127.0.0.1
- ovsdb_odl_iface: tcp:${_param:opendaylight_service_host}:6640
- tunnel_ip: ${_param:tenant_address}
- provider_mappings: physnet1:br-floating
- linux:
- network:
- interface:
- br-mesh:
- enabled: true
- type: bridge
- mtu: ${_param:interface_mtu}
- proto: static
- address: ${_param:tenant_address}
- netmask: 255.255.255.0
- use_interfaces:
- - ${_param:tenant_interface}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml
deleted file mode 100644
index d86b673ec..000000000
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-classes:
-- cluster.virtual-mcp-ocata-common.openstack_init
-parameters:
- _param:
- neutron_tenant_network_types: "flat,vxlan"
- linux:
- system:
- repo:
- uca:
- source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
- architectures: amd64
- key_id: EC4926EA
- key_server: keyserver.ubuntu.com
- network:
- host:
- odl01:
- address: 172.16.10.111
- names:
- - odl01
- - odl01.${_param:cluster_domain}