From 2f4577298bede6182ce538ebd72bcb50e0f49131 Mon Sep 17 00:00:00 2001 From: Jimmy McCrory Date: Fri, 6 May 2016 19:03:58 -0700 Subject: [PATCH] Revert "Fix container hostname for RFC 1034/1035" This reverts commit 9a737adb97b36c5169f8c61d51b1925ea760ec9d. It will be reimplemented within the lxc_container_create role. Change-Id: I921a6acbddbc765a81fa2aaed5b24307870ad26d Depends-On: I9e72699354a467478742281cab74690e66b6a652 --- playbooks/inventory/group_vars/hosts.yml | 1 - playbooks/lxc-containers-create.yml | 23 ------------------- ...035-container-update-6e880e4b45e11cf0.yaml | 15 ------------ 3 files changed, 39 deletions(-) delete mode 100644 releasenotes/notes/RFC-1034-and-1035-container-update-6e880e4b45e11cf0.yaml diff --git a/playbooks/inventory/group_vars/hosts.yml b/playbooks/inventory/group_vars/hosts.yml index 8b60aea1a6..b13ddf12f8 100644 --- a/playbooks/inventory/group_vars/hosts.yml +++ b/playbooks/inventory/group_vars/hosts.yml @@ -45,7 +45,6 @@ keystone_external_ssl: "{{ openstack_external_ssl }}" horizon_external_ssl: "{{ openstack_external_ssl }}" ## LXC options -lxc_container_domain: "openstack.local" lxc_container_caches: - url: "https://rpc-repo.rackspace.com/container_images/rpc-trusty-container.tgz" name: "trusty.tgz" diff --git a/playbooks/lxc-containers-create.yml b/playbooks/lxc-containers-create.yml index fc38999086..ae92986162 100644 --- a/playbooks/lxc-containers-create.yml +++ b/playbooks/lxc-containers-create.yml @@ -30,28 +30,5 @@ delay: 1 tags: - lxc-container-wait-for-ssh - - name: Create domain config - lineinfile: - dest: "/etc/hosts" - regexp: "^127.0.1.1" - line: "127.0.1.1 {{ inventory_hostname | replace('_', '-') }}.{{ lxc_container_domain }} {{ inventory_hostname | replace('_', '-') }}" - owner: "root" - group: "root" - mode: "0644" - tags: - - lxc-container-hostname - - name: Create hostname - copy: - dest: "/etc/hostname" - content: "{{ inventory_hostname | replace('_', '-') }}" - owner: "root" - group: "root" - mode: "0644" - tags: - - lxc-container-hostname - - name: Setup hostname - command: hostname -F /etc/hostname - tags: - - lxc-container-hostname vars: is_metal: "{{ properties.is_metal|default(false) }}" diff --git a/releasenotes/notes/RFC-1034-and-1035-container-update-6e880e4b45e11cf0.yaml b/releasenotes/notes/RFC-1034-and-1035-container-update-6e880e4b45e11cf0.yaml deleted file mode 100644 index ee1204571c..0000000000 --- a/releasenotes/notes/RFC-1034-and-1035-container-update-6e880e4b45e11cf0.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -features: - - LXC containers will now have a proper RFC1034/5 hostname set during post - build tasks. A localhost entry for 127.0.1.1 will be created by converting - all of the "_" in the ``inventory_hostname`` to "-". Containers will be - created with a default domain of *openstack.local*. - This domain name can be customized to meet your deployment needs by - setting the option ``lxc_container_domain``. -upgrade: - - LXC containers will now have a proper RFC1034/5 hostname set during post - build tasks. A localhost entry for 127.0.1.1 will be created by converting - all of the "_" in the ``inventory_hostname`` to "-". Containers will be - created with a default domain of *openstack.local*. - This domain name can be customized to meet your deployment needs by - setting the option ``lxc_container_domain``.