Merge "Add 'storage' L3 attributes for Ceph"
diff --git "a/\173\043 interfaces \043\175/single_mgm_manual" "b/\173\043 interfaces \043\175/single_mgm_manual"
new file mode 100644
index 0000000..4dccca3
--- /dev/null
+++ "b/\173\043 interfaces \043\175/single_mgm_manual"
@@ -0,0 +1,17 @@
+{#- Management (admin) network. For nodes where deploy address provided by DHCP server #}
+{#- Provides: #}
+{#- br_mgm (linux bridge) + DHCP address #}
+ # {{ interfaces_role }}
+ {%- set interface_name = interfaces.keys()[0] %}
+ {{ interface_name }}:
+ enabled: true
+ type: eth
+ proto: manual
+ ipflush_onchange: true
+ name: {{ interface_name }}
+ br_mgm:
+ enabled: true
+ proto: manual
+ type: bridge
+ use_interfaces:
+ - {{ interface_name }}
\ No newline at end of file
diff --git "a/\173\043 interfaces \043\175/single_static_mgm" "b/\173\043 interfaces \043\175/single_static_mgm"
new file mode 100644
index 0000000..17dba22
--- /dev/null
+++ "b/\173\043 interfaces \043\175/single_static_mgm"
@@ -0,0 +1,22 @@
+{#- Management (admin) network. For nodes where deploy address must be configured as static (at least cfg*) #}
+{#- Provides: #}
+{#- (linux interface) + address #}
+{#- Requires: #}
+{#- _param:deploy_address #}
+{#- _param:deploy_network_netmask #}
+{#- _param:deploy_network_gateway #}
+{#- _param:dns_server01 #}
+{#- _param:dns_server02 #}
+ # {{ interfaces_role }}
+ {%- set interface_name = interfaces.keys()[0] %}
+ {{ interface_name }}:
+ enabled: true
+ name: {{ interface_name }}
+ proto: static
+ type: eth
+ address: ${_param:_esc}{_param:deploy_address}
+ netmask: ${_param:_esc}{_param:deploy_network_netmask} #lab03: 255.255.255.192
+ gateway: ${_param:_esc}{_param:deploy_network_gateway} #lab03: 172.16.49.1
+ name_servers:
+ - ${_param:_esc}{_param:dns_server01}
+ - ${_param:_esc}{_param:dns_server02}
diff --git "a/\173\043 roles \043\175/openstack_database" "b/\173\043 roles \043\175/openstack_database"
index 3c3c87f..6380651 100644
--- "a/\173\043 roles \043\175/openstack_database"
+++ "b/\173\043 roles \043\175/openstack_database"
@@ -6,8 +6,9 @@
<reclass_storage_node_name>:
classes:
#}
- - cluster.${_param:cluster_name}.openstack.database
- service.galera.slave.cluster
+ - cluster.${_param:cluster_name}.openstack.database
+ - cluster.${_param:cluster_name}.openstack.database.slave
{{- set_param('keepalived_vip_interface', 'br_ctl') }}
{{- register_metaparam('mysql_cluster_role', 'openstack_database') }}
{{- register_metaparam('keepalived_vip_priority', 'openstack_database') }}
diff --git "a/\173\043 roles \043\175/openstack_database_leader" "b/\173\043 roles \043\175/openstack_database_leader"
index b196729..69a0c17 100644
--- "a/\173\043 roles \043\175/openstack_database_leader"
+++ "b/\173\043 roles \043\175/openstack_database_leader"
@@ -6,9 +6,9 @@
<reclass_storage_node_name>:
classes:
#}
- - cluster.${_param:cluster_name}.openstack.database
- - cluster.${_param:cluster_name}.openstack.database_init
- service.galera.master.cluster
+ - cluster.${_param:cluster_name}.openstack.database
+ - cluster.${_param:cluster_name}.openstack.database.master
{{- set_param('keepalived_vip_interface', 'br_ctl') }}
{{- register_metaparam('mysql_cluster_role', 'openstack_database') }}
{{- register_metaparam('keepalived_vip_priority', 'openstack_database') }}