diff options
-rw-r--r-- | meta-openstack-compute-deploy/classes/compute.bbclass | 2 | ||||
-rw-r--r-- | meta-openstack-compute-deploy/classes/hosts.bbclass | 6 | ||||
-rw-r--r-- | meta-openstack-controller-deploy/classes/controller.bbclass | 2 | ||||
-rw-r--r-- | meta-openstack-controller-deploy/classes/hosts.bbclass | 7 | ||||
-rw-r--r-- | meta-openstack/classes/compute.bbclass | 2 | ||||
-rw-r--r-- | meta-openstack/classes/controller.bbclass | 2 | ||||
-rw-r--r-- | meta-openstack/classes/hosts.bbclass | 1 | ||||
-rw-r--r-- | meta-openstack/classes/openstack-base.bbclass | 12 |
8 files changed, 26 insertions, 8 deletions
diff --git a/meta-openstack-compute-deploy/classes/compute.bbclass b/meta-openstack-compute-deploy/classes/compute.bbclass deleted file mode 100644 index 46749b1..0000000 --- a/meta-openstack-compute-deploy/classes/compute.bbclass +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | CONTROLLER_IP ?= "192.168.7.2" | ||
2 | CONTROLLER_HOST ?= "192.168.7.2" | ||
diff --git a/meta-openstack-compute-deploy/classes/hosts.bbclass b/meta-openstack-compute-deploy/classes/hosts.bbclass new file mode 100644 index 0000000..5376b02 --- /dev/null +++ b/meta-openstack-compute-deploy/classes/hosts.bbclass | |||
@@ -0,0 +1,6 @@ | |||
1 | COMPUTE_IP ?= "192.168.7.4" | ||
2 | COMPUTE_HOST ?= "compute" | ||
3 | CONTROLLER_IP ?= "192.168.7.2" | ||
4 | CONTROLLER_HOST ?= "controller" | ||
5 | MY_IP ?= "${COMPUTE_IP}" | ||
6 | MY_HOST ?= "${COMPUTE_HOST}" | ||
diff --git a/meta-openstack-controller-deploy/classes/controller.bbclass b/meta-openstack-controller-deploy/classes/controller.bbclass deleted file mode 100644 index 1db2714..0000000 --- a/meta-openstack-controller-deploy/classes/controller.bbclass +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | CONTROLLER_IP = "0.0.0.0" | ||
2 | CONTROLLER_HOST = "localhost" | ||
diff --git a/meta-openstack-controller-deploy/classes/hosts.bbclass b/meta-openstack-controller-deploy/classes/hosts.bbclass new file mode 100644 index 0000000..3b83aa5 --- /dev/null +++ b/meta-openstack-controller-deploy/classes/hosts.bbclass | |||
@@ -0,0 +1,7 @@ | |||
1 | # controller hosts file | ||
2 | COMPUTE_IP ?= "192.168.7.4" | ||
3 | COMPUTE_HOST ?= "compute" | ||
4 | CONTROLLER_IP ?= "192.168.7.2" | ||
5 | CONTROLLER_HOST ?= "controller" | ||
6 | MY_IP ?= "${CONTROLLER_IP}" | ||
7 | MY_HOST ?= "${CONTROLLER_HOST}" | ||
diff --git a/meta-openstack/classes/compute.bbclass b/meta-openstack/classes/compute.bbclass deleted file mode 100644 index 3ed38e0..0000000 --- a/meta-openstack/classes/compute.bbclass +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | CONTROLLER_IP = "192.168.7.2" | ||
2 | CONTROLLER_HOST = "192.168.7.2" | ||
diff --git a/meta-openstack/classes/controller.bbclass b/meta-openstack/classes/controller.bbclass deleted file mode 100644 index 1db2714..0000000 --- a/meta-openstack/classes/controller.bbclass +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | CONTROLLER_IP = "0.0.0.0" | ||
2 | CONTROLLER_HOST = "localhost" | ||
diff --git a/meta-openstack/classes/hosts.bbclass b/meta-openstack/classes/hosts.bbclass new file mode 100644 index 0000000..4258d46 --- /dev/null +++ b/meta-openstack/classes/hosts.bbclass | |||
@@ -0,0 +1 @@ | |||
# to be overriden | |||
diff --git a/meta-openstack/classes/openstack-base.bbclass b/meta-openstack/classes/openstack-base.bbclass new file mode 100644 index 0000000..565470b --- /dev/null +++ b/meta-openstack/classes/openstack-base.bbclass | |||
@@ -0,0 +1,12 @@ | |||
1 | inherit hosts | ||
2 | |||
3 | ROOTFS_POSTPROCESS_COMMAND += "openstack_configure_hosts ; " | ||
4 | |||
5 | openstack_configure_hosts() { | ||
6 | bbnote "openstack: identifying hosts" | ||
7 | |||
8 | echo "${CONTROLLER_IP} controller" >> ${IMAGE_ROOTFS}/etc/hosts | ||
9 | echo "${COMPUTE_IP} compute" >> ${IMAGE_ROOTFS}/etc/hosts | ||
10 | echo "${MY_HOST}" > ${IMAGE_ROOTFS}/etc/hostname | ||
11 | } | ||
12 | |||