aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/compass_conf
diff options
context:
space:
mode:
Diffstat (limited to 'deploy/compass_conf')
-rwxr-xr-xdeploy/compass_conf/package_metadata/openstack.conf26
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/HA-ansible-multinodes.tmpl6
2 files changed, 30 insertions, 2 deletions
diff --git a/deploy/compass_conf/package_metadata/openstack.conf b/deploy/compass_conf/package_metadata/openstack.conf
index f045868e..9f079f9e 100755
--- a/deploy/compass_conf/package_metadata/openstack.conf
+++ b/deploy/compass_conf/package_metadata/openstack.conf
@@ -64,6 +64,15 @@ METADATA = {
}
},
+ 'compass_ip': {
+ '_self': {
+ 'mapping_to': 'compass_ip',
+ 'field': 'anytype',
+ 'is_required':False,
+ 'default_value': '10.1.0.1'
+ }
+ },
+
'enable_secgroup': {
'_self': {
'mapping_to': 'enable_secgroup',
@@ -72,7 +81,6 @@ METADATA = {
'default_value': True
}
},
-
'enable_fwaas': {
'_self': {
'mapping_to': 'enable_fwaas',
@@ -129,6 +137,22 @@ METADATA = {
'default_value': 'Disable'
}
},
+ 'offline_repo_port': {
+ '_self': {
+ 'mapping_to': 'offline_repo_port',
+ 'field': 'anytype',
+ 'is_required':False,
+ 'default_value': '5151'
+ }
+ },
+ 'offline_deployment': {
+ '_self': {
+ 'mapping_to': 'offline_deployment',
+ 'field': 'anytype',
+ 'is_required':False,
+ 'default_value': 'Disable'
+ }
+ },
'network_cfg': {
'_self': {
'mapping_to': 'network_cfg'
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/HA-ansible-multinodes.tmpl
index d0d0b7d0..704c23fb 100755
--- a/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/HA-ansible-multinodes.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/HA-ansible-multinodes.tmpl
@@ -37,7 +37,6 @@
#set neutron_cfg = $getVar('neutron_config', {})
#set ovs_config = $neutron_cfg.openvswitch
-
#set has = $getVar('ha', [])
#set ha_vip = $getVar('ha_vip', [])
@@ -64,6 +63,11 @@ public_net_info: "{{ network_cfg.public_net_info }}"
host_ip_settings: "{{ ip_settings[inventory_hostname] }}"
ntp_server: $ntp_server
+
+offline_deployment: $getVar('offline_deployment', 'Disable')
+offline_repo_ip: $getVar('compass_ip', '')
+offline_repo_port: $getVar('offline_repo_port', '5151')
+
internal_vip:
ip: $network_cfg["internal_vip"]["ip"]
netmask: $network_cfg["internal_vip"]["netmask"]