rename fuel to infra
diff --git a/nginx/server/proxy/foundation/gerrit.yml b/nginx/server/proxy/infra/gerrit.yml
similarity index 84%
rename from nginx/server/proxy/foundation/gerrit.yml
rename to nginx/server/proxy/infra/gerrit.yml
index 8915b71..13ae180 100644
--- a/nginx/server/proxy/foundation/gerrit.yml
+++ b/nginx/server/proxy/infra/gerrit.yml
@@ -8,7 +8,7 @@
type: nginx_proxy
name: gerrit
proxy:
- host: ${_param:fuel_version_control_node01_single_address}
+ host: ${_param:infra_version_control_node01_single_address}
port: 8082
protocol: http
host:
diff --git a/nginx/server/proxy/foundation/jenkins.yml b/nginx/server/proxy/infra/jenkins.yml
similarity index 85%
rename from nginx/server/proxy/foundation/jenkins.yml
rename to nginx/server/proxy/infra/jenkins.yml
index 9f10ad7..9d10dae 100644
--- a/nginx/server/proxy/foundation/jenkins.yml
+++ b/nginx/server/proxy/infra/jenkins.yml
@@ -8,7 +8,7 @@
type: nginx_proxy
name: jenkins
proxy:
- host: ${_param:fuel_integration_node01_single_address}
+ host: ${_param:infra_integration_node01_single_address}
port: 8080
protocol: http
host:
diff --git a/nginx/server/proxy/foundation/sphinx.yml b/nginx/server/proxy/infra/sphinx.yml
similarity index 100%
rename from nginx/server/proxy/foundation/sphinx.yml
rename to nginx/server/proxy/infra/sphinx.yml
diff --git a/reclass/storage/system/physical_control_cluster.yml b/reclass/storage/system/physical_control_cluster.yml
index d16d4e5..4e08a80 100644
--- a/reclass/storage/system/physical_control_cluster.yml
+++ b/reclass/storage/system/physical_control_cluster.yml
@@ -2,30 +2,30 @@
reclass:
storage:
node:
- fuel_compute_node01:
+ infra_compute_node01:
name: kvm01
domain: ${_param:cluster_domain}
classes:
- - cluster.${_param:cluster_name}.fuel.compute
+ - cluster.${_param:cluster_name}.infra.compute
params:
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: trusty
- single_address: ${_param:fuel_compute_node01_address}
- fuel_compute_node02:
+ single_address: ${_param:infra_compute_node01_address}
+ infra_compute_node02:
name: kvm02
domain: ${_param:cluster_domain}
classes:
- - cluster.${_param:cluster_name}.fuel.compute
+ - cluster.${_param:cluster_name}.infra.compute
params:
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: trusty
- single_address: ${_param:fuel_compute_node02_address}
- fuel_compute_node03:
+ single_address: ${_param:infra_compute_node02_address}
+ infra_compute_node03:
name: kvm03
domain: ${_param:cluster_domain}
classes:
- - cluster.${_param:cluster_name}.fuel.compute
+ - cluster.${_param:cluster_name}.infra.compute
params:
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: trusty
- single_address: ${_param:fuel_compute_node03_address}
+ single_address: ${_param:infra_compute_node03_address}
diff --git a/reclass/storage/system/physical_control_full.yml b/reclass/storage/system/physical_control_full.yml
index d43c1c4..f97f42b 100644
--- a/reclass/storage/system/physical_control_full.yml
+++ b/reclass/storage/system/physical_control_full.yml
@@ -2,93 +2,93 @@
reclass:
storage:
node:
- fuel_compute_node01:
+ infra_compute_node01:
name: kvm01
domain: ${_param:cluster_domain}
classes:
- - cluster.${_param:cluster_name}.fuel.compute
+ - cluster.${_param:cluster_name}.infra.compute
params:
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: trusty
- single_address: ${_param:fuel_compute_node01_address}
- deploy_address: ${_param:fuel_compute_node01_deploy_address}
- fuel_compute_node02:
+ single_address: ${_param:infra_compute_node01_address}
+ deploy_address: ${_param:infra_compute_node01_deploy_address}
+ infra_compute_node02:
name: kvm02
domain: ${_param:cluster_domain}
classes:
- - cluster.${_param:cluster_name}.fuel.compute
+ - cluster.${_param:cluster_name}.infra.compute
params:
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: trusty
- single_address: ${_param:fuel_compute_node02_address}
- deploy_address: ${_param:fuel_compute_node02_deploy_address}
- fuel_compute_node03:
+ single_address: ${_param:infra_compute_node02_address}
+ deploy_address: ${_param:infra_compute_node02_deploy_address}
+ infra_compute_node03:
name: kvm03
domain: ${_param:cluster_domain}
classes:
- - cluster.${_param:cluster_name}.fuel.compute
+ - cluster.${_param:cluster_name}.infra.compute
params:
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: trusty
- single_address: ${_param:fuel_compute_node03_address}
- deploy_address: ${_param:fuel_compute_node03_deploy_address}
- fuel_compute_node04:
+ single_address: ${_param:infra_compute_node03_address}
+ deploy_address: ${_param:infra_compute_node03_deploy_address}
+ infra_compute_node04:
name: kvm04
domain: ${_param:cluster_domain}
classes:
- - cluster.${_param:cluster_name}.fuel.compute
+ - cluster.${_param:cluster_name}.infra.compute
params:
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: trusty
- single_address: ${_param:fuel_compute_node04_address}
- deploy_address: ${_param:fuel_compute_node04_deploy_address}
- fuel_compute_node05:
+ single_address: ${_param:infra_compute_node04_address}
+ deploy_address: ${_param:infra_compute_node04_deploy_address}
+ infra_compute_node05:
name: kvm05
domain: ${_param:cluster_domain}
classes:
- - cluster.${_param:cluster_name}.fuel.compute
+ - cluster.${_param:cluster_name}.infra.compute
params:
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: trusty
- single_address: ${_param:fuel_compute_node05_address}
- deploy_address: ${_param:fuel_compute_node05_deploy_address}
- fuel_compute_node06:
+ single_address: ${_param:infra_compute_node05_address}
+ deploy_address: ${_param:infra_compute_node05_deploy_address}
+ infra_compute_node06:
name: kvm06
domain: ${_param:cluster_domain}
classes:
- - cluster.${_param:cluster_name}.fuel.compute
+ - cluster.${_param:cluster_name}.infra.compute
params:
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: trusty
- single_address: ${_param:fuel_compute_node06_address}
- deploy_address: ${_param:fuel_compute_node06_deploy_address}
- fuel_compute_node07:
+ single_address: ${_param:infra_compute_node06_address}
+ deploy_address: ${_param:infra_compute_node06_deploy_address}
+ infra_compute_node07:
name: kvm07
domain: ${_param:cluster_domain}
classes:
- - cluster.${_param:cluster_name}.fuel.compute
+ - cluster.${_param:cluster_name}.infra.compute
params:
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: trusty
- single_address: ${_param:fuel_compute_node07_address}
- deploy_address: ${_param:fuel_compute_node07_deploy_address}
- fuel_compute_node08:
+ single_address: ${_param:infra_compute_node07_address}
+ deploy_address: ${_param:infra_compute_node07_deploy_address}
+ infra_compute_node08:
name: kvm08
domain: ${_param:cluster_domain}
classes:
- - cluster.${_param:cluster_name}.fuel.compute
+ - cluster.${_param:cluster_name}.infra.compute
params:
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: trusty
- single_address: ${_param:fuel_compute_node08_address}
- deploy_address: ${_param:fuel_compute_node08_deploy_address}
- fuel_compute_node09:
+ single_address: ${_param:infra_compute_node08_address}
+ deploy_address: ${_param:infra_compute_node08_deploy_address}
+ infra_compute_node09:
name: kvm09
domain: ${_param:cluster_domain}
classes:
- - cluster.${_param:cluster_name}.fuel.compute
+ - cluster.${_param:cluster_name}.infra.compute
params:
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: trusty
- single_address: ${_param:fuel_compute_node09_address}
- deploy_address: ${_param:fuel_compute_node09_deploy_address}
+ single_address: ${_param:infra_compute_node09_address}
+ deploy_address: ${_param:infra_compute_node09_deploy_address}
diff --git a/reclass/storage/system/physical_control_single.yml b/reclass/storage/system/physical_control_single.yml
index 7767c7e..3f3cf06 100644
--- a/reclass/storage/system/physical_control_single.yml
+++ b/reclass/storage/system/physical_control_single.yml
@@ -2,13 +2,13 @@
reclass:
storage:
node:
- fuel_compute_node01:
+ infra_compute_node01:
name: kvm01
domain: ${_param:cluster_domain}
classes:
- - cluster.${_param:cluster_name}.fuel.compute
+ - cluster.${_param:cluster_name}.infra.compute
params:
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: trusty
- single_address: ${_param:fuel_compute_node01_address}
+ single_address: ${_param:infra_compute_node01_address}