diff options
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-common')
7 files changed, 32 insertions, 13 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml index 275941120..e0f9a2a94 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml @@ -47,15 +47,6 @@ parameters: master: accept_policy: open_mode file_recv: true - environment: - prd: - formula: - maas: - # Temporary fixup for MaaS formula machine status int.lower() - version: 0.0.1+201711061044.9f1b034~xenial1 - neutron: - # Temporary fixup for mismatch between formula and reclass model - version: 2016.12.1+201709251458.f0607d9-1xenial1 reclass: storage: data_source: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml index a96e254df..3d3f8df62 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml @@ -65,6 +65,15 @@ parameters: # yamllint disable-line rule:line-length salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/" + reclass: + storage: + node: + openstack_proxy_node01: + params: + control_address: ${_param:openstack_proxy_node01_control_address} + openstack_proxy_node02: + params: + control_address: ${_param:openstack_proxy_node02_control_address} linux: system: user: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml index 8a37945cc..7f2f57219 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml @@ -125,12 +125,15 @@ parameters: bridge: br-ctl model: virtio default_ext: - eth1: + eth2: bridge: br-mgmt model: virtio - eth0: + eth1: bridge: br-ex model: virtio + eth0: + bridge: br-ctl + model: virtio glusterfs: server: volumes: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml index fd4c4cca1..a78850fc0 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml @@ -55,3 +55,6 @@ parameters: sysctl: vm.dirty_ratio: 10 vm.dirty_background_ratio: 5 + neutron: + gateway: + vlan_aware_vms: true diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml index 2aa05f07d..6d942281c 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml @@ -46,6 +46,9 @@ parameters: interface: dhcp: ${_param:linux_dhcp_interface} single: ${_param:linux_single_interface} + neutron: + server: + vlan_aware_vms: true keystone: server: cacert: /etc/ssl/certs/mcp_os_cacert diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_init.yml index e638bca9f..49140f803 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_init.yml @@ -22,6 +22,8 @@ parameters: openstack_gateway_node03_hostname: gtw03 # openstack service addresses + openstack_proxy_node01_control_address: ${_param:opnfv_openstack_proxy_node01_control_address} + openstack_proxy_node02_control_address: ${_param:opnfv_openstack_proxy_node02_control_address} openstack_proxy_address: ${_param:opnfv_openstack_proxy_address} openstack_proxy_node01_address: ${_param:opnfv_openstack_proxy_node01_address} openstack_proxy_node02_address: ${_param:opnfv_openstack_proxy_node02_address} @@ -201,12 +203,12 @@ parameters: - ${_param:openstack_proxy_hostname} - ${_param:openstack_proxy_hostname}.${_param:cluster_domain} prx01: - address: ${_param:openstack_proxy_node01_address} + address: ${_param:openstack_proxy_node01_control_address} names: - ${_param:openstack_proxy_node01_hostname} - ${_param:openstack_proxy_node01_hostname}.${_param:cluster_domain} prx02: - address: ${_param:openstack_proxy_node02_address} + address: ${_param:openstack_proxy_node02_control_address} names: - ${_param:openstack_proxy_node02_hostname} - ${_param:openstack_proxy_node02_hostname}.${_param:cluster_domain} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml index a2d39854e..1d0e8d1c5 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml @@ -33,11 +33,19 @@ parameters: salt_minion_ca_host: cfg01.${_param:cluster_domain} dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} single_nic: ${_param:opnfv_vcp_vm_secondary_interface} + control_nic: ${_param:opnfv_vcp_vm_tertiary_interface} linux: network: interface: dhcp: ${_param:linux_dhcp_interface} single: ${_param:linux_single_interface} + control: + enabled: true + type: eth + proto: static + name: ${_param:control_nic} + address: ${_param:control_address} + netmask: 255.255.255.0 system: package: libapache2-mod-wsgi: |